From 96dad362c3dbff77dc3c6c8df87d6f19d5eb51bf Mon Sep 17 00:00:00 2001 From: Andrew Shvayka Date: Thu, 18 May 2017 13:13:36 +0300 Subject: [PATCH] Few minor fixes to license files --- .../thingsboard/server/dao/alarm/AlarmDaoImpl.java | 8 ++++---- .../server/dao/alarm/BaseAlarmService.java | 8 ++++---- .../org/thingsboard/server/dao/DaoTestSuite.java | 13 ++++++------- ui/src/app/api/widget.service.js | 4 +--- 4 files changed, 15 insertions(+), 18 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java index ba7e630802..493f727f48 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2017 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 - *

+ * + * 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. diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java index 120e6b75d3..adb4740f60 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java @@ -1,12 +1,12 @@ /** * Copyright © 2016-2017 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 - *

+ * + * 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. diff --git a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java index 82f9439fcd..b1502595cb 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java +++ b/dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java @@ -25,13 +25,12 @@ import java.util.Arrays; @RunWith(ClasspathSuite.class) @ClassnameFilters({ - "org.thingsboard.server.dao.service.AlarmServiceTest", -// "org.thingsboard.server.dao.service.*Test", -// "org.thingsboard.server.dao.kv.*Test", -// "org.thingsboard.server.dao.plugin.*Test", -// "org.thingsboard.server.dao.rule.*Test", -// "org.thingsboard.server.dao.attributes.*Test", -// "org.thingsboard.server.dao.timeseries.*Test" + "org.thingsboard.server.dao.service.*Test", + "org.thingsboard.server.dao.kv.*Test", + "org.thingsboard.server.dao.plugin.*Test", + "org.thingsboard.server.dao.rule.*Test", + "org.thingsboard.server.dao.attributes.*Test", + "org.thingsboard.server.dao.timeseries.*Test" }) public class DaoTestSuite { diff --git a/ui/src/app/api/widget.service.js b/ui/src/app/api/widget.service.js index 50a739722c..21c38e254c 100644 --- a/ui/src/app/api/widget.service.js +++ b/ui/src/app/api/widget.service.js @@ -20,8 +20,6 @@ import tinycolor from 'tinycolor2'; import thingsboardLedLight from '../components/led-light.directive'; import thingsboardTimeseriesTableWidget from '../widget/lib/timeseries-table-widget'; -import agrologWidgets from '../widget/lib/agrolog'; - import TbFlot from '../widget/lib/flot-widget'; import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge'; import TbAnalogueRadialGauge from '../widget/lib/analogue-radial-gauge'; @@ -34,7 +32,7 @@ import cssjs from '../../vendor/css.js/css'; import thingsboardTypes from '../common/types.constant'; import thingsboardUtils from '../common/utils.service'; -export default angular.module('thingsboard.api.widget', ['oc.lazyLoad', thingsboardLedLight, thingsboardTimeseriesTableWidget, agrologWidgets, +export default angular.module('thingsboard.api.widget', ['oc.lazyLoad', thingsboardLedLight, thingsboardTimeseriesTableWidget, thingsboardTypes, thingsboardUtils]) .factory('widgetService', WidgetService) .name;