diff options
| author |   Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-01-05 14:59:03 +0100 |
|---|---|---|
| committer | Sebastien Douheret <sebastien.douheret@iot.bzh> | 2018-01-05 14:59:03 +0100 |
| commit | 2a7a112bbffcd41a3436c086f1910ea7a9c94744 (patch) | |
| tree | c91e16012cf6ecd5c8bd5c5a55296acbcb51ea25 | |
| parent | b36a9d0846acddb1ae1716b42f1296f6ad88b05b (diff) | |
Migration to AGL gerrit (update go import)
Signed-off-by: Sebastien Douheret <sebastien.douheret@iot.bzh>
37 files changed, 88 insertions, 89 deletions
@@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret <sebastien@iot.bzh> # @@ -57,7 +57,7 @@ endif HOST_GOOS=$(shell go env GOOS) HOST_GOARCH=$(shell go env GOARCH) ARCH=$(HOST_GOOS)-$(HOST_GOARCH) -REPOPATH=github.com/iotbzh/xds-server +REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/xds-server EXT= ifeq ($(HOST_GOOS), windows) @@ -66,7 +66,7 @@ endif mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST))) ROOT_SRCDIR := $(patsubst %/,%,$(dir $(mkfile_path))) -ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../..) +ROOT_GOPRJ := $(abspath $(ROOT_SRCDIR)/../../../../../..) LOCAL_BINDIR := $(ROOT_SRCDIR)/bin LOCAL_TOOLSDIR := $(ROOT_SRCDIR)/tools/${HOST_GOOS} PACKAGE_DIR := $(ROOT_SRCDIR)/package @@ -189,8 +189,8 @@ vendor: tools/glide glide.yaml $(LOCAL_TOOLSDIR)/glide install --strip-vendor vendor/debug: vendor - (cd vendor/github.com/iotbzh && \ - rm -rf xds-common && ln -s ../../../../xds-common ) + (cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \ + rm -rf xds-common && ln -s ../../../../../../xds-common ) .PHONY: tools/glide tools/glide: @@ -1,4 +1,4 @@ -package: github.com/iotbzh/xds-server +package: gerrit.automotivelinux.org/gerrit/src/xds/xds-server license: Apache-2 owners: - name: Sebastien Douheret @@ -24,7 +24,7 @@ import: version: master - package: github.com/satori/go.uuid version: ^1.1.0 -- package: github.com/iotbzh/xds-common +- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git version: ^0.1.0 subpackages: - golib/common diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go index bb50ea8..542f07a 100644 --- a/lib/syncthing/st.go +++ b/lib/syncthing/st.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -36,9 +36,9 @@ import ( "regexp" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" "github.com/Sirupsen/logrus" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xdsconfig" "github.com/syncthing/syncthing/lib/config" ) diff --git a/lib/syncthing/stEvent.go b/lib/syncthing/stEvent.go index 948f88a..605778c 100644 --- a/lib/syncthing/stEvent.go +++ b/lib/syncthing/stEvent.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go index 1dcbfe1..8a41968 100644 --- a/lib/syncthing/stfolder.go +++ b/lib/syncthing/stfolder.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "path/filepath" "strings" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" stconfig "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/protocol" ) diff --git a/lib/xdsconfig/builderconfig.go b/lib/xdsconfig/builderconfig.go index 136ff16..ed41275 100644 --- a/lib/xdsconfig/builderconfig.go +++ b/lib/xdsconfig/builderconfig.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ import ( "errors" "net" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" ) // NewBuilderConfig creates a new BuilderConfig instance diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go index 3a82b44..11960c9 100644 --- a/lib/xdsconfig/config.go +++ b/lib/xdsconfig/config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,10 +23,10 @@ import ( "os" "path/filepath" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // Config parameters (json format) of /config command diff --git a/lib/xdsconfig/data.go b/lib/xdsconfig/data.go index 486cb69..b582ec5 100644 --- a/lib/xdsconfig/data.go +++ b/lib/xdsconfig/data.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "os" "path/filepath" - common "github.com/iotbzh/xds-common/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" uuid "github.com/satori/go.uuid" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/xdsconfig/fileconfig.go b/lib/xdsconfig/fileconfig.go index bf8aa25..46afc57 100644 --- a/lib/xdsconfig/fileconfig.go +++ b/lib/xdsconfig/fileconfig.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,7 +25,7 @@ import ( "path/filepath" "strings" - common "github.com/iotbzh/xds-common/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" ) // ConfigDir Directory in user HOME directory where xds config will be saved diff --git a/lib/xdsserver/apiv1-config.go b/lib/xdsserver/apiv1-config.go index 23b299b..3bb58e4 100644 --- a/lib/xdsserver/apiv1-config.go +++ b/lib/xdsserver/apiv1-config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,9 +21,9 @@ import ( "net/http" "sync" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) var confMut sync.Mutex diff --git a/lib/xdsserver/apiv1-events.go b/lib/xdsserver/apiv1-events.go index eedd747..e2b0133 100644 --- a/lib/xdsserver/apiv1-events.go +++ b/lib/xdsserver/apiv1-events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // eventsList Registering for events that will be send over a WS diff --git a/lib/xdsserver/apiv1-exec.go b/lib/xdsserver/apiv1-exec.go index bc45fdb..2337de6 100644 --- a/lib/xdsserver/apiv1-exec.go +++ b/lib/xdsserver/apiv1-exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,10 +26,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-common/golib/eows" - "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/kr/pty" ) diff --git a/lib/xdsserver/apiv1-folders.go b/lib/xdsserver/apiv1-folders.go index a395b80..cb03175 100644 --- a/lib/xdsserver/apiv1-folders.go +++ b/lib/xdsserver/apiv1-folders.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getFolders returns all folders configuration diff --git a/lib/xdsserver/apiv1-make.go b/lib/xdsserver/apiv1-make.go index ef2e331..226561b 100644 --- a/lib/xdsserver/apiv1-make.go +++ b/lib/xdsserver/apiv1-make.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,8 +18,8 @@ package xdsserver import ( + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" ) /* Deprecated command - should be removed */ diff --git a/lib/xdsserver/apiv1-sdks.go b/lib/xdsserver/apiv1-sdks.go index e69b82d..7bb9767 100644 --- a/lib/xdsserver/apiv1-sdks.go +++ b/lib/xdsserver/apiv1-sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package xdsserver import ( "net/http" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getSdks returns all SDKs configuration diff --git a/lib/xdsserver/apiv1-version.go b/lib/xdsserver/apiv1-version.go index e3a238a..754310a 100644 --- a/lib/xdsserver/apiv1-version.go +++ b/lib/xdsserver/apiv1-version.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,8 +20,8 @@ package xdsserver import ( "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) // getInfo : return various information about server diff --git a/lib/xdsserver/apiv1.go b/lib/xdsserver/apiv1.go index f9d5948..67d09b5 100644 --- a/lib/xdsserver/apiv1.go +++ b/lib/xdsserver/apiv1.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xdsserver/events.go b/lib/xdsserver/events.go index 007b89a..4ae1ff3 100644 --- a/lib/xdsserver/events.go +++ b/lib/xdsserver/events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" ) // EventDef Definition on one event diff --git a/lib/xdsserver/folder-interface.go b/lib/xdsserver/folder-interface.go index 151530c..18cdb54 100644 --- a/lib/xdsserver/folder-interface.go +++ b/lib/xdsserver/folder-interface.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,7 +17,7 @@ package xdsserver -import "github.com/iotbzh/xds-server/lib/xsapiv1" +import "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" type FolderEventCBData map[string]interface{} type FolderEventCB func(cfg *xsapiv1.FolderConfig, data *FolderEventCBData) diff --git a/lib/xdsserver/folder-pathmap.go b/lib/xdsserver/folder-pathmap.go index 0452b13..8024331 100644 --- a/lib/xdsserver/folder-pathmap.go +++ b/lib/xdsserver/folder-pathmap.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "path/filepath" "strings" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/folder-st-disable.go b/lib/xdsserver/folder-st-disable.go index c52854d..f5e19d8 100644 --- a/lib/xdsserver/folder-st-disable.go +++ b/lib/xdsserver/folder-st-disable.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -18,7 +18,7 @@ package xdsserver import ( - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/folder-st.go b/lib/xdsserver/folder-st.go index 9cbb570..9c89700 100644 --- a/lib/xdsserver/folder-st.go +++ b/lib/xdsserver/folder-st.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,8 +23,8 @@ import ( "path/filepath" "strings" - st "github.com/iotbzh/xds-server/lib/syncthing" - "github.com/iotbzh/xds-server/lib/xsapiv1" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" "github.com/syncthing/syncthing/lib/config" ) diff --git a/lib/xdsserver/folders.go b/lib/xdsserver/folders.go index 93d2898..fa24878 100644 --- a/lib/xdsserver/folders.go +++ b/lib/xdsserver/folders.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,10 +26,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/franciscocpg/reflectme" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xdsconfig" - "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/xdsserver/sdk.go b/lib/xdsserver/sdk.go index e5d4d7c..90dae19 100644 --- a/lib/xdsserver/sdk.go +++ b/lib/xdsserver/sdk.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,10 +27,10 @@ import ( "strings" "time" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib/eows" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/Sirupsen/logrus" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-common/golib/eows" - "github.com/iotbzh/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/xdsserver/sdks.go b/lib/xdsserver/sdks.go index b7f7e2e..a18d94f 100644 --- a/lib/xdsserver/sdks.go +++ b/lib/xdsserver/sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "strings" "sync" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" ) // SDKs List of installed SDK diff --git a/lib/xdsserver/sessions.go b/lib/xdsserver/sessions.go index f7ce846..69fe819 100644 --- a/lib/xdsserver/sessions.go +++ b/lib/xdsserver/sessions.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,7 +23,7 @@ import ( "time" "github.com/gin-gonic/gin" - "github.com/googollee/go-socket.io" + socketio "github.com/googollee/go-socket.io" uuid "github.com/satori/go.uuid" "github.com/syncthing/syncthing/lib/sync" ) @@ -217,8 +217,8 @@ func (s *Sessions) monitorSessMap() { s.Log.Debugln("Stop monitorSessMap") return case <-time.After(sessionMonitorTime * time.Second): - s.LogSillyf("Sessions Map size: %d", len(s.sessMap)) - s.LogSillyf("Sessions Map : %v", s.sessMap) + s.LogSillyf("Sessions Map size: %d", len(s.sessMap)) + s.LogSillyf("Sessions Map : %v", s.sessMap) if len(s.sessMap) > maxSessions { s.Log.Errorln("TOO MUCH sessions, cleanup old ones !") diff --git a/lib/xdsserver/webserver.go b/lib/xdsserver/webserver.go index 27b212b..f1c88d2 100644 --- a/lib/xdsserver/webserver.go +++ b/lib/xdsserver/webserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -28,7 +28,7 @@ import ( "github.com/Sirupsen/logrus" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" - "github.com/googollee/go-socket.io" + socketio "github.com/googollee/go-socket.io" ) // WebServer . diff --git a/lib/xdsserver/xdsserver.go b/lib/xdsserver/xdsserver.go index 46e860b..bb8f755 100644 --- a/lib/xdsserver/xdsserver.go +++ b/lib/xdsserver/xdsserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,12 +26,11 @@ import ( "syscall" "time" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xsapiv1" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - "github.com/iotbzh/xds-server/lib/xsapiv1" - - "github.com/iotbzh/xds-server/lib/syncthing" - "github.com/iotbzh/xds-server/lib/xdsconfig" ) const cookieMaxAge = "3600" diff --git a/lib/xsapiv1/config.go b/lib/xsapiv1/config.go index 122ffef..860427f 100644 --- a/lib/xsapiv1/config.go +++ b/lib/xsapiv1/config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xsapiv1/events.go b/lib/xsapiv1/events.go index 1eb981c..aa17187 100644 --- a/lib/xsapiv1/events.go +++ b/lib/xsapiv1/events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xsapiv1/exec.go b/lib/xsapiv1/exec.go index 99f2454..78f05e2 100644 --- a/lib/xsapiv1/exec.go +++ b/lib/xsapiv1/exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xsapiv1/folders.go b/lib/xsapiv1/folders.go index 60e0b4c..a6ff7f1 100644 --- a/lib/xsapiv1/folders.go +++ b/lib/xsapiv1/folders.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xsapiv1/sdks.go b/lib/xsapiv1/sdks.go index 44b0940..f751fc6 100644 --- a/lib/xsapiv1/sdks.go +++ b/lib/xsapiv1/sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xsapiv1/version.go b/lib/xsapiv1/version.go index 9762596..3df9dce 100644 --- a/lib/xsapiv1/version.go +++ b/lib/xsapiv1/version.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret <sebastien@iot.bzh> * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,10 +24,10 @@ import ( "fmt" "os" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server/lib/xdsserver" "github.com/Sirupsen/logrus" "github.com/codegangsta/cli" - "github.com/iotbzh/xds-server/lib/xdsconfig" - "github.com/iotbzh/xds-server/lib/xdsserver" ) const ( diff --git a/webapp/README.md b/webapp/README.md index 015a70d..84734a7 100644 --- a/webapp/README.md +++ b/webapp/README.md @@ -2,4 +2,4 @@ This a basic web page that just gives basic instructions. -XDS Dashboard is now part of [xds-agent](https://github.com/iotbzh/xds-agent). +XDS Dashboard is now part of [xds-agent](https://gerrit.automotivelinux.org/gerrit/#/admin/projects/src/xds/xds-agent). diff --git a/webapp/package.json b/webapp/package.json index 5acda9f..ec795ba 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -4,12 +4,12 @@ "description": "X (cross) Development System minimal dashboard", "repository": { "type": "git", - "url": "https://github.com/iotbzh/xds-server" + "url": "https://gerrit.automotivelinux.org/gerrit/src/xds/xds-server" }, "author": "Sebastien Douheret [IoT.bzh]", "license": "Apache-2.0", "bugs": { - "url": "https://github.com/iotbzh/xds-server/issues" + "url": "https://jira.automotivelinux.org/projects/SPEC/issues" }, "dependencies": { "font-awesome": "^4.7.0" |