Skip to content

armgit / core

Public Imported from GitHub
0

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

Minor updates and bug fix

Rich Turner079086c5fa7c
diff --git a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
index 682b3b278..b457530f9 100644
--- a/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
+++ b/manager/src/main/java/org/openremote/manager/notification/EmailNotificationHandler.java
@@ -102,7 +102,7 @@ public class EmailNotificationHandler implements NotificationHandler {
try {
mailer.testConnection();
} catch (Exception e) {
- LOG.log(Level.SEVERE, "Failed to connect to SMTP server so disabling email notifications");
+ LOG.log(Level.SEVERE, "Failed to connect to SMTP server so disabling email notifications", e);
mailer = null;
}
}
diff --git a/model/src/main/java/org/openremote/model/Constants.java b/model/src/main/java/org/openremote/model/Constants.java
index 8835cd70b..0b532b69c 100644
--- a/model/src/main/java/org/openremote/model/Constants.java
+++ b/model/src/main/java/org/openremote/model/Constants.java
@@ -61,6 +61,6 @@ public interface Constants {
String SETUP_EMAIL_TLS = "SETUP_EMAIL_TLS";
boolean SETUP_EMAIL_TLS_DEFAULT = true;
String SETUP_EMAIL_FROM = "SETUP_EMAIL_FROM";
- String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";
+ String SETUP_EMAIL_FROM_DEFAULT = "[email protected]";
String REQUEST_HEADER_REALM = "Auth-Realm";
}
diff --git a/profile/deploy.yml b/profile/deploy.yml
index 9c9462c0b..a35e0c63e 100644
--- a/profile/deploy.yml
+++ b/profile/deploy.yml
@@ -112,7 +112,6 @@ services:
#SETUP_EMAIL_USER: 'smtp-user'
#SETUP_EMAIL_PASSWORD: 'smtp-password'
#SETUP_EMAIL_PORT: 25
- #SETUP_EMAIL_AUTH: 'true'
#SETUP_EMAIL_TLS: 'true'
#SETUP_EMAIL_FROM_KEYCLOAK: '[email protected]'
#SETUP_EMAIL_FROM_DEFAULT: '[email protected]'
diff --git a/swarm/aws-swarm-docker-compose.yml b/swarm/aws-swarm-docker-compose.yml
index 5d226e7ea..408269151 100644
--- a/swarm/aws-swarm-docker-compose.yml
+++ b/swarm/aws-swarm-docker-compose.yml
@@ -68,7 +68,6 @@ services:
#SETUP_EMAIL_USER: 'smtp-user'
#SETUP_EMAIL_PASSWORD: 'smtp-password'
#SETUP_EMAIL_PORT: 25
- #SETUP_EMAIL_AUTH: 'true'
#SETUP_EMAIL_TLS: 'true'
#SETUP_EMAIL_FROM_KEYCLOAK: '[email protected]'
#SETUP_EMAIL_FROM_DEFAULT: '[email protected]'
diff --git a/swarm/swarm-docker-compose.yml b/swarm/swarm-docker-compose.yml
index e9882f85d..0beea1e55 100644
--- a/swarm/swarm-docker-compose.yml
+++ b/swarm/swarm-docker-compose.yml
@@ -132,7 +132,6 @@ services:
#SETUP_EMAIL_USER: 'smtp-user'
#SETUP_EMAIL_PASSWORD: 'smtp-password'
#SETUP_EMAIL_PORT: 25
- #SETUP_EMAIL_AUTH: 'true'
#SETUP_EMAIL_TLS: 'true'
#SETUP_EMAIL_FROM_KEYCLOAK: '[email protected]'
#SETUP_EMAIL_FROM_DEFAULT: '[email protected]'
diff --git a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
index 8679bc48b..24ca28b97 100644
--- a/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
+++ b/test/src/test/groovy/org/openremote/test/assets/AssetModelResourceTest.groovy
@@ -115,7 +115,7 @@ class AssetModelResourceTest extends Specification implements ManagerContainerTr
def attributeValueTypeDescriptors = assetModelResource.getAttributeValueDescriptors(null)
then: "the default value types should be present"
- attributeValueTypeDescriptors.size() == 56
+ attributeValueTypeDescriptors.size() == 58
when: "a request for Attribute value types is made"