Skip to content

armgit / core

Public Imported from GitHub
0

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

Removed UI_DOCROOT (old or-theme colors moved into shared folder)

Rich Turner9409a03ffe03
diff --git a/client/src/main/webapp/src/or-app/or-theme.html b/client/src/main/webapp/src/or-app/or-theme.html
index c7fd39bad..5d7a88d50 100644
--- a/client/src/main/webapp/src/or-app/or-theme.html
+++ b/client/src/main/webapp/src/or-app/or-theme.html
@@ -1,4 +1,4 @@
-<link rel="import" href="/ui/colors.html">
+<link rel="import" href="/shared/colors.html">
<dom-module id="or-theme">
<template>
diff --git a/deployment/manager/ui/colors.html b/deployment/manager/shared/colors.html
similarity index 100%
rename from deployment/manager/ui/colors.html
rename to deployment/manager/shared/colors.html
diff --git a/manager/Dockerfile b/manager/Dockerfile
index 3364ef334..7e5d82636 100644
--- a/manager/Dockerfile
+++ b/manager/Dockerfile
@@ -63,7 +63,6 @@ LABEL git-commit=$GIT_COMMIT
ENV JAVA_OPTS -Xmx1g
ENV APP_DOCROOT /deployment/manager/app
-ENV UI_DOCROOT /deployment/manager/ui
ENV SHARED_DOCROOT /deployment/manager/shared
ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
diff --git a/manager/rpi3.Dockerfile b/manager/rpi3.Dockerfile
index 08de119d7..e9d7945e6 100644
--- a/manager/rpi3.Dockerfile
+++ b/manager/rpi3.Dockerfile
@@ -25,7 +25,7 @@ ENV JAVA_OPTS -Xmx500m
RUN [ "cross-build-end" ]
ENV APP_DOCROOT /deployment/manager/app
-ENV UI_DOCROOT /deployment/manager/ui
+ENV SHARED_DOCROOT /deployment/manager/shared
ENV LOGGING_CONFIG_FILE /deployment/manager/logging.properties
ENV MAP_TILES_PATH /deployment/map/mapdata.mbtiles
ENV MAP_SETTINGS_PATH /deployment/map/mapsettings.json
diff --git a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
index a91e0389d..6ec70f4da 100644
--- a/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
+++ b/manager/src/main/java/org/openremote/manager/web/ManagerWebService.java
@@ -57,8 +57,6 @@ import static org.openremote.model.Constants.REQUEST_HEADER_REALM;
public class ManagerWebService extends WebService {
- public static final String UI_DOCROOT = "UI_DOCROOT";
- public static final String UI_DOCROOT_DEFAULT = "deployment/manager/ui";
public static final String APP_DOCROOT = "APP_DOCROOT";
public static final String APP_DOCROOT_DEFAULT = "deployment/manager/app";
public static final String SHARED_DOCROOT = "SHARED_DOCROOT";
@@ -72,13 +70,11 @@ public class ManagerWebService extends WebService {
public static final String STATIC_PATH = "/static";
public static final String SHARED_PATH = "/shared";
public static final String CONSOLE_PATH = "/console";
- public static final String UI_PATH = "/ui";
public static final String APP_PATH = "/app";
private static final Logger LOG = Logger.getLogger(ManagerWebService.class.getName());
protected static final Pattern PATTERN_REALM_SUB = Pattern.compile("/([a-zA-Z0-9\\-_]+)/(.*)");
protected Path appDocRoot;
- protected Path uiDocRoot;
protected Path sharedDocRoot;
protected Collection<Class<?>> apiClasses = new HashSet<>();
protected Collection<Object> apiSingletons = new HashSet<>();
@@ -140,9 +136,7 @@ public class ManagerWebService extends WebService {
// Serve deployment files unsecured (explicitly map deployment folders to request paths)
appDocRoot = Paths.get(getString(container.getConfig(), APP_DOCROOT, APP_DOCROOT_DEFAULT));
- uiDocRoot = Paths.get(getString(container.getConfig(), UI_DOCROOT, UI_DOCROOT_DEFAULT));
sharedDocRoot = Paths.get(getString(container.getConfig(), SHARED_DOCROOT, SHARED_DOCROOT_DEFAULT));
- HttpHandler uiFileHandler = createFileHandler(devMode, identityService, uiDocRoot, null);
HttpHandler sharedFileHandler = createFileHandler(devMode, identityService, sharedDocRoot, null);
HttpHandler appBaseFileHandler = Files.isDirectory(appDocRoot) ? createFileHandler(devMode, identityService, appDocRoot, null) : null;
@@ -201,8 +195,7 @@ public class ManagerWebService extends WebService {
.addPrefixPath(APP_PATH, appFileHandler)
// TODO: Remove this path prefix at some point
.addPrefixPath(CONSOLE_PATH, appFileHandler)
- .addPrefixPath(SHARED_PATH, sharedFileHandler)
- .addPrefixPath(UI_PATH, uiFileHandler);
+ .addPrefixPath(SHARED_PATH, sharedFileHandler);
// TODO: Remove this once all apps updated to new structure
final boolean useStaticBowerComponents =
diff --git a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
index 799ef3a1a..97d44a33d 100644
--- a/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
+++ b/model/src/main/java/org/openremote/model/datapoint/AssetDatapointResource.java
@@ -46,7 +46,7 @@ public interface AssetDatapointResource {
@SuccessStatusCode(200)
@RolesAllowed({"read:assets"})
@SuppressWarnings("unusable-by-js")
- ValueDatapoint<Value>[] getDatapoints(@BeanParam RequestParams requestParams,
+ ValueDatapoint[] getDatapoints(@BeanParam RequestParams requestParams,
@PathParam("assetId") String assetId,
@PathParam("attributeName") String attributeName,
@QueryParam("interval") DatapointInterval datapointInterval,
diff --git a/platform/rpi3/pi64/openremote-run.sh b/platform/rpi3/pi64/openremote-run.sh
index 012e0d7cf..6dc451ad1 100755
--- a/platform/rpi3/pi64/openremote-run.sh
+++ b/platform/rpi3/pi64/openremote-run.sh
@@ -45,7 +45,6 @@ export DATABASE_CONNECTION_TIMEOUT_SECONDS=300
# Paths
export MANAGER_DOCROOT=${BASE_PATH}/client/webapp
export APP_DOCROOT=${BASE_PATH}/server/deployment/manager/app
-export UI_DOCROOT=${BASE_PATH}/server/deployment/manager/ui
export SHARED_DOCROOT=${BASE_PATH}/server/deployment/manager/shared
export LOGGING_CONFIG_FILE=${BASE_PATH}/server/deployment/manager/logging.properties
export MAP_TILES_PATH=${BASE_PATH}/server/deployment/map/mapdata.mbtiles