tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

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

pull/10/head
Andrew Shvayka 10 years ago
parent
37f82f3be6 b643b827a5
commit
50238a689e
26 changed files with 56 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      application/pom.xml
  2. 2
      common/data/pom.xml
  3. 2
      common/message/pom.xml
  4. 2
      common/pom.xml
  5. 2
      common/transport/pom.xml
  6. 2
      dao/pom.xml
  7. 14
      dao/src/main/resources/demo-data.cql
  8. 8
      docker/docker-compose.yml
  9. 4
      docker/thingsboard-db-schema/Dockerfile
  10. 27
      docker/thingsboard-db-schema/build_and_deploy.sh
  11. 4
      docker/thingsboard/build_and_deploy.sh
  12. 2
      docker/thingsboard/run_thingsboard.sh
  13. 2
      extensions-api/pom.xml
  14. 2
      extensions-core/pom.xml
  15. 2
      extensions/extension-kafka/pom.xml
  16. 2
      extensions/extension-rabbitmq/pom.xml
  17. 2
      extensions/extension-rest-api-call/pom.xml
  18. 2
      extensions/pom.xml
  19. 2
      pom.xml
  20. 2
      tools/pom.xml
  21. 2
      transport/coap/pom.xml
  22. 2
      transport/http/pom.xml
  23. 2
      transport/mqtt/pom.xml
  24. 2
      transport/pom.xml
  25. 2
      ui/package.json
  26. 2
      ui/pom.xml

2
application/pom.xml
View File

@ -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>

2
common/data/pom.xml
View File

@ -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>

2
common/message/pom.xml
View File

@ -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>

2
common/pom.xml
View File

@ -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>

2
common/transport/pom.xml
View File

@ -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>

2
dao/pom.xml
View File

@ -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>

14
dao/src/main/resources/demo-data.cql
View File

@ -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',

8
docker/docker-compose.yml
View File

@ -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"

4
docker/thingsboard-db-schema/Dockerfile
View File

@ -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

27
docker/thingsboard-db-schema/build_and_deploy.sh
View File

@ -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

4
docker/thingsboard/build_and_deploy.sh
View File

@ -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

2
docker/thingsboard/run_thingsboard.sh
View File

@ -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

2
extensions-api/pom.xml
View File

@ -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>

2
extensions-core/pom.xml
View File

@ -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>

2
extensions/extension-kafka/pom.xml
View File

@ -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>

2
extensions/extension-rabbitmq/pom.xml
View File

@ -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>

2
extensions/extension-rest-api-call/pom.xml
View File

@ -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>

2
extensions/pom.xml
View File

@ -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>

2
pom.xml
View File

@ -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>

2
tools/pom.xml
View File

@ -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>

2
transport/coap/pom.xml
View File

@ -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>

2
transport/http/pom.xml
View File

@ -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>

2
transport/mqtt/pom.xml
View File

@ -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>

2
transport/pom.xml
View File

@ -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>

2
ui/package.json
View File

@ -1,7 +1,7 @@
{
"name": "thingsboard",
"private": true,
"version": "0.0.1",
"version": "1.0.0",
"description": "Thingsboard UI",
"licenses": [
{

2
ui/pom.xml
View File

@ -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>

Write Preview
Loading…
Cancel
Save