Showing
4 changed files
with
15 additions
and
18 deletions
1 | /** | 1 | /** |
2 | * Copyright © 2016-2017 The Thingsboard Authors | 2 | * Copyright © 2016-2017 The Thingsboard Authors |
3 | - * <p> | 3 | + * |
4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
6 | * You may obtain a copy of the License at | 6 | * You may obtain a copy of the License at |
7 | - * <p> | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * <p> | 7 | + * |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | + * | ||
10 | * Unless required by applicable law or agreed to in writing, software | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | * distributed under the License is distributed on an "AS IS" BASIS, | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
1 | /** | 1 | /** |
2 | * Copyright © 2016-2017 The Thingsboard Authors | 2 | * Copyright © 2016-2017 The Thingsboard Authors |
3 | - * <p> | 3 | + * |
4 | * Licensed under the Apache License, Version 2.0 (the "License"); | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * you may not use this file except in compliance with the License. | 5 | * you may not use this file except in compliance with the License. |
6 | * You may obtain a copy of the License at | 6 | * You may obtain a copy of the License at |
7 | - * <p> | ||
8 | - * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | - * <p> | 7 | + * |
8 | + * http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | + * | ||
10 | * Unless required by applicable law or agreed to in writing, software | 10 | * Unless required by applicable law or agreed to in writing, software |
11 | * distributed under the License is distributed on an "AS IS" BASIS, | 11 | * distributed under the License is distributed on an "AS IS" BASIS, |
12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | 12 | * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
@@ -25,13 +25,12 @@ import java.util.Arrays; | @@ -25,13 +25,12 @@ import java.util.Arrays; | ||
25 | 25 | ||
26 | @RunWith(ClasspathSuite.class) | 26 | @RunWith(ClasspathSuite.class) |
27 | @ClassnameFilters({ | 27 | @ClassnameFilters({ |
28 | - "org.thingsboard.server.dao.service.AlarmServiceTest", | ||
29 | -// "org.thingsboard.server.dao.service.*Test", | ||
30 | -// "org.thingsboard.server.dao.kv.*Test", | ||
31 | -// "org.thingsboard.server.dao.plugin.*Test", | ||
32 | -// "org.thingsboard.server.dao.rule.*Test", | ||
33 | -// "org.thingsboard.server.dao.attributes.*Test", | ||
34 | -// "org.thingsboard.server.dao.timeseries.*Test" | 28 | + "org.thingsboard.server.dao.service.*Test", |
29 | + "org.thingsboard.server.dao.kv.*Test", | ||
30 | + "org.thingsboard.server.dao.plugin.*Test", | ||
31 | + "org.thingsboard.server.dao.rule.*Test", | ||
32 | + "org.thingsboard.server.dao.attributes.*Test", | ||
33 | + "org.thingsboard.server.dao.timeseries.*Test" | ||
35 | }) | 34 | }) |
36 | public class DaoTestSuite { | 35 | public class DaoTestSuite { |
37 | 36 |
@@ -20,8 +20,6 @@ import tinycolor from 'tinycolor2'; | @@ -20,8 +20,6 @@ import tinycolor from 'tinycolor2'; | ||
20 | import thingsboardLedLight from '../components/led-light.directive'; | 20 | import thingsboardLedLight from '../components/led-light.directive'; |
21 | import thingsboardTimeseriesTableWidget from '../widget/lib/timeseries-table-widget'; | 21 | import thingsboardTimeseriesTableWidget from '../widget/lib/timeseries-table-widget'; |
22 | 22 | ||
23 | -import agrologWidgets from '../widget/lib/agrolog'; | ||
24 | - | ||
25 | import TbFlot from '../widget/lib/flot-widget'; | 23 | import TbFlot from '../widget/lib/flot-widget'; |
26 | import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge'; | 24 | import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge'; |
27 | import TbAnalogueRadialGauge from '../widget/lib/analogue-radial-gauge'; | 25 | import TbAnalogueRadialGauge from '../widget/lib/analogue-radial-gauge'; |
@@ -34,7 +32,7 @@ import cssjs from '../../vendor/css.js/css'; | @@ -34,7 +32,7 @@ import cssjs from '../../vendor/css.js/css'; | ||
34 | import thingsboardTypes from '../common/types.constant'; | 32 | import thingsboardTypes from '../common/types.constant'; |
35 | import thingsboardUtils from '../common/utils.service'; | 33 | import thingsboardUtils from '../common/utils.service'; |
36 | 34 | ||
37 | -export default angular.module('thingsboard.api.widget', ['oc.lazyLoad', thingsboardLedLight, thingsboardTimeseriesTableWidget, agrologWidgets, | 35 | +export default angular.module('thingsboard.api.widget', ['oc.lazyLoad', thingsboardLedLight, thingsboardTimeseriesTableWidget, |
38 | thingsboardTypes, thingsboardUtils]) | 36 | thingsboardTypes, thingsboardUtils]) |
39 | .factory('widgetService', WidgetService) | 37 | .factory('widgetService', WidgetService) |
40 | .name; | 38 | .name; |