Skip to content

armgit / core

Public Imported from GitHub
0

100% open-source IoT Platform - Integrate your devices, add intelligence, build custom apps

Made keycloak themes deployable, default openremote theme is now in UI directory with other UI components

Rich Turner4fabd3379faa
diff --git a/.gitignore b/.gitignore
index 41f893bd0..0dcee9d76 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ deployment/proxy/
deployment/postgresql/
deployment/manager/openremote.log*
deployment/manager/app/
+deployment/keycloak
diff --git a/client/build.gradle b/client/build.gradle
index 71392761a..99e07c74a 100644
--- a/client/build.gradle
+++ b/client/build.gradle
@@ -159,13 +159,12 @@ task gwtSuperDev(dependsOn: classes, type: JavaExec) {
installDist {
dependsOn resolveTask(":client:src:main:webapp:installDist")
-
- into "${project(':deployment').projectDir}/manager/app/manager"
+ into "${resolveProject(':deployment').projectDir}/manager/app/manager"
}
clean {
doLast {
- delete "${project(':deployment').projectDir}/manager/app/manager"
+ delete "${resolveProject(':deployment').projectDir}/manager/app/manager"
}
}
diff --git a/client/src/main/webapp/build.gradle b/client/src/main/webapp/build.gradle
index c8911bb8c..2514daf2b 100644
--- a/client/src/main/webapp/build.gradle
+++ b/client/src/main/webapp/build.gradle
@@ -1,3 +1,3 @@
task installDist {
- dependsOn yarnInstall
+ dependsOn 'yarnInstall'
}
\ No newline at end of file
diff --git a/container/src/main/java/org/openremote/container/util/LogUtil.java b/container/src/main/java/org/openremote/container/util/LogUtil.java
index b8555b21f..bbe067a71 100644
--- a/container/src/main/java/org/openremote/container/util/LogUtil.java
+++ b/container/src/main/java/org/openremote/container/util/LogUtil.java
@@ -37,7 +37,7 @@ public class LogUtil {
/**
* If system property <code>java.util.logging.config.file</code> has not been set, try to load the
* logging configuration specified in environment variable <code>LOGGING_CONFIG_FILE</code> as a file.
- * If this wasn't set, try to find the file <code>/deployment/logging.properties</code>.
+ * If this wasn't set, try to find the file <code>/deployment/manager/logging.properties</code>.
* If this also wasn't found, load the given default logging configuration from the classpath.
* <p>
* This method should be called in a <code>static { ... }</code> block in the "first" class of your
@@ -59,10 +59,10 @@ public class LogUtil {
throw new ExceptionInInitializerError(ex);
}
} else {
- // Try to find /deployment/logging.properties
- if (Files.isReadable(Paths.get("/deployment/logging.properties"))) {
- try (InputStream is = Files.newInputStream(Paths.get("/deployment/logging.properties"))) {
- System.out.println("Using logging configuration: /deployment/logging.properties");
+ // Try to find /deployment/manager/logging.properties
+ if (Files.isReadable(Paths.get("/deployment/manager/logging.properties"))) {
+ try (InputStream is = Files.newInputStream(Paths.get("/deployment/manager/logging.properties"))) {
+ System.out.println("Using logging configuration: /deployment/manager/logging.properties");
LogManager.getLogManager().readConfiguration(is);
} catch (Exception ex) {
throw new ExceptionInInitializerError(ex);
diff --git a/deployment/build.gradle b/deployment/build.gradle
index d6ffb8153..ae035b45b 100644
--- a/deployment/build.gradle
+++ b/deployment/build.gradle
@@ -2,5 +2,6 @@ apply plugin: 'idea'
idea {
module {
excludeDirs += file("manager/app")
+ excludeDirs += file("keycloak")
}
}
\ No newline at end of file
diff --git a/deployment/manager/logging.properties b/deployment/manager/logging.properties
index a62bb2885..e8f6aed47 100644
--- a/deployment/manager/logging.properties
+++ b/deployment/manager/logging.properties
@@ -2,7 +2,7 @@
# Note that a LOGGING_CONFIG_FILE in the Docker setup may override this!
#
# This will only be used automatically# if it's located at
-# /deployment/logging.properties on the host machine, or
+# /deployment/manager/logging.properties on the host machine, or
# set with environment variable LOGGING_CONFIG_FILE.
###############################################################################
@@ -47,7 +47,7 @@ java.util.logging.ConsoleHandler.formatter=org.openremote.container.util.LogForm
java.util.logging.FileLogger.level=FINEST
# Output file and format
-java.util.logging.FileHandler.pattern=/deployment/openremote.log
+java.util.logging.FileHandler.pattern=/deployment/manager/logs/openremote.log
java.util.logging.FileHandler.formatter=org.openremote.container.util.LogFormatter
# Rotate between 10 log files
java.util.logging.FileHandler.count=10
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 05ef575b0..6b6ea3ab4 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 702c4b68b..0b430a8ac 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.0-bin.zip
diff --git a/gradlew b/gradlew
index 9d82f7891..cccdd3d51 100755
--- a/gradlew
+++ b/gradlew
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
##############################################################################
##
@@ -6,20 +6,38 @@
##
##############################################################################
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
-warn ( ) {
+warn () {
echo "$*"
}
-die ( ) {
+die () {
echo
echo "$*"
echo
@@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
+nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
@@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
+ NONSTOP* )
+ nonstop=true
+ ;;
esac
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
# Determine the Java command to use to start the JVM.
@@ -85,7 +89,7 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
- JVM_OPTS=("$@")
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 8a0b282aa..f9553162f 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
@@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail
:init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows variants
if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
:win9xME_args
@rem Slurp the command line arguments.
@@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute
set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
:execute
@rem Setup the command line
diff --git a/keycloak/Dockerfile b/keycloak/Dockerfile
index 4fb0d2d20..0aa1fe86a 100644
--- a/keycloak/Dockerfile
+++ b/keycloak/Dockerfile
@@ -125,5 +125,3 @@ EXPOSE 8080
ENTRYPOINT ["/opt/jboss/docker-entrypoint.sh"]
CMD ["-b", "0.0.0.0"]
-
-ADD theme /opt/jboss/keycloak/themes/openremote
diff --git a/keycloak/docker-entrypoint.sh b/keycloak/docker-entrypoint.sh
index d9384a7ec..73ac23ef8 100644
--- a/keycloak/docker-entrypoint.sh
+++ b/keycloak/docker-entrypoint.sh
@@ -1,5 +1,10 @@
#!/bin/bash
+# Copy themes from deployment if they exist
+if [ -d "/deployment/keycloak/themes" ]; then
+ cp -r /deployment/keycloak/themes/* /opt/jboss/keycloak/themes/
+fi
+
if [ $SETUP_ADMIN_PASSWORD ]; then
keycloak/bin/add-user-keycloak.sh --user admin --password $SETUP_ADMIN_PASSWORD
fi
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 5ececb494..72e9d9593 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -60,11 +60,11 @@ RUN /var/lib/dpkg/info/ca-certificates-java.postinst configure
ENV JAVA_OPTS -Xmx1g
-ENV APP_DOCROOT /deployment/app
-ENV UI_DOCROOT /deployment/ui
-ENV LOGGING_CONFIG_FILE /deployment/logging.properties
-ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
-ENV MAP_SETTINGS_PATH /deployment/map/mapsettings.json
+ENV APP_DOCROOT /deployment/manager/app
+ENV UI_DOCROOT /deployment/manager/ui
+ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
+ENV MAP_TILES_PATH /deployment/manager/map/mapdata.mbtiles
+ENV MAP_SETTINGS_PATH /deployment/manager/map/mapsettings.json
EXPOSE 8080
@@ -77,4 +77,4 @@ RUN mkdir -p /deployment/extensions
ADD lib /opt/app/lib
-ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/extensions/* org.openremote.manager.Main
+ENTRYPOINT java $JAVA_OPTS -cp /opt/app/lib/*:/deployment/manager/extensions/* org.openremote.manager.Main
diff --git a/manager/rpi3.Dockerfile b/manager/rpi3.Dockerfile
index 5ee26e081..14e9acdc1 100644
--- a/manager/rpi3.Dockerfile
+++ b/manager/rpi3.Dockerfile
@@ -24,12 +24,11 @@ ENV JAVA_OPTS -Xmx500m
RUN [ "cross-build-end" ]
-ENV MANAGER_DOCROOT webapp
-ENV APP_DOCROOT /deployment/app
-ENV UI_DOCROOT /deployment/ui
-ENV LOGGING_CONFIG_FILE /deployment/logging.properties
-ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
-ENV MAP_SETTINGS_PATH /deployment/map/mapsettings.json
+ENV APP_DOCROOT /deployment/manager/app
+ENV UI_DOCROOT /deployment/manager/ui
+ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
+ENV MAP_TILES_PATH /deployment/manager/map/mapdata.mbtiles
+ENV MAP_SETTINGS_PATH /deployment/manager/map/mapsettings.json
EXPOSE 8080
diff --git a/profile/demo.yml b/profile/demo.yml
index 4fc510cab..c996992a4 100644
--- a/profile/demo.yml
+++ b/profile/demo.yml
@@ -35,14 +35,14 @@
# Database schemas will be upgraded to new versions of the services automatically, you do
# not have to wipe all data to install a new version of OpenRemote.
#
-# Your extension JAR files should be in the manager's ../deployment/extensions/ directory.
+# Your extension JAR files should be in the manager's ../deployment/manager/extensions/ directory.
#
version: '2.2'
# If you enable volume mappings in services, you need this. Otherwise, remove the volumes
volumes:
#proxy-data:
- #manager-data:
+ #deployment-data:
postgresql-data:
services:
@@ -81,18 +81,18 @@ services:
# override it with either a (different) host-mapped directory or a named data volume.
# Use local deployment data in host-mapped directory for easy development.
- # - ${DEPLOYMENT_DIRECTORY:-../deployment}/manager:/deployment
+ # - ${DEPLOYMENT_DIRECTORY:-../deployment}:/deployment
# Use a named volume. When the volume is empty on startup, the files in the manager
# image's /deployment directory will be copied into the empty volume, thus
# giving you a default configuration to modify. Access the volume with:
#
- # docker run --rm -it -v openremote_manager-data:/deployment debian:stretch /bin/bash
+ # docker run --rm -it -v openremote_deployment-data:/deployment debian:stretch /bin/bash
# > ls -la /deployment
#
# To use a volume, enable this:
#
- # - manager-data:/deployment
+ # - deployment-data:/deployment
environment:
# This switch can wipe all your Manager and Keycloak data, this is the factory reset!
@@ -108,6 +108,8 @@ services:
depends_on:
postgresql:
condition: service_healthy
+ volumes:
+ - ../ui/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
environment:
# CHANGE THIS PASSWORD BEFORE STARTING THE STACK! THIS IS ONLY FOR DEMO!
SETUP_ADMIN_PASSWORD: secret
diff --git a/profile/deploy.yml b/profile/deploy.yml
index a3a17bc3a..8c3c64093 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -166,10 +166,10 @@ services:
# Console applications can register for push notifications through FCM.
# NOTIFICATION_FIREBASE_URL: https://fcm.googleapis.com/fcm/send
# NOTIFICATION_FIREBASE_API_KEY = '...'
- # FIREBASE_CONFIG_FILE = '/deployment/fcm.json'
+ # FIREBASE_CONFIG_FILE = '/deployment/manager/fcm.json'
# Custom location of the static applications.
- # APP_DOCROOT: '/deployment/app'
+ # APP_DOCROOT: '/deployment/manager/app'
# Custom default app name to load when '/' is requested
# APP_DEFAULT: 'manager`
@@ -180,14 +180,14 @@ services:
# CONSOLE_USE_STATIC_BOWER_COMPONENTS = 'false'
# Provide a path to the map tiles database file (see https://openmaptiles.com/).
- # MAP_TILES_PATH: '/deployment/map/mapdata.mbtiles'
+ # MAP_TILES_PATH: '/deployment/manager/map/mapdata.mbtiles'
# Override the map settings such as center location and zoom when opening the
# manager's map, as well as other style details and colours.
- # MAP_SETTINGS_PATH: '/deployment/map/mapsettings.json'
+ # MAP_SETTINGS_PATH: '/deployment/manager/map/mapsettings.json'
# Override logging.properties with a file of your choice.
- # LOGGING_CONFIG_FILE: '/deployment/logging.properties'
+ # LOGGING_CONFIG_FILE: '/deployment/manager/logging.properties'
# The number of threads and therefore background tasks that can be executed at the same
# time. Used by scheduled, usually short-lived and non-blocking tasks, such as protocols
diff --git a/profile/dev-proxy.yml b/profile/dev-proxy.yml
index a5a912417..cec62abf1 100644
--- a/profile/dev-proxy.yml
+++ b/profile/dev-proxy.yml
@@ -54,7 +54,7 @@ services:
ports:
- "127.0.0.1:8081:8080"
volumes:
- - ../keycloak/theme:/opt/jboss/keycloak/themes/openremote
+ - ../ui/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
depends_on:
postgresql:
condition: service_healthy
diff --git a/profile/dev-testing.yml b/profile/dev-testing.yml
index fea99a17b..459603a6c 100644
--- a/profile/dev-testing.yml
+++ b/profile/dev-testing.yml
@@ -22,7 +22,7 @@ services:
dockerfile: dev.Dockerfile
image: openremote/keycloak_dev:latest
volumes:
- - ../keycloak/theme:/opt/jboss/keycloak/themes/openremote
+ - ../ui/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
depends_on:
postgresql:
condition: service_healthy
diff --git a/profile/dev.yml b/profile/dev.yml
index 642da04d7..e991388cd 100644
--- a/profile/dev.yml
+++ b/profile/dev.yml
@@ -38,7 +38,7 @@ services:
volumes:
# Use local deployment data in host-mapped directory for easy development. The
# ../deployment directory is the one which will be baked into the managers image.
- - ${DEPLOYMENT_DIRECTORY:-../deployment}/manager:/deployment
+ - ${DEPLOYMENT_DIRECTORY:-../deployment}:/deployment
environment:
# Always wipe and enable dev optimizations
DEV_MODE: 'true'
@@ -57,7 +57,7 @@ services:
ports:
- "127.0.0.1:8081:8080"
volumes:
- - ../keycloak/theme:/opt/jboss/keycloak/themes/openremote
+ - ../ui/keycloak/themes/openremote:/opt/jboss/keycloak/themes/openremote
depends_on:
postgresql:
condition: service_healthy
diff --git a/project.gradle b/project.gradle
index 871312c64..8e3555d74 100644
--- a/project.gradle
+++ b/project.gradle
@@ -42,8 +42,8 @@ idea {
}
if (project.convention.findPlugin(JavaPluginConvention)) {
// Change the output directory for the main and test source sets back to the old path
- sourceSets.main.output.classesDirs = new File(buildDir, "classes/main")
- sourceSets.test.output.classesDirs = new File(buildDir, "classes/test")
+ sourceSets.main.java.outputDir = new File(buildDir, "classes/main")
+ sourceSets.test.java.outputDir = new File(buildDir, "classes/test")
}
// Configure versions in gradle.properties (putting a gradle.properties file
diff --git a/ui/build.gradle b/ui/build.gradle
index e84254c82..8ce0b18db 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -17,10 +17,4 @@ task build {
task installDist {
dependsOn build
-}
-
-task clean() {
- doLast {
- delete "${project(':deployment').projectDir}/manager/app"
- }
}
\ No newline at end of file
diff --git a/ui/keycloak/build.gradle b/ui/keycloak/build.gradle
new file mode 100644
index 000000000..3d832c48a
--- /dev/null
+++ b/ui/keycloak/build.gradle
@@ -0,0 +1,10 @@
+task installDist(type: Copy) {
+ from "themes"
+ into "${resolveProject(':deployment').projectDir}/${projectDir.name}/themes"
+}
+
+task clean() {
+ doLast {
+ delete "${resolveProject(':deployment').projectDir}/${projectDir.name}"
+ }
+}
\ No newline at end of file
diff --git a/keycloak/theme/account/account.ftl b/ui/keycloak/themes/openremote/account/account.ftl
similarity index 100%
rename from keycloak/theme/account/account.ftl
rename to ui/keycloak/themes/openremote/account/account.ftl
diff --git a/keycloak/theme/account/applications.ftl b/ui/keycloak/themes/openremote/account/applications.ftl
similarity index 100%
rename from keycloak/theme/account/applications.ftl
rename to ui/keycloak/themes/openremote/account/applications.ftl
diff --git a/keycloak/theme/account/federatedIdentity.ftl b/ui/keycloak/themes/openremote/account/federatedIdentity.ftl
similarity index 100%
rename from keycloak/theme/account/federatedIdentity.ftl
rename to ui/keycloak/themes/openremote/account/federatedIdentity.ftl
diff --git a/keycloak/theme/account/log.ftl b/ui/keycloak/themes/openremote/account/log.ftl
similarity index 100%
rename from keycloak/theme/account/log.ftl
rename to ui/keycloak/themes/openremote/account/log.ftl
diff --git a/keycloak/theme/account/password.ftl b/ui/keycloak/themes/openremote/account/password.ftl
similarity index 100%
rename from keycloak/theme/account/password.ftl
rename to ui/keycloak/themes/openremote/account/password.ftl
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.eot b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.eot
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.eot
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.ijmap b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.ijmap
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ijmap
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.svg b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.svg
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.svg
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.ttf b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.ttf
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.ttf
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.woff b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.woff
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff
diff --git a/keycloak/theme/account/resources/css/MaterialIcons-Regular.woff2 b/ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2
similarity index 100%
rename from keycloak/theme/account/resources/css/MaterialIcons-Regular.woff2
rename to ui/keycloak/themes/openremote/account/resources/css/MaterialIcons-Regular.woff2
diff --git a/keycloak/theme/account/resources/css/materialize.min.css b/ui/keycloak/themes/openremote/account/resources/css/materialize.min.css
similarity index 100%
rename from keycloak/theme/account/resources/css/materialize.min.css
rename to ui/keycloak/themes/openremote/account/resources/css/materialize.min.css
diff --git a/keycloak/theme/account/resources/css/styles.css b/ui/keycloak/themes/openremote/account/resources/css/styles.css
similarity index 100%
rename from keycloak/theme/account/resources/css/styles.css
rename to ui/keycloak/themes/openremote/account/resources/css/styles.css
diff --git a/keycloak/theme/account/resources/img/favicon.png b/ui/keycloak/themes/openremote/account/resources/img/favicon.png
similarity index 100%
rename from keycloak/theme/account/resources/img/favicon.png
rename to ui/keycloak/themes/openremote/account/resources/img/favicon.png
diff --git a/keycloak/theme/account/resources/js/materialize.min.js b/ui/keycloak/themes/openremote/account/resources/js/materialize.min.js
similarity index 100%
rename from keycloak/theme/account/resources/js/materialize.min.js
rename to ui/keycloak/themes/openremote/account/resources/js/materialize.min.js
diff --git a/keycloak/theme/account/sessions.ftl b/ui/keycloak/themes/openremote/account/sessions.ftl
similarity index 100%
rename from keycloak/theme/account/sessions.ftl
rename to ui/keycloak/themes/openremote/account/sessions.ftl
diff --git a/keycloak/theme/account/template.ftl b/ui/keycloak/themes/openremote/account/template.ftl
similarity index 100%
rename from keycloak/theme/account/template.ftl
rename to ui/keycloak/themes/openremote/account/template.ftl
diff --git a/keycloak/theme/account/theme.properties b/ui/keycloak/themes/openremote/account/theme.properties
similarity index 100%
rename from keycloak/theme/account/theme.properties
rename to ui/keycloak/themes/openremote/account/theme.properties
diff --git a/keycloak/theme/account/totp.ftl b/ui/keycloak/themes/openremote/account/totp.ftl
similarity index 100%
rename from keycloak/theme/account/totp.ftl
rename to ui/keycloak/themes/openremote/account/totp.ftl
diff --git a/keycloak/theme/email/html/password-reset.ftl b/ui/keycloak/themes/openremote/email/html/password-reset.ftl
old mode 100755
new mode 100644
similarity index 100%
rename from keycloak/theme/email/html/password-reset.ftl
rename to ui/keycloak/themes/openremote/email/html/password-reset.ftl
diff --git a/keycloak/theme/email/theme.properties b/ui/keycloak/themes/openremote/email/theme.properties
similarity index 100%
rename from keycloak/theme/email/theme.properties
rename to ui/keycloak/themes/openremote/email/theme.properties
diff --git a/keycloak/theme/login/login-reset-password.ftl b/ui/keycloak/themes/openremote/login/login-reset-password.ftl
similarity index 100%
rename from keycloak/theme/login/login-reset-password.ftl
rename to ui/keycloak/themes/openremote/login/login-reset-password.ftl
diff --git a/keycloak/theme/login/login.ftl b/ui/keycloak/themes/openremote/login/login.ftl
similarity index 100%
rename from keycloak/theme/login/login.ftl
rename to ui/keycloak/themes/openremote/login/login.ftl
diff --git a/keycloak/theme/login/register.ftl b/ui/keycloak/themes/openremote/login/register.ftl
similarity index 100%
rename from keycloak/theme/login/register.ftl
rename to ui/keycloak/themes/openremote/login/register.ftl
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.eot b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.eot
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.eot
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.ijmap b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.ijmap
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ijmap
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.svg b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.svg
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.svg
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.ttf b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.ttf
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.ttf
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.woff b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.woff
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff
diff --git a/keycloak/theme/login/resources/css/MaterialIcons-Regular.woff2 b/ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2
similarity index 100%
rename from keycloak/theme/login/resources/css/MaterialIcons-Regular.woff2
rename to ui/keycloak/themes/openremote/login/resources/css/MaterialIcons-Regular.woff2
diff --git a/keycloak/theme/login/resources/css/materialize.min.css b/ui/keycloak/themes/openremote/login/resources/css/materialize.min.css
similarity index 100%
rename from keycloak/theme/login/resources/css/materialize.min.css
rename to ui/keycloak/themes/openremote/login/resources/css/materialize.min.css
diff --git a/keycloak/theme/login/resources/css/styles.css b/ui/keycloak/themes/openremote/login/resources/css/styles.css
similarity index 100%
rename from keycloak/theme/login/resources/css/styles.css
rename to ui/keycloak/themes/openremote/login/resources/css/styles.css
diff --git a/keycloak/theme/login/resources/img/favicon.png b/ui/keycloak/themes/openremote/login/resources/img/favicon.png
similarity index 100%
rename from keycloak/theme/login/resources/img/favicon.png
rename to ui/keycloak/themes/openremote/login/resources/img/favicon.png
diff --git a/keycloak/theme/login/resources/js/materialize.min.js b/ui/keycloak/themes/openremote/login/resources/js/materialize.min.js
similarity index 100%
rename from keycloak/theme/login/resources/js/materialize.min.js
rename to ui/keycloak/themes/openremote/login/resources/js/materialize.min.js
diff --git a/keycloak/theme/login/template.ftl b/ui/keycloak/themes/openremote/login/template.ftl
similarity index 100%
rename from keycloak/theme/login/template.ftl
rename to ui/keycloak/themes/openremote/login/template.ftl
diff --git a/keycloak/theme/login/theme.properties b/ui/keycloak/themes/openremote/login/theme.properties
similarity index 100%
rename from keycloak/theme/login/theme.properties
rename to ui/keycloak/themes/openremote/login/theme.properties