Prosoft Git

thingsboard-aplcache

Merge pull request #48 from thingsboard/release-1.1 Release …

2/7/2017 10:57:07 AM
Andrew Shvayka

Andrew Shvayka

Commit: efb03e4

Tree: 084b3ad

Parents: 3bc3227
3d0972d

Changes

application/pom.xml 2(+1 -1)

application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java 19(+15 -4)

common/data/pom.xml 2(+1 -1)

common/message/pom.xml 2(+1 -1)

common/pom.xml 2(+1 -1)

common/transport/pom.xml 2(+1 -1)

dao/pom.xml 2(+1 -1)

docker/docker-compose.yml 4(+2 -2)

docker/thingsboard/build_and_deploy.sh 5(+3 -2)

docker/thingsboard-db-schema/build_and_deploy.sh 5(+3 -2)

extensions/extension-kafka/pom.xml 2(+1 -1)

extensions/extension-rabbitmq/pom.xml 2(+1 -1)

extensions/extension-rest-api-call/pom.xml 2(+1 -1)

extensions/pom.xml 2(+1 -1)

extensions-api/pom.xml 2(+1 -1)

extensions-core/pom.xml 2(+1 -1)

pom.xml 2(+1 -1)

tools/pom.xml 2(+1 -1)

transport/coap/pom.xml 2(+1 -1)

transport/http/pom.xml 2(+1 -1)

transport/mqtt/pom.xml 2(+1 -1)

transport/pom.xml 2(+1 -1)

ui/pom.xml 2(+1 -1)

Details

application/pom.xml 2(+1 -1) 

diff --git a/application/pom.xml b/application/pom.xml
index 6efb019..d425217 100644
--- a/application/pom.xml
+++ b/application/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java 19(+15 -4) 

diff --git a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java
index e3a337a..d1df671 100644
--- a/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java
+++ b/application/src/main/java/org/thingsboard/server/controller/plugin/PluginWebSocketHandler.java
@@ -23,6 +23,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.BeanCreationNotAllowedException;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -57,10 +58,12 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug
     private static final ConcurrentMap<String, SessionMetaData> internalSessionMap = new ConcurrentHashMap<>();
     private static final ConcurrentMap<String, String> externalSessionMap = new ConcurrentHashMap<>();
 
-    @Autowired @Lazy
+    @Autowired
+    @Lazy
     private ActorService actorService;
 
-    @Autowired @Lazy
+    @Autowired
+    @Lazy
     private PluginService pluginService;
 
     @Override
@@ -105,7 +108,7 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug
         super.handleTransportError(session, tError);
         SessionMetaData sessionMd = internalSessionMap.get(session.getId());
         if (sessionMd != null) {
-            actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError)));
+            processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onError(tError)));
         } else {
             log.warn("[{}] Failed to find session", session.getId());
         }
@@ -118,11 +121,19 @@ public class PluginWebSocketHandler extends TextWebSocketHandler implements Plug
         SessionMetaData sessionMd = internalSessionMap.remove(session.getId());
         if (sessionMd != null) {
             externalSessionMap.remove(sessionMd.sessionRef.getSessionId());
-            actorService.process(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed()));
+            processInActorService(new SessionEventPluginWebSocketMsg(sessionMd.sessionRef, SessionEvent.onClosed()));
         }
         log.info("[{}] Session is closed", session.getId());
     }
 
+    private void processInActorService(SessionEventPluginWebSocketMsg msg) {
+        try {
+            actorService.process(msg);
+        } catch (BeanCreationNotAllowedException e) {
+            log.warn("[{}] Failed to close session due to possible shutdown state", msg.getSessionRef().getSessionId());
+        }
+    }
+
     private PluginWebsocketSessionRef toRef(WebSocketSession session) throws IOException {
         URI sessionUri = session.getUri();
         String path = sessionUri.getPath();

common/data/pom.xml 2(+1 -1) 

diff --git a/common/data/pom.xml b/common/data/pom.xml
index 48a2938..1c69e68 100644
--- a/common/data/pom.xml
+++ b/common/data/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/message/pom.xml 2(+1 -1) 

diff --git a/common/message/pom.xml b/common/message/pom.xml
index 19b01b0..b0539fe 100644
--- a/common/message/pom.xml
+++ b/common/message/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/pom.xml 2(+1 -1) 

diff --git a/common/pom.xml b/common/pom.xml
index f4e1f15..e5c6978 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

common/transport/pom.xml 2(+1 -1) 

diff --git a/common/transport/pom.xml b/common/transport/pom.xml
index 32304ee..8ae3463 100644
--- a/common/transport/pom.xml
+++ b/common/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

dao/pom.xml 2(+1 -1) 

diff --git a/dao/pom.xml b/dao/pom.xml
index 199da11..908cd81 100644
--- a/dao/pom.xml
+++ b/dao/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

docker/docker-compose.yml 4(+2 -2) 

diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index d8b0311..cacea8c 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2'
 
 services:
   thingsboard:
-    image: "thingsboard/application:1.0.1"
+    image: "thingsboard/application:1.1.0"
     ports:
       - "8080:8080"
       - "1883:1883"
@@ -27,7 +27,7 @@ services:
       - thingsboard.env
     entrypoint: ./run_thingsboard.sh
   thingsboard-db-schema:
-    image: "thingsboard/thingsboard-db-schema:1.0.1"
+    image: "thingsboard/thingsboard-db-schema:1.1.0"
     env_file:
       - thingsboard-db-schema.env
     entrypoint: ./install_schema.sh

docker/thingsboard/build_and_deploy.sh 5(+3 -2) 

diff --git a/docker/thingsboard/build_and_deploy.sh b/docker/thingsboard/build_and_deploy.sh
index a97ad05..8037046 100755
--- a/docker/thingsboard/build_and_deploy.sh
+++ b/docker/thingsboard/build_and_deploy.sh
@@ -18,8 +18,9 @@
 
 cp ../../application/target/thingsboard.deb thingsboard.deb
 
-docker build -t thingsboard/application:1.0.1 .
+docker build -t thingsboard/application:1.1.0 -t thingsboard/application:latest .
 
 docker login
 
-docker push thingsboard/application:1.0.1
\ No newline at end of file
+docker push thingsboard/application:1.1.0
+docker push thingsboard/application:latest
\ No newline at end of file

docker/thingsboard-db-schema/build_and_deploy.sh 5(+3 -2) 

diff --git a/docker/thingsboard-db-schema/build_and_deploy.sh b/docker/thingsboard-db-schema/build_and_deploy.sh
index 5032003..6689909 100755
--- a/docker/thingsboard-db-schema/build_and_deploy.sh
+++ b/docker/thingsboard-db-schema/build_and_deploy.sh
@@ -20,8 +20,9 @@ cp ../../dao/src/main/resources/schema.cql schema.cql
 cp ../../dao/src/main/resources/demo-data.cql demo-data.cql
 cp ../../dao/src/main/resources/system-data.cql system-data.cql
 
-docker build -t thingsboard/thingsboard-db-schema:1.0.1 .
+docker build -t thingsboard/thingsboard-db-schema:1.1.0 -t thingsboard/thingsboard-db-schema:latest .
 
 docker login
 
-docker push thingsboard/thingsboard-db-schema:1.0.1
\ No newline at end of file
+docker push thingsboard/thingsboard-db-schema:1.1.0
+docker push thingsboard/thingsboard-db-schema:latest
\ No newline at end of file

extensions/extension-kafka/pom.xml 2(+1 -1) 

diff --git a/extensions/extension-kafka/pom.xml b/extensions/extension-kafka/pom.xml
index 3b8f803..e5e5472 100644
--- a/extensions/extension-kafka/pom.xml
+++ b/extensions/extension-kafka/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>

extensions/extension-rabbitmq/pom.xml 2(+1 -1) 

diff --git a/extensions/extension-rabbitmq/pom.xml b/extensions/extension-rabbitmq/pom.xml
index a95b7fa..d4aa696 100644
--- a/extensions/extension-rabbitmq/pom.xml
+++ b/extensions/extension-rabbitmq/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>

extensions/extension-rest-api-call/pom.xml 2(+1 -1) 

diff --git a/extensions/extension-rest-api-call/pom.xml b/extensions/extension-rest-api-call/pom.xml
index 4c54bf0..eecec64 100644
--- a/extensions/extension-rest-api-call/pom.xml
+++ b/extensions/extension-rest-api-call/pom.xml
@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>extensions</artifactId>
     </parent>
     <groupId>org.thingsboard.extensions</groupId>

extensions/pom.xml 2(+1 -1) 

diff --git a/extensions/pom.xml b/extensions/pom.xml
index 9e2cc30..ae1d4f0 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

extensions-api/pom.xml 2(+1 -1) 

diff --git a/extensions-api/pom.xml b/extensions-api/pom.xml
index 79f4380..65cd5da 100644
--- a/extensions-api/pom.xml
+++ b/extensions-api/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

extensions-core/pom.xml 2(+1 -1) 

diff --git a/extensions-core/pom.xml b/extensions-core/pom.xml
index d4f903b..0773dcb 100644
--- a/extensions-core/pom.xml
+++ b/extensions-core/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

pom.xml 2(+1 -1) 

diff --git a/pom.xml b/pom.xml
index 069c00c..c7f45ce 100755
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>

tools/pom.xml 2(+1 -1) 

diff --git a/tools/pom.xml b/tools/pom.xml
index 53a486e..be130ba 100644
--- a/tools/pom.xml
+++ b/tools/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

transport/coap/pom.xml 2(+1 -1) 

diff --git a/transport/coap/pom.xml b/transport/coap/pom.xml
index 0fe08a6..b86897e 100644
--- a/transport/coap/pom.xml
+++ b/transport/coap/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/http/pom.xml 2(+1 -1) 

diff --git a/transport/http/pom.xml b/transport/http/pom.xml
index d348767..839e460 100644
--- a/transport/http/pom.xml
+++ b/transport/http/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/mqtt/pom.xml 2(+1 -1) 

diff --git a/transport/mqtt/pom.xml b/transport/mqtt/pom.xml
index a491226..ec70b50 100644
--- a/transport/mqtt/pom.xml
+++ b/transport/mqtt/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/pom.xml 2(+1 -1) 

diff --git a/transport/pom.xml b/transport/pom.xml
index 4d4a705..3cb6d55 100644
--- a/transport/pom.xml
+++ b/transport/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

ui/pom.xml 2(+1 -1) 

diff --git a/ui/pom.xml b/ui/pom.xml
index e80ec33..b931c04 100644
--- a/ui/pom.xml
+++ b/ui/pom.xml
@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>1.1.0-SNAPSHOT</version>
+        <version>1.1.0</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>

Bonobo Git Server (6.3.0.632) © 2015 Jakub Chodounský · Official Page · Github