From a2cc38902ff7528870822110c4f04329a3918564 Mon Sep 17 00:00:00 2001 From: Sebastien Douheret Date: Fri, 5 Jan 2018 15:50:09 +0100 Subject: Migration to AGL gerrit (update go import) Signed-off-by: Sebastien Douheret --- .vscode/settings.json | 5 +++-- Makefile | 12 ++++++------ conf.d/etc/profile.d/xds-agent.sh | 2 +- glide.yaml | 6 +++--- lib/agent/agent.go | 7 ++++--- lib/agent/apiv1-browse.go | 2 +- lib/agent/apiv1-config.go | 8 ++++---- lib/agent/apiv1-events.go | 6 +++--- lib/agent/apiv1-exec.go | 8 ++++---- lib/agent/apiv1-projects.go | 6 +++--- lib/agent/apiv1-sdks.go | 6 +++--- lib/agent/apiv1-version.go | 4 ++-- lib/agent/apiv1.go | 6 +++--- lib/agent/events.go | 4 ++-- lib/agent/project-interface.go | 20 ++++++++++---------- lib/agent/project-pathmap.go | 8 ++++---- lib/agent/project-st.go | 8 ++++---- lib/agent/projects.go | 11 ++++++----- lib/agent/sessions.go | 2 +- lib/agent/webserver.go | 7 ++++--- lib/agent/xdsserver.go | 10 +++++----- lib/syncthing/st.go | 6 +++--- lib/syncthing/stEvent.go | 2 +- lib/syncthing/stfolder.go | 4 ++-- lib/xaapiv1/config.go | 2 +- lib/xaapiv1/events.go | 2 +- lib/xaapiv1/exec.go | 2 +- lib/xaapiv1/projects.go | 2 +- lib/xaapiv1/sdks.go | 2 +- lib/xaapiv1/version.go | 2 +- lib/xdsconfig/config.go | 4 ++-- lib/xdsconfig/configfile.go | 4 ++-- main.go | 8 ++++---- scripts/get-syncthing.sh | 2 +- scripts/install.sh | 2 +- webapp/package.json | 5 +++-- webapp/src/app/@core-xds/core-xds.module.ts | 2 +- webapp/src/app/@core-xds/module-import-guard.ts | 2 +- .../@core-xds/services/@core-xds-services.module.ts | 2 +- .../src/app/@core-xds/services/alert.service.spec.ts | 2 +- webapp/src/app/@core-xds/services/alert.service.ts | 2 +- .../app/@core-xds/services/build-settings.service.ts | 2 +- .../app/@core-xds/services/config.service.spec.ts | 2 +- webapp/src/app/@core-xds/services/config.service.ts | 2 +- .../app/@core-xds/services/project.service.spec.ts | 2 +- webapp/src/app/@core-xds/services/project.service.ts | 2 +- webapp/src/app/@core-xds/services/sdk.service.ts | 2 +- webapp/src/app/@core-xds/services/users.service.ts | 2 +- .../src/app/@core-xds/services/xds-config.service.ts | 2 +- .../src/app/@core-xds/services/xdsagent.service.ts | 2 +- .../app/@theme/components/footer/footer.component.ts | 2 +- webapp/src/app/app-routing.module.ts | 2 +- .../pages/about/about-modal/about-modal.component.ts | 2 +- webapp/src/app/pages/about/about.module.ts | 2 +- .../build-settings-modal.component.ts | 2 +- webapp/src/app/pages/build/build.component.spec.ts | 2 +- webapp/src/app/pages/build/build.component.ts | 2 +- webapp/src/app/pages/build/build.module.ts | 2 +- .../settings/project-select-dropdown.component.ts | 2 +- .../build/settings/sdk-select-dropdown.component.ts | 2 +- .../config/config-global/config-global.component.ts | 2 +- webapp/src/app/pages/config/config-routing.module.ts | 2 +- .../pages/config/config-xds/config-xds.component.ts | 2 +- webapp/src/app/pages/config/config.component.ts | 2 +- webapp/src/app/pages/config/config.module.ts | 2 +- .../confirm/confirm-modal/confirm-modal.component.ts | 2 +- webapp/src/app/pages/confirm/confirm.module.ts | 2 +- .../src/app/pages/dashboard/dashboard.component.ts | 2 +- webapp/src/app/pages/dashboard/dashboard.module.ts | 2 +- .../dashboard/status-card/status-card.component.ts | 2 +- .../pages/notifications/notifications.component.ts | 2 +- webapp/src/app/pages/pages-menu.ts | 4 ++-- webapp/src/app/pages/pages-routing.module.ts | 2 +- webapp/src/app/pages/pages.component.ts | 2 +- webapp/src/app/pages/pages.module.ts | 2 +- .../project-add-modal/project-add-modal.component.ts | 2 +- .../projects/project-card/project-card.component.ts | 2 +- webapp/src/app/pages/projects/projects.component.ts | 2 +- webapp/src/app/pages/projects/projects.module.ts | 2 +- .../app/pages/sdks/sdk-card/sdk-card.component.ts | 2 +- .../sdks/sdk-management/sdk-install.component.ts | 2 +- .../sdks/sdk-management/sdk-management.component.ts | 2 +- webapp/src/app/pages/sdks/sdks.component.ts | 2 +- webapp/src/app/pages/sdks/sdks.module.ts | 2 +- 84 files changed, 150 insertions(+), 145 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 64ef9d6..2e081d9 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -89,10 +89,11 @@ "xaapiv", "Sillyf", "tabindex", - "EVTSDK" + "EVTSDK", + "gerrit" ], // codelyzer "tslint.rulesDirectory": "./webapp/node_modules/codelyzer", "typescript.tsdk": "webapp/node_modules/typescript/lib", "tslint.configFile": "webapp/tslint.json" -} \ No newline at end of file +} diff --git a/Makefile b/Makefile index 0f19a24..dd5294c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # @@ -49,7 +49,7 @@ endif HOST_GOOS=$(shell go env GOOS) HOST_GOARCH=$(shell go env GOARCH) ARCH=$(HOST_GOOS)-$(HOST_GOARCH) -REPOPATH=github.com/iotbzh/$(TARGET) +REPOPATH=gerrit.automotivelinux.org/gerrit/src/xds/$(TARGET) EXT= ifeq ($(HOST_GOOS), windows) @@ -58,7 +58,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 @@ -176,9 +176,9 @@ 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 && \ - rm -rf xds-server && ln -s ../../../../xds-server ) + (cd vendor/gerrit.automotivelinux.org/gerrit/src/xds && \ + rm -rf xds-common.git && ln -s ../../../../../../xds-common xds-common.git && \ + rm -rf xds-server.git && ln -s ../../../../../../xds-server xds-server.git ) .PHONY: tools/glide tools/glide: diff --git a/conf.d/etc/profile.d/xds-agent.sh b/conf.d/etc/profile.d/xds-agent.sh index 25db906..abff64e 100644 --- a/conf.d/etc/profile.d/xds-agent.sh +++ b/conf.d/etc/profile.d/xds-agent.sh @@ -1,6 +1,6 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # diff --git a/glide.yaml b/glide.yaml index a08c3f5..cec32bc 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/iotbzh/xds-agent +package: gerrit.automotivelinux.org/gerrit/src/xds/xds-agent license: Apache-2 owners: - name: Sebastien Douheret @@ -21,11 +21,11 @@ import: version: 46defcb47f - 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 -- package: github.com/iotbzh/xds-server +- package: gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git version: v1.0.0-rc2 subpackages: - lib/xsapiv1 diff --git a/lib/agent/agent.go b/lib/agent/agent.go index 989c9a0..3aa89a8 100644 --- a/lib/agent/agent.go +++ b/lib/agent/agent.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -27,9 +27,10 @@ import ( "syscall" "time" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing" + + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" "github.com/Sirupsen/logrus" - "github.com/iotbzh/xds-agent/lib/syncthing" - "github.com/iotbzh/xds-agent/lib/xdsconfig" "github.com/urfave/cli" ) diff --git a/lib/agent/apiv1-browse.go b/lib/agent/apiv1-browse.go index c873d43..dcfe79b 100644 --- a/lib/agent/apiv1-browse.go +++ b/lib/agent/apiv1-browse.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/agent/apiv1-config.go b/lib/agent/apiv1-config.go index 0b1e200..54d3525 100644 --- a/lib/agent/apiv1-config.go +++ b/lib/agent/apiv1-config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,10 +21,10 @@ import ( "net/http" "sync" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - "github.com/iotbzh/xds-agent/lib/xdsconfig" - common "github.com/iotbzh/xds-common/golib" ) var confMut sync.Mutex diff --git a/lib/agent/apiv1-events.go b/lib/agent/apiv1-events.go index d76e2d1..d18bd1f 100644 --- a/lib/agent/apiv1-events.go +++ b/lib/agent/apiv1-events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package agent import ( "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" ) // eventsList Registering for events that will be send over a WS diff --git a/lib/agent/apiv1-exec.go b/lib/agent/apiv1-exec.go index ace2cdc..4a1340b 100644 --- a/lib/agent/apiv1-exec.go +++ b/lib/agent/apiv1-exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,11 +20,11 @@ package agent import ( "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/franciscocpg/reflectme" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" ) diff --git a/lib/agent/apiv1-projects.go b/lib/agent/apiv1-projects.go index b69474d..ceb92bb 100644 --- a/lib/agent/apiv1-projects.go +++ b/lib/agent/apiv1-projects.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -20,9 +20,9 @@ package agent import ( "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" ) // getProjects returns all projects configuration diff --git a/lib/agent/apiv1-sdks.go b/lib/agent/apiv1-sdks.go index 7d6342b..fd897fc 100644 --- a/lib/agent/apiv1-sdks.go +++ b/lib/agent/apiv1-sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,8 +21,8 @@ import ( "encoding/json" "fmt" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" ) // sdksPassthroughInit Declare passthrough routes for sdks diff --git a/lib/agent/apiv1-version.go b/lib/agent/apiv1-version.go index 5d950ef..ada785e 100644 --- a/lib/agent/apiv1-version.go +++ b/lib/agent/apiv1-version.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,8 +21,8 @@ import ( "fmt" "net/http" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" ) // getInfo : return various information about server diff --git a/lib/agent/apiv1.go b/lib/agent/apiv1.go index a66f451..c5f4d22 100644 --- a/lib/agent/apiv1.go +++ b/lib/agent/apiv1.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,9 +21,9 @@ import ( "fmt" "strconv" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xdsconfig" - "github.com/iotbzh/xds-server/lib/xsapiv1" ) const apiBaseURL = "/api/v1" diff --git a/lib/agent/events.go b/lib/agent/events.go index 678f116..45a262e 100644 --- a/lib/agent/events.go +++ b/lib/agent/events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,7 +21,7 @@ import ( "fmt" "time" - "github.com/iotbzh/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" ) // EventDef Definition on one event diff --git a/lib/agent/project-interface.go b/lib/agent/project-interface.go index 867c588..4d61819 100644 --- a/lib/agent/project-interface.go +++ b/lib/agent/project-interface.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -17,16 +17,16 @@ package agent -import "github.com/iotbzh/xds-agent/lib/xaapiv1" +import "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" // IPROJECT Project interface type IPROJECT interface { - Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Add a new project - Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Local setup of the project - Delete() error // Delete a project - GetProject() *xaapiv1.ProjectConfig // Get project public configuration - Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Update project configuration - GetServer() *XdsServer // Get XdsServer that holds this project - Sync() error // Force project files synchronization - IsInSync() (bool, error) // Check if project files are in-sync + Add(cfg xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Add a new project + Setup(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Local setup of the project + Delete() error // Delete a project + GetProject() *xaapiv1.ProjectConfig // Get project public configuration + Update(prj xaapiv1.ProjectConfig) (*xaapiv1.ProjectConfig, error) // Update project configuration + GetServer() *XdsServer // Get XdsServer that holds this project + Sync() error // Force project files synchronization + IsInSync() (bool, error) // Check if project files are in-sync } diff --git a/lib/agent/project-pathmap.go b/lib/agent/project-pathmap.go index 8b6e824..875384e 100644 --- a/lib/agent/project-pathmap.go +++ b/lib/agent/project-pathmap.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,9 +23,9 @@ import ( "os" "strings" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" ) // IPROJECT interface implementation for native/path mapping projects diff --git a/lib/agent/project-st.go b/lib/agent/project-st.go index c92f5d4..60fe262 100644 --- a/lib/agent/project-st.go +++ b/lib/agent/project-st.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - st "github.com/iotbzh/xds-agent/lib/syncthing" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - "github.com/iotbzh/xds-server/lib/xsapiv1" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" ) // IPROJECT interface implementation for syncthing projects diff --git a/lib/agent/projects.go b/lib/agent/projects.go index 4e8b0f6..ff28f96 100644 --- a/lib/agent/projects.go +++ b/lib/agent/projects.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -25,11 +25,12 @@ import ( "strings" "time" + st "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/syncthing" + + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/franciscocpg/reflectme" - "github.com/iotbzh/xds-agent/lib/syncthing" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" "github.com/syncthing/syncthing/lib/sync" ) diff --git a/lib/agent/sessions.go b/lib/agent/sessions.go index 3655eef..8641527 100644 --- a/lib/agent/sessions.go +++ b/lib/agent/sessions.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/agent/webserver.go b/lib/agent/webserver.go index 3622efe..e8ad033 100644 --- a/lib/agent/webserver.go +++ b/lib/agent/webserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,11 +24,12 @@ import ( "os" "path" + socketio "github.com/googollee/go-socket.io" + + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" "github.com/Sirupsen/logrus" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" - "github.com/googollee/go-socket.io" - "github.com/iotbzh/xds-agent/lib/xaapiv1" ) // WebServer . diff --git a/lib/agent/xdsserver.go b/lib/agent/xdsserver.go index 346bdb9..1c715f6 100644 --- a/lib/agent/xdsserver.go +++ b/lib/agent/xdsserver.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,11 +26,11 @@ import ( "sync" "time" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xaapiv1" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-server.git/lib/xsapiv1" "github.com/gin-gonic/gin" - "github.com/iotbzh/xds-agent/lib/xaapiv1" - "github.com/iotbzh/xds-agent/lib/xdsconfig" - common "github.com/iotbzh/xds-common/golib" - "github.com/iotbzh/xds-server/lib/xsapiv1" uuid "github.com/satori/go.uuid" sio_client "github.com/sebd71/go-socket.io-client" ) diff --git a/lib/syncthing/st.go b/lib/syncthing/st.go index 1ea3947..3e07605 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 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -33,9 +33,9 @@ import ( "os/exec" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/Sirupsen/logrus" - "github.com/iotbzh/xds-agent/lib/xdsconfig" - common "github.com/iotbzh/xds-common/golib" "github.com/syncthing/syncthing/lib/config" ) diff --git a/lib/syncthing/stEvent.go b/lib/syncthing/stEvent.go index d8e0e0a..473a975 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 * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/syncthing/stfolder.go b/lib/syncthing/stfolder.go index 098ab2d..05ec5f9 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 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,7 +22,7 @@ import ( "fmt" "strings" - common "github.com/iotbzh/xds-common/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" stconfig "github.com/syncthing/syncthing/lib/config" "github.com/syncthing/syncthing/lib/protocol" ) diff --git a/lib/xaapiv1/config.go b/lib/xaapiv1/config.go index 3bc25e3..b1c5fec 100644 --- a/lib/xaapiv1/config.go +++ b/lib/xaapiv1/config.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xaapiv1/events.go b/lib/xaapiv1/events.go index 16c2dd7..ab08d0f 100644 --- a/lib/xaapiv1/events.go +++ b/lib/xaapiv1/events.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xaapiv1/exec.go b/lib/xaapiv1/exec.go index c2335f6..4b089e7 100644 --- a/lib/xaapiv1/exec.go +++ b/lib/xaapiv1/exec.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xaapiv1/projects.go b/lib/xaapiv1/projects.go index 05888a5..567ed1c 100644 --- a/lib/xaapiv1/projects.go +++ b/lib/xaapiv1/projects.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xaapiv1/sdks.go b/lib/xaapiv1/sdks.go index 5a20571..7f2ab02 100644 --- a/lib/xaapiv1/sdks.go +++ b/lib/xaapiv1/sdks.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xaapiv1/version.go b/lib/xaapiv1/version.go index d37c55d..e611e22 100644 --- a/lib/xaapiv1/version.go +++ b/lib/xaapiv1/version.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/lib/xdsconfig/config.go b/lib/xdsconfig/config.go index fd9b034..b7bf57b 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 * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -24,8 +24,8 @@ import ( "os" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" "github.com/Sirupsen/logrus" - common "github.com/iotbzh/xds-common/golib" uuid "github.com/satori/go.uuid" "github.com/urfave/cli" ) diff --git a/lib/xdsconfig/configfile.go b/lib/xdsconfig/configfile.go index 500c195..27456e7 100644 --- a/lib/xdsconfig/configfile.go +++ b/lib/xdsconfig/configfile.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -22,7 +22,7 @@ import ( "os" "path" - common "github.com/iotbzh/xds-common/golib" + common "gerrit.automotivelinux.org/gerrit/src/xds/xds-common.git/golib" ) type SyncThingConf struct { diff --git a/main.go b/main.go index 0e14668..a02eba5 100644 --- a/main.go +++ b/main.go @@ -1,5 +1,5 @@ /* - * Copyright (C) 2017 "IoT.bzh" + * Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); @@ -23,16 +23,16 @@ package main import ( "os" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/agent" + "gerrit.automotivelinux.org/gerrit/src/xds/xds-agent/lib/xdsconfig" "github.com/Sirupsen/logrus" - "github.com/iotbzh/xds-agent/lib/agent" - "github.com/iotbzh/xds-agent/lib/xdsconfig" "github.com/urfave/cli" ) const ( appName = "xds-agent" appDescription = "X(cross) Development System Agent is a web server that allows to remotely cross build applications." - appCopyright = "Copyright (C) 2017 IoT.bzh - Apache-2.0" + appCopyright = "Copyright (C) 2017-2018 IoT.bzh - Apache-2.0" appUsage = "X(cross) Development System Agent" ) diff --git a/scripts/get-syncthing.sh b/scripts/get-syncthing.sh index a66bf07..a2993c2 100755 --- a/scripts/get-syncthing.sh +++ b/scripts/get-syncthing.sh @@ -1,6 +1,6 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # diff --git a/scripts/install.sh b/scripts/install.sh index 444dc1b..b981e1f 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -1,6 +1,6 @@ #!/bin/bash ########################################################################### -# Copyright 2017 IoT.bzh +# Copyright 2017-2018 IoT.bzh # # author: Sebastien Douheret # diff --git a/webapp/package.json b/webapp/package.json index 8bc3aca..a96586c 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -2,12 +2,13 @@ "name": "xds-dashboard", "version": "1.0.0", "license": "(MIT OR Apache-2.0)", + "author": "Sebastien Douheret [IoT.bzh] (based on akveo/ngx-admin)", "repository": { "type": "git", - "url": "git+https://github.com/iotbzh/xds-agent.git" + "url": "https://gerrit.automotivelinux.org/gerrit/src/xds/xds-agent" }, "bugs": { - "url": "https://github.com/iotbzh/xds-agent/issues" + "url": "https://jira.automotivelinux.org/projects/SPEC/issues" }, "scripts": { "ng": "ng", diff --git a/webapp/src/app/@core-xds/core-xds.module.ts b/webapp/src/app/@core-xds/core-xds.module.ts index 0fa8245..5939868 100644 --- a/webapp/src/app/@core-xds/core-xds.module.ts +++ b/webapp/src/app/@core-xds/core-xds.module.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/module-import-guard.ts b/webapp/src/app/@core-xds/module-import-guard.ts index a14d261..05582ef 100644 --- a/webapp/src/app/@core-xds/module-import-guard.ts +++ b/webapp/src/app/@core-xds/module-import-guard.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/@core-xds-services.module.ts b/webapp/src/app/@core-xds/services/@core-xds-services.module.ts index e33c42c..7c380eb 100644 --- a/webapp/src/app/@core-xds/services/@core-xds-services.module.ts +++ b/webapp/src/app/@core-xds/services/@core-xds-services.module.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/alert.service.spec.ts b/webapp/src/app/@core-xds/services/alert.service.spec.ts index 443dc2e..b306a09 100644 --- a/webapp/src/app/@core-xds/services/alert.service.spec.ts +++ b/webapp/src/app/@core-xds/services/alert.service.spec.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/alert.service.ts b/webapp/src/app/@core-xds/services/alert.service.ts index 3a3f51f..98e8ada 100644 --- a/webapp/src/app/@core-xds/services/alert.service.ts +++ b/webapp/src/app/@core-xds/services/alert.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/build-settings.service.ts b/webapp/src/app/@core-xds/services/build-settings.service.ts index 9511311..c7b5c67 100644 --- a/webapp/src/app/@core-xds/services/build-settings.service.ts +++ b/webapp/src/app/@core-xds/services/build-settings.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/config.service.spec.ts b/webapp/src/app/@core-xds/services/config.service.spec.ts index 7b4d9aa..9b7e356 100644 --- a/webapp/src/app/@core-xds/services/config.service.spec.ts +++ b/webapp/src/app/@core-xds/services/config.service.spec.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/config.service.ts b/webapp/src/app/@core-xds/services/config.service.ts index ba77a4a..cc4d237 100644 --- a/webapp/src/app/@core-xds/services/config.service.ts +++ b/webapp/src/app/@core-xds/services/config.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/project.service.spec.ts b/webapp/src/app/@core-xds/services/project.service.spec.ts index ec93a4a..0320d72 100644 --- a/webapp/src/app/@core-xds/services/project.service.spec.ts +++ b/webapp/src/app/@core-xds/services/project.service.spec.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/project.service.ts b/webapp/src/app/@core-xds/services/project.service.ts index 46101f5..2dca2f7 100644 --- a/webapp/src/app/@core-xds/services/project.service.ts +++ b/webapp/src/app/@core-xds/services/project.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/sdk.service.ts b/webapp/src/app/@core-xds/services/sdk.service.ts index 181ad6f..6191c85 100644 --- a/webapp/src/app/@core-xds/services/sdk.service.ts +++ b/webapp/src/app/@core-xds/services/sdk.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/users.service.ts b/webapp/src/app/@core-xds/services/users.service.ts index 88e3e29..48d168a 100644 --- a/webapp/src/app/@core-xds/services/users.service.ts +++ b/webapp/src/app/@core-xds/services/users.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/xds-config.service.ts b/webapp/src/app/@core-xds/services/xds-config.service.ts index 182ff53..e88df09 100644 --- a/webapp/src/app/@core-xds/services/xds-config.service.ts +++ b/webapp/src/app/@core-xds/services/xds-config.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@core-xds/services/xdsagent.service.ts b/webapp/src/app/@core-xds/services/xdsagent.service.ts index 9f8385a..27e14cf 100644 --- a/webapp/src/app/@core-xds/services/xdsagent.service.ts +++ b/webapp/src/app/@core-xds/services/xdsagent.service.ts @@ -1,6 +1,6 @@ /** * @license -* Copyright (C) 2017 "IoT.bzh" +* Copyright (C) 2017-2018 "IoT.bzh" * Author Sebastien Douheret * * Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/webapp/src/app/@theme/components/footer/footer.component.ts b/webapp/src/app/@theme/components/footer/footer.component.ts index 1e3d704..a743562 100644 --- a/webapp/src/app/@theme/components/footer/footer.component.ts +++ b/webapp/src/app/@theme/components/footer/footer.component.ts @@ -5,7 +5,7 @@ import { Component } from '@angular/core'; styleUrls: ['./footer.component.scss'], template: ` Created by - IoT.bzh 2017 + IoT.bzh 2017 - 2018