diff options
| author | fisherxu <fisherxu1@gmail.com> | 2019-07-26 11:23:33 +0800 |
|---|---|---|
| committer | fisherxu <fisherxu1@gmail.com> | 2019-07-26 14:33:54 +0800 |
| commit | 26902a3027f10d4b66e8b72aabd2bc1e58066865 (patch) | |
| tree | f6b5e1736bb9ec7e11a6b3dbbd822290d694244e | |
| parent | Merge pull request #935 from sujithsimon22/ble (diff) | |
| download | kubeedge-26902a3027f10d4b66e8b72aabd2bc1e58066865.tar.gz | |
rename device dir to mappers
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/Dockerfile (renamed from device/bluetooth_mapper/Dockerfile) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/Makefile (renamed from device/bluetooth_mapper/Makefile) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/README.md (renamed from device/bluetooth_mapper/README.md) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/action_manager/action_manager.go (renamed from device/bluetooth_mapper/action_manager/action_manager.go) | 2 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/configuration/config.go (renamed from device/bluetooth_mapper/configuration/config.go) | 8 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/configuration/config.yaml (renamed from device/bluetooth_mapper/configuration/config.yaml) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/configuration/config_map_types.go (renamed from device/bluetooth_mapper/configuration/config_map_types.go) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/controller/controller.go (renamed from device/bluetooth_mapper/controller/controller.go) | 12 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/data_converter/data_converter.go (renamed from device/bluetooth_mapper/data_converter/data_converter.go) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/deployment.yaml (renamed from device/bluetooth_mapper/deployment.yaml) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/helper/helper.go (renamed from device/bluetooth_mapper/helper/helper.go) | 0 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/main.go (renamed from device/bluetooth_mapper/main.go) | 4 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/scheduler/scheduler.go (renamed from device/bluetooth_mapper/scheduler/scheduler.go) | 6 | ||||
| -rw-r--r-- | mappers/bluetooth_mapper/watcher/watcher.go (renamed from device/bluetooth_mapper/watcher/watcher.go) | 6 | ||||
| -rw-r--r-- | mappers/modbus_mapper/Dockerfile (renamed from device/modbus_mapper/Dockerfile) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/Makefile (renamed from device/modbus_mapper/Makefile) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/README.md (renamed from device/modbus_mapper/README.md) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/conf/conf.json (renamed from device/modbus_mapper/conf/conf.json) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/deployment.yaml (renamed from device/modbus_mapper/deployment.yaml) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/dpl/deviceProfile.json (renamed from device/modbus_mapper/dpl/deviceProfile.json) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/sample/sample_server.js (renamed from device/modbus_mapper/sample/sample_server.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/scripts/start_modbusmapper.sh (renamed from device/modbus_mapper/scripts/start_modbusmapper.sh) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/common.js (renamed from device/modbus_mapper/src/common.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/constant.js (renamed from device/modbus_mapper/src/constant.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/devicetwin.js (renamed from device/modbus_mapper/src/devicetwin.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/index.js (renamed from device/modbus_mapper/src/index.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/modbus.js (renamed from device/modbus_mapper/src/modbus.js) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/package-lock.json (renamed from device/modbus_mapper/src/package-lock.json) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/package.json (renamed from device/modbus_mapper/src/package.json) | 0 | ||||
| -rw-r--r-- | mappers/modbus_mapper/src/watchfile.js (renamed from device/modbus_mapper/src/watchfile.js) | 0 |
31 files changed, 22 insertions, 22 deletions
@@ -108,11 +108,11 @@ depcheck: .PHONY: bluetoothdevice bluetoothdevice: - make -C device/bluetooth_mapper + make -C mappers/bluetooth_mapper .PHONY: bluetoothdevice_image - make -C device/bluetooth_mapper_docker + make -C mappers/bluetooth_mapper_docker .PHONY: bluetoothdevice_lint bluetoothdevice_lint: - make -C device/bluetooth_mapper lint + make -C mappers/bluetooth_mapper lint diff --git a/device/bluetooth_mapper/Dockerfile b/mappers/bluetooth_mapper/Dockerfile index b98cdf959..b98cdf959 100644 --- a/device/bluetooth_mapper/Dockerfile +++ b/mappers/bluetooth_mapper/Dockerfile diff --git a/device/bluetooth_mapper/Makefile b/mappers/bluetooth_mapper/Makefile index fa2e96698..fa2e96698 100644 --- a/device/bluetooth_mapper/Makefile +++ b/mappers/bluetooth_mapper/Makefile diff --git a/device/bluetooth_mapper/README.md b/mappers/bluetooth_mapper/README.md index 80b586a16..80b586a16 100644 --- a/device/bluetooth_mapper/README.md +++ b/mappers/bluetooth_mapper/README.md diff --git a/device/bluetooth_mapper/action_manager/action_manager.go b/mappers/bluetooth_mapper/action_manager/action_manager.go index dd44f39d8..4336e19ca 100644 --- a/device/bluetooth_mapper/action_manager/action_manager.go +++ b/mappers/bluetooth_mapper/action_manager/action_manager.go @@ -24,7 +24,7 @@ import ( "github.com/golang/glog" "github.com/paypal/gatt" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/data_converter" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" ) const ( diff --git a/device/bluetooth_mapper/configuration/config.go b/mappers/bluetooth_mapper/configuration/config.go index 2aa8135ff..eb216ccae 100644 --- a/device/bluetooth_mapper/configuration/config.go +++ b/mappers/bluetooth_mapper/configuration/config.go @@ -23,10 +23,10 @@ import ( "reflect" "strings" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/action_manager" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/data_converter" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/scheduler" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/watcher" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher" "gopkg.in/yaml.v2" ) diff --git a/device/bluetooth_mapper/configuration/config.yaml b/mappers/bluetooth_mapper/configuration/config.yaml index b536bcf44..b536bcf44 100644 --- a/device/bluetooth_mapper/configuration/config.yaml +++ b/mappers/bluetooth_mapper/configuration/config.yaml diff --git a/device/bluetooth_mapper/configuration/config_map_types.go b/mappers/bluetooth_mapper/configuration/config_map_types.go index 855b8d930..855b8d930 100644 --- a/device/bluetooth_mapper/configuration/config_map_types.go +++ b/mappers/bluetooth_mapper/configuration/config_map_types.go diff --git a/device/bluetooth_mapper/controller/controller.go b/mappers/bluetooth_mapper/controller/controller.go index 340980b5f..6bbc1238c 100644 --- a/device/bluetooth_mapper/controller/controller.go +++ b/mappers/bluetooth_mapper/controller/controller.go @@ -25,12 +25,12 @@ import ( "github.com/paypal/gatt" "github.com/paypal/gatt/examples/option" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/action_manager" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/configuration" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/data_converter" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/helper" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/scheduler" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/watcher" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/scheduler" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/watcher" ) // constants which can be used to convey topic information diff --git a/device/bluetooth_mapper/data_converter/data_converter.go b/mappers/bluetooth_mapper/data_converter/data_converter.go index 833bfc38f..833bfc38f 100644 --- a/device/bluetooth_mapper/data_converter/data_converter.go +++ b/mappers/bluetooth_mapper/data_converter/data_converter.go diff --git a/device/bluetooth_mapper/deployment.yaml b/mappers/bluetooth_mapper/deployment.yaml index 3d236ec84..3d236ec84 100644 --- a/device/bluetooth_mapper/deployment.yaml +++ b/mappers/bluetooth_mapper/deployment.yaml diff --git a/device/bluetooth_mapper/helper/helper.go b/mappers/bluetooth_mapper/helper/helper.go index 6ef5ed394..6ef5ed394 100644 --- a/device/bluetooth_mapper/helper/helper.go +++ b/mappers/bluetooth_mapper/helper/helper.go diff --git a/device/bluetooth_mapper/main.go b/mappers/bluetooth_mapper/main.go index b8d6baaae..1c433c61f 100644 --- a/device/bluetooth_mapper/main.go +++ b/mappers/bluetooth_mapper/main.go @@ -22,8 +22,8 @@ import ( "github.com/golang/glog" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/configuration" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/controller" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/configuration" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/controller" ) //usage is responsible for setting up the default settings of all defined command-line flags for glog. diff --git a/device/bluetooth_mapper/scheduler/scheduler.go b/mappers/bluetooth_mapper/scheduler/scheduler.go index eae344cb6..047aff4b8 100644 --- a/device/bluetooth_mapper/scheduler/scheduler.go +++ b/mappers/bluetooth_mapper/scheduler/scheduler.go @@ -24,9 +24,9 @@ import ( "github.com/golang/glog" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/action_manager" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/data_converter" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/helper" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper" ) const ( diff --git a/device/bluetooth_mapper/watcher/watcher.go b/mappers/bluetooth_mapper/watcher/watcher.go index 624c8e59b..9218b8ac5 100644 --- a/device/bluetooth_mapper/watcher/watcher.go +++ b/mappers/bluetooth_mapper/watcher/watcher.go @@ -26,9 +26,9 @@ import ( "github.com/golang/glog" "github.com/paypal/gatt" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/action_manager" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/data_converter" - "github.com/kubeedge/kubeedge/device/bluetooth_mapper/helper" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/action_manager" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/data_converter" + "github.com/kubeedge/kubeedge/mappers/bluetooth_mapper/helper" ) var DeviceConnected = make(chan bool) diff --git a/device/modbus_mapper/Dockerfile b/mappers/modbus_mapper/Dockerfile index d62599bc0..d62599bc0 100644 --- a/device/modbus_mapper/Dockerfile +++ b/mappers/modbus_mapper/Dockerfile diff --git a/device/modbus_mapper/Makefile b/mappers/modbus_mapper/Makefile index 9be3cb8d8..9be3cb8d8 100644 --- a/device/modbus_mapper/Makefile +++ b/mappers/modbus_mapper/Makefile diff --git a/device/modbus_mapper/README.md b/mappers/modbus_mapper/README.md index e9af90c96..e9af90c96 100644 --- a/device/modbus_mapper/README.md +++ b/mappers/modbus_mapper/README.md diff --git a/device/modbus_mapper/conf/conf.json b/mappers/modbus_mapper/conf/conf.json index 5d80341b8..5d80341b8 100644 --- a/device/modbus_mapper/conf/conf.json +++ b/mappers/modbus_mapper/conf/conf.json diff --git a/device/modbus_mapper/deployment.yaml b/mappers/modbus_mapper/deployment.yaml index 30a536796..30a536796 100644 --- a/device/modbus_mapper/deployment.yaml +++ b/mappers/modbus_mapper/deployment.yaml diff --git a/device/modbus_mapper/dpl/deviceProfile.json b/mappers/modbus_mapper/dpl/deviceProfile.json index 00082d319..00082d319 100644 --- a/device/modbus_mapper/dpl/deviceProfile.json +++ b/mappers/modbus_mapper/dpl/deviceProfile.json diff --git a/device/modbus_mapper/sample/sample_server.js b/mappers/modbus_mapper/sample/sample_server.js index 79341ab76..79341ab76 100644 --- a/device/modbus_mapper/sample/sample_server.js +++ b/mappers/modbus_mapper/sample/sample_server.js diff --git a/device/modbus_mapper/scripts/start_modbusmapper.sh b/mappers/modbus_mapper/scripts/start_modbusmapper.sh index 80c0dd1b1..80c0dd1b1 100644 --- a/device/modbus_mapper/scripts/start_modbusmapper.sh +++ b/mappers/modbus_mapper/scripts/start_modbusmapper.sh diff --git a/device/modbus_mapper/src/common.js b/mappers/modbus_mapper/src/common.js index 400848d62..400848d62 100644 --- a/device/modbus_mapper/src/common.js +++ b/mappers/modbus_mapper/src/common.js diff --git a/device/modbus_mapper/src/constant.js b/mappers/modbus_mapper/src/constant.js index 39193fe85..39193fe85 100644 --- a/device/modbus_mapper/src/constant.js +++ b/mappers/modbus_mapper/src/constant.js diff --git a/device/modbus_mapper/src/devicetwin.js b/mappers/modbus_mapper/src/devicetwin.js index 6f15d5425..6f15d5425 100644 --- a/device/modbus_mapper/src/devicetwin.js +++ b/mappers/modbus_mapper/src/devicetwin.js diff --git a/device/modbus_mapper/src/index.js b/mappers/modbus_mapper/src/index.js index 93945032f..93945032f 100644 --- a/device/modbus_mapper/src/index.js +++ b/mappers/modbus_mapper/src/index.js diff --git a/device/modbus_mapper/src/modbus.js b/mappers/modbus_mapper/src/modbus.js index 3167a0cb8..3167a0cb8 100644 --- a/device/modbus_mapper/src/modbus.js +++ b/mappers/modbus_mapper/src/modbus.js diff --git a/device/modbus_mapper/src/package-lock.json b/mappers/modbus_mapper/src/package-lock.json index 1c2f1de22..1c2f1de22 100644 --- a/device/modbus_mapper/src/package-lock.json +++ b/mappers/modbus_mapper/src/package-lock.json diff --git a/device/modbus_mapper/src/package.json b/mappers/modbus_mapper/src/package.json index 3737905cd..3737905cd 100644 --- a/device/modbus_mapper/src/package.json +++ b/mappers/modbus_mapper/src/package.json diff --git a/device/modbus_mapper/src/watchfile.js b/mappers/modbus_mapper/src/watchfile.js index 1cf13c675..1cf13c675 100644 --- a/device/modbus_mapper/src/watchfile.js +++ b/mappers/modbus_mapper/src/watchfile.js |
