dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Few minor fixes to license files

Browse Source
This commit is contained in:
Andrew Shvayka 2017-05-18 13:13:36 +03:00
parent 7c7b70c5ab
commit 96dad362c3
4 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/src/main/java/org/thingsboard/server/dao/alarm/AlarmDaoImpl.java
View File

@ -1,12 +1,12 @@
/** /**
* Copyright © 2016-2017 The Thingsboard Authors * Copyright © 2016-2017 The Thingsboard Authors
* <p> *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* <p> *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* <p> *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

6
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java
View File

@ -1,12 +1,12 @@
/** /**
* Copyright © 2016-2017 The Thingsboard Authors * Copyright © 2016-2017 The Thingsboard Authors
* <p> *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * You may obtain a copy of the License at
* <p> *
* http://www.apache.org/licenses/LICENSE-2.0 * http://www.apache.org/licenses/LICENSE-2.0
* <p> *
* Unless required by applicable law or agreed to in writing, software * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

13
dao/src/test/java/org/thingsboard/server/dao/DaoTestSuite.java
View File

@ -25,13 +25,12 @@ import java.util.Arrays;
@RunWith(ClasspathSuite.class) @RunWith(ClasspathSuite.class)
@ClassnameFilters({ @ClassnameFilters({
"org.thingsboard.server.dao.service.AlarmServiceTest", "org.thingsboard.server.dao.service.*Test",
// "org.thingsboard.server.dao.service.*Test", "org.thingsboard.server.dao.kv.*Test",
// "org.thingsboard.server.dao.kv.*Test", "org.thingsboard.server.dao.plugin.*Test",
// "org.thingsboard.server.dao.plugin.*Test", "org.thingsboard.server.dao.rule.*Test",
// "org.thingsboard.server.dao.rule.*Test", "org.thingsboard.server.dao.attributes.*Test",
// "org.thingsboard.server.dao.attributes.*Test", "org.thingsboard.server.dao.timeseries.*Test"
// "org.thingsboard.server.dao.timeseries.*Test"
}) })
public class DaoTestSuite { public class DaoTestSuite {

4
ui/src/app/api/widget.service.js
View File

@ -20,8 +20,6 @@ import tinycolor from 'tinycolor2';
import thingsboardLedLight from '../components/led-light.directive'; import thingsboardLedLight from '../components/led-light.directive';
import thingsboardTimeseriesTableWidget from '../widget/lib/timeseries-table-widget'; import thingsboardTimeseriesTableWidget from '../widget/lib/timeseries-table-widget';
import agrologWidgets from '../widget/lib/agrolog';
import TbFlot from '../widget/lib/flot-widget'; import TbFlot from '../widget/lib/flot-widget';
import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge'; import TbAnalogueLinearGauge from '../widget/lib/analogue-linear-gauge';
import TbAnalogueRadialGauge from '../widget/lib/analogue-radial-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 thingsboardTypes from '../common/types.constant';
import thingsboardUtils from '../common/utils.service'; 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]) thingsboardTypes, thingsboardUtils])
.factory('widgetService', WidgetService) .factory('widgetService', WidgetService)
.name; .name;