Merge branch 'master' of github.com:ashvayka/thingsboard

2016-12-06 13:57:57 +02:00 · 2016-12-06 13:57:57 +02:00 · 50238a689e
commit 50238a689e
parent 37f82f3be6 b643b827a5
26 changed files with 56 additions and 43 deletions
--- a/application/pom.xml
+++ b/application/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/common/pom.xml
+++ b/common/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>common</artifactId>
    </parent>
    <groupId>org.thingsboard.common</groupId>
--- a/dao/pom.xml
+++ b/dao/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/dao/src/main/resources/demo-data.cql
+++ b/dao/src/main/resources/demo-data.cql
@ -413,20 +413,6 @@ INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_
 VALUES (
 	minTimeuuid ( '2016-11-01 01:02:11+0000' ),
 	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
-	'Demo Time RPC Rule',
-	'time',
-    'ACTIVE',
-	'demo time rpc rule',
-	0,
-	'[{"configuration":{"messageTypes":["RPC_REQUEST"]},"name":"RPC Request Filter","clazz":"org.thingsboard.server.extensions.core.filter.MsgTypeFilter"},{"configuration":{"methodNames":[{"name":"getTime"}]},"name":"getTime method filter","clazz":"org.thingsboard.server.extensions.core.filter.MethodNameFilter"}]',
-	null,
-	'{"configuration":{},"clazz":"org.thingsboard.server.extensions.core.action.rpc.RpcPluginAction","name":"getTimeAction"}'
-);
-
-INSERT INTO thingsboard.rule ( id, tenant_id, name, plugin_token, state, search_text, weight, filters, processor, action)
-VALUES (
-	minTimeuuid ( '2016-11-01 01:02:12+0000' ),
-	minTimeuuid ( '2016-11-01 01:02:01+0000' ),
 	'Demo Messaging RPC Rule',
 	'messaging',
    'ACTIVE',
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@ -18,7 +18,7 @@ version: '2'

 services:
  thingsboard:
-    image: "thingsboard/application:0.1"
+    image: "thingsboard/application:1.0"
    ports:
      - "8080:8080"
      - "1883:1883"
@ -31,15 +31,11 @@ services:
      - thingsboard.env
    entrypoint: ./run_thingsboard.sh
  thingsboard-db-schema:
-    build: thingsboard-db-schema
+    image: "thingsboard/thingsboard-db-schema:1.0"
    links:
      - cassandra:db
    env_file:
      - thingsboard-db-schema.env
-    volumes:
-      - "../dao/src/main/resources/schema.cql:/root/schema.cql"
-      - "../dao/src/main/resources/demo-data.cql:/root/demo-data.cql"
-      - "../dao/src/main/resources/system-data.cql:/root/system-data.cql"
    entrypoint: ./install_schema.sh
  cassandra:
    image: "cassandra:3.9"
--- a/docker/thingsboard-db-schema/Dockerfile
+++ b/docker/thingsboard-db-schema/Dockerfile
@ -23,4 +23,8 @@ RUN apt-get update \

 RUN chmod +x /root/install_schema.sh

+ADD schema.cql /root/schema.cql
+ADD demo-data.cql /root/demo-data.cql
+ADD system-data.cql /root/system-data.cql
+
 WORKDIR /root
--- a/docker/thingsboard-db-schema/build_and_deploy.sh
+++ b/docker/thingsboard-db-schema/build_and_deploy.sh
@ -0,0 +1,27 @@
+#!/bin/bash
+#
+# Copyright © 2016 The Thingsboard Authors
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+
+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 .
+
+docker login
+
+docker push thingsboard/thingsboard-db-schema:1.0
--- a/docker/thingsboard/build_and_deploy.sh
+++ b/docker/thingsboard/build_and_deploy.sh
@ -18,8 +18,8 @@

 cp ../../application/target/thingsboard.deb thingsboard.deb

-docker build -t thingsboard/application:0.1 .
+docker build -t thingsboard/application:1.0 .

 docker login

-docker push thingsboard/application:0.1
+docker push thingsboard/application:1.0
--- a/docker/thingsboard/run_thingsboard.sh
+++ b/docker/thingsboard/run_thingsboard.sh
@ -40,5 +40,5 @@ echo "Starting 'Thingsboard' service..."
 service thingsboard start

 # Wait until log file is created
-sleep 3
+sleep 10
 tail -f /var/log/thingsboard/thingsboard.log
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>extensions</artifactId>
    </parent>
    <groupId>org.thingsboard.extensions</groupId>
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/pom.xml
+++ b/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <groupId>org.thingsboard</groupId>
    <artifactId>thingsboard</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <version>1.0.0</version>
    <packaging>pom</packaging>

    <name>Thingsboard</name>
--- a/tools/pom.xml
+++ b/tools/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- 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>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>transport</artifactId>
    </parent>
    <groupId>org.thingsboard.transport</groupId>
--- a/transport/pom.xml
+++ b/transport/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>
--- a/ui/package.json
+++ b/ui/package.json
@ -1,7 +1,7 @@
 {
  "name": "thingsboard",
  "private": true,
-  "version": "0.0.1",
+  "version": "1.0.0",
  "description": "Thingsboard UI",
  "licenses": [
    {
--- a/ui/pom.xml
+++ b/ui/pom.xml
@ -20,7 +20,7 @@
    <modelVersion>4.0.0</modelVersion>
    <parent>
        <groupId>org.thingsboard</groupId>
-        <version>0.0.1-SNAPSHOT</version>
+        <version>1.0.0</version>
        <artifactId>thingsboard</artifactId>
    </parent>
    <groupId>org.thingsboard</groupId>