From df0b209b0add878d00fb6c24be9a5fe511b0ba09 Mon Sep 17 00:00:00 2001 From: Jhoemar Pagao Date: Mon, 4 Oct 2021 15:19:22 +0000 Subject: [PATCH] updated current package path to github.com/cansulting/elabox-system-tools --- foundation/app/controller.go | 19 +++++++++--------- foundation/app/data/packageConfig.go | 7 ++++--- foundation/app/protocol/activityInterface.go | 2 +- foundation/app/service/rpcHandler.go | 6 +++--- foundation/app/service/rpcInterface.go | 2 +- foundation/event/data/action.go | 2 +- foundation/event/manager.go | 4 ++-- foundation/event/protocol/connectorClient.go | 2 +- foundation/event/protocol/connectorServer.go | 4 ++-- foundation/event/socket/socketIOClient.go | 6 +++--- foundation/logger/logger.go | 4 ++-- foundation/testing/app/app.go | 4 ++-- foundation/testing/app/dummySystemService.go | 4 ++-- go.mod | 2 +- go.sum | 0 internal/cwd/packageinstaller/activity.go | 11 +++++----- internal/cwd/packageinstaller/commandline.go | 11 +++++----- .../packageinstaller/constants/constants.go | 8 ++++---- internal/cwd/packageinstaller/installer.go | 20 +++++++++---------- .../cwd/packageinstaller/landing/server.go | 11 +++++----- internal/cwd/packageinstaller/main.go | 4 ++-- internal/cwd/packageinstaller/main_test.go | 18 ++++++++--------- internal/cwd/packageinstaller/path.go | 5 +++-- internal/cwd/packageinstaller/pkg/pkg.go | 15 +++++++------- internal/cwd/packageinstaller/utils/backup.go | 5 +++-- .../cwd/packageinstaller/utils/filesystem.go | 3 ++- .../packageinstaller/utils/systemControl.go | 9 +++++---- .../cwd/packageinstaller/utils/uninstaller.go | 7 ++++--- internal/cwd/packager/package.go | 13 ++++++------ internal/cwd/system/appman/appConnect.go | 13 ++++++------ .../cwd/system/appman/appConnectManager.go | 8 ++++---- internal/cwd/system/appman/initializer.go | 2 +- internal/cwd/system/appman/nodejs.go | 7 ++++--- internal/cwd/system/appman/rpcBridge.go | 5 +++-- internal/cwd/system/commandline.go | 13 ++++++------ internal/cwd/system/config/envvar.go | 9 +++++---- internal/cwd/system/config/init.go | 8 ++++---- internal/cwd/system/global/global.go | 8 ++++---- internal/cwd/system/main.go | 11 +++++----- internal/cwd/system/main_test.go | 5 +++-- .../cwd/system/servicecenter/controller.go | 6 +++--- internal/cwd/system/servicecenter/services.go | 18 +++++++++-------- .../cwd/system/system_update/system_update.go | 7 ++++--- internal/cwd/system/update_test.go | 9 +++++---- internal/cwd/system/web/service.go | 5 +++-- registry/app/app.go | 10 +++++----- registry/app/components.go | 6 +++--- registry/app/util.go | 7 ++++--- registry/util/init.go | 13 ++++++------ server/config/config.go | 2 +- server/event/handler.go | 6 +++--- server/event/socketIOServer.go | 6 +++--- server/event/status.go | 4 ++-- server/server.go | 11 +++++----- test/logger_test.go | 6 +++--- test/registry_test.go | 7 ++++--- 56 files changed, 224 insertions(+), 196 deletions(-) mode change 100755 => 100644 go.mod mode change 100755 => 100644 go.sum diff --git a/foundation/app/controller.go b/foundation/app/controller.go index 822cc92..ffee838 100755 --- a/foundation/app/controller.go +++ b/foundation/app/controller.go @@ -6,16 +6,17 @@ package app Application can contains service, activity and broadcast listener */ import ( - appd "ela/foundation/app/data" - "ela/foundation/app/protocol" - "ela/foundation/app/service" - "ela/foundation/constants" - "ela/foundation/errors" - event "ela/foundation/event" - "ela/foundation/event/data" - protocolE "ela/foundation/event/protocol" - "ela/foundation/logger" "time" + + appd "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/app/protocol" + "github.com/cansulting/elabox-system-tools/foundation/app/service" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + event "github.com/cansulting/elabox-system-tools/foundation/event" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + protocolE "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/logger" ) ///////////////////////// FUNCTIONS //////////////////////////////////// diff --git a/foundation/app/data/packageConfig.go b/foundation/app/data/packageConfig.go index f7b89c6..1a3d26c 100755 --- a/foundation/app/data/packageConfig.go +++ b/foundation/app/data/packageConfig.go @@ -14,13 +14,14 @@ package data import ( "archive/zip" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/path" "encoding/json" "io" "io/ioutil" "os" + + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" ) const SYSTEM = "system" // identifies the package is installed on system location diff --git a/foundation/app/protocol/activityInterface.go b/foundation/app/protocol/activityInterface.go index 5ff6b6d..1f95687 100755 --- a/foundation/app/protocol/activityInterface.go +++ b/foundation/app/protocol/activityInterface.go @@ -10,7 +10,7 @@ package protocol -import "ela/foundation/event/data" +import "github.com/cansulting/elabox-system-tools/foundation/event/data" // interface for activity. Use this whenever implementing an activity type ActivityInterface interface { diff --git a/foundation/app/service/rpcHandler.go b/foundation/app/service/rpcHandler.go index 32269c9..21bcc40 100755 --- a/foundation/app/service/rpcHandler.go +++ b/foundation/app/service/rpcHandler.go @@ -11,9 +11,9 @@ package service import ( - "ela/foundation/constants" - "ela/foundation/event/data" - "ela/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" ) // callback function whenever recieve an action from server diff --git a/foundation/app/service/rpcInterface.go b/foundation/app/service/rpcInterface.go index 8575cad..982f093 100755 --- a/foundation/app/service/rpcInterface.go +++ b/foundation/app/service/rpcInterface.go @@ -11,7 +11,7 @@ package service import ( - "ela/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/data" ) type RPCInterface interface { diff --git a/foundation/event/data/action.go b/foundation/event/data/action.go index 6f1f1fc..861721f 100755 --- a/foundation/event/data/action.go +++ b/foundation/event/data/action.go @@ -1,7 +1,7 @@ package data import ( - "ela/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/errors" "encoding/json" "log" "reflect" diff --git a/foundation/event/manager.go b/foundation/event/manager.go index 2dd4ddb..69458ff 100755 --- a/foundation/event/manager.go +++ b/foundation/event/manager.go @@ -1,8 +1,8 @@ package event import ( - "ela/foundation/event/protocol" - "ela/foundation/event/socket" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/event/socket" ) /* diff --git a/foundation/event/protocol/connectorClient.go b/foundation/event/protocol/connectorClient.go index 3e05732..1cdc339 100755 --- a/foundation/event/protocol/connectorClient.go +++ b/foundation/event/protocol/connectorClient.go @@ -1,6 +1,6 @@ package protocol -import "ela/foundation/event/data" +import "github.com/cansulting/elabox-system-tools/foundation/event/data" /* connectorClient.go diff --git a/foundation/event/protocol/connectorServer.go b/foundation/event/protocol/connectorServer.go index 6fd8248..d5de343 100755 --- a/foundation/event/protocol/connectorServer.go +++ b/foundation/event/protocol/connectorServer.go @@ -1,8 +1,8 @@ package protocol import ( - "ela/foundation/event/data" - "ela/foundation/system" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/system" ) // interface for service communication to clients diff --git a/foundation/event/socket/socketIOClient.go b/foundation/event/socket/socketIOClient.go index b2b9fd5..af515ec 100755 --- a/foundation/event/socket/socketIOClient.go +++ b/foundation/event/socket/socketIOClient.go @@ -1,9 +1,9 @@ package socket import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/event/data" "log" "runtime" "time" diff --git a/foundation/logger/logger.go b/foundation/logger/logger.go index 2b80555..741306b 100644 --- a/foundation/logger/logger.go +++ b/foundation/logger/logger.go @@ -11,8 +11,8 @@ package logger import ( - "ela/foundation/constants" - "ela/foundation/perm" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/perm" "fmt" "io" "os" diff --git a/foundation/testing/app/app.go b/foundation/testing/app/app.go index 14c203d..467e80a 100755 --- a/foundation/testing/app/app.go +++ b/foundation/testing/app/app.go @@ -1,8 +1,8 @@ package app import ( - _app "ela/foundation/app" - "ela/foundation/event/data" + _app "github.com/cansulting/elabox-system-tools/foundation/app" + "github.com/cansulting/elabox-system-tools/foundation/event/data" ) func RunTestApp(controller *_app.Controller, pendingAction data.ActionGroup) { diff --git a/foundation/testing/app/dummySystemService.go b/foundation/testing/app/dummySystemService.go index f0eb0c7..7386035 100755 --- a/foundation/testing/app/dummySystemService.go +++ b/foundation/testing/app/dummySystemService.go @@ -1,8 +1,8 @@ package app import ( - "ela/foundation/app/service" - "ela/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/app/service" + "github.com/cansulting/elabox-system-tools/foundation/event/data" ) type DummyRPC struct { diff --git a/go.mod b/go.mod old mode 100755 new mode 100644 index 1a258c9..4bc2a8c --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module ela +module github.com/cansulting/elabox-system-tools go 1.16 diff --git a/go.sum b/go.sum old mode 100755 new mode 100644 diff --git a/internal/cwd/packageinstaller/activity.go b/internal/cwd/packageinstaller/activity.go index 246b1e1..c823a15 100755 --- a/internal/cwd/packageinstaller/activity.go +++ b/internal/cwd/packageinstaller/activity.go @@ -1,12 +1,13 @@ package main import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/event/data" - global "ela/internal/cwd/packageinstaller/constants" - "ela/internal/cwd/packageinstaller/pkg" "time" + + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + global "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/pkg" ) type activity struct { diff --git a/internal/cwd/packageinstaller/commandline.go b/internal/cwd/packageinstaller/commandline.go index e55479c..c5248d9 100755 --- a/internal/cwd/packageinstaller/commandline.go +++ b/internal/cwd/packageinstaller/commandline.go @@ -1,14 +1,15 @@ package main import ( - "ela/foundation/logger" - pkconst "ela/internal/cwd/packageinstaller/constants" - "ela/internal/cwd/packageinstaller/landing" - "ela/internal/cwd/packageinstaller/pkg" - "ela/internal/cwd/packageinstaller/utils" "os" "time" + "github.com/cansulting/elabox-system-tools/foundation/logger" + pkconst "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/landing" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/pkg" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/utils" + "github.com/rs/zerolog" ) diff --git a/internal/cwd/packageinstaller/constants/constants.go b/internal/cwd/packageinstaller/constants/constants.go index c1371a4..ed7d886 100644 --- a/internal/cwd/packageinstaller/constants/constants.go +++ b/internal/cwd/packageinstaller/constants/constants.go @@ -1,10 +1,10 @@ package constants import ( - "ela/foundation/app" - "ela/foundation/logger" - "ela/foundation/path" - "ela/internal/cwd/global" + "github.com/cansulting/elabox-system-tools/foundation/app" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/internal/cwd/global" ) const TERMINATE_TIMEOUT = 5 // seconds to wait for system to terminate diff --git a/internal/cwd/packageinstaller/installer.go b/internal/cwd/packageinstaller/installer.go index 9ecf9da..1e5a943 100755 --- a/internal/cwd/packageinstaller/installer.go +++ b/internal/cwd/packageinstaller/installer.go @@ -3,16 +3,16 @@ package main import ( "archive/zip" "bytes" - "ela/foundation/app/data" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/path" - "ela/foundation/perm" - "ela/internal/cwd/global" - pkconst "ela/internal/cwd/packageinstaller/constants" - "ela/internal/cwd/packageinstaller/pkg" - "ela/internal/cwd/packageinstaller/utils" - "ela/registry/app" + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/foundation/perm" + "github.com/cansulting/elabox-system-tools/internal/cwd/global" + pkconst "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/pkg" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/utils" + "github.com/cansulting/elabox-system-tools/registry/app" "io" "os" ) diff --git a/internal/cwd/packageinstaller/landing/server.go b/internal/cwd/packageinstaller/landing/server.go index bdf555e..a7b54be 100644 --- a/internal/cwd/packageinstaller/landing/server.go +++ b/internal/cwd/packageinstaller/landing/server.go @@ -1,14 +1,15 @@ package landing import ( - econstants "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/system" - "ela/internal/cwd/packageinstaller/constants" - "ela/server" "net/http" "os" "time" + + econstants "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/system" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/server" ) const PORT = "80" diff --git a/internal/cwd/packageinstaller/main.go b/internal/cwd/packageinstaller/main.go index be6dbd4..4b833e0 100755 --- a/internal/cwd/packageinstaller/main.go +++ b/internal/cwd/packageinstaller/main.go @@ -2,8 +2,8 @@ package main import ( "C" - "ela/foundation/app" - "ela/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/foundation/app" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" "os" ) diff --git a/internal/cwd/packageinstaller/main_test.go b/internal/cwd/packageinstaller/main_test.go index 6e7ce04..b79f7ba 100755 --- a/internal/cwd/packageinstaller/main_test.go +++ b/internal/cwd/packageinstaller/main_test.go @@ -1,15 +1,15 @@ package main import ( - "ela/foundation/app" - appd "ela/foundation/app/data" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/event/data" - "ela/foundation/path" - testapp "ela/foundation/testing/app" - pkc "ela/internal/cwd/packageinstaller/constants" - "ela/internal/cwd/packageinstaller/pkg" + "github.com/cansulting/elabox-system-tools/foundation/app" + appd "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/path" + testapp "github.com/cansulting/elabox-system-tools/foundation/testing/app" + pkc "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/pkg" "io/ioutil" "log" "os" diff --git a/internal/cwd/packageinstaller/path.go b/internal/cwd/packageinstaller/path.go index daf20f3..c32d863 100755 --- a/internal/cwd/packageinstaller/path.go +++ b/internal/cwd/packageinstaller/path.go @@ -1,10 +1,11 @@ package main import ( - "ela/foundation/path" - "ela/foundation/perm" "log" "os" + + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/foundation/perm" ) func InitializePath() { diff --git a/internal/cwd/packageinstaller/pkg/pkg.go b/internal/cwd/packageinstaller/pkg/pkg.go index cdd119e..ce7a31a 100644 --- a/internal/cwd/packageinstaller/pkg/pkg.go +++ b/internal/cwd/packageinstaller/pkg/pkg.go @@ -3,18 +3,19 @@ package pkg import ( "archive/zip" "bytes" - "ela/foundation/app/data" - "ela/foundation/errors" - "ela/foundation/perm" - "ela/internal/cwd/global" - "ela/internal/cwd/packageinstaller/constants" - "ela/internal/cwd/packageinstaller/landing" - "ela/internal/cwd/packageinstaller/utils" "encoding/json" "os" "os/exec" "path/filepath" "strings" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/perm" + "github.com/cansulting/elabox-system-tools/internal/cwd/global" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/landing" + "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/utils" ) const sh = "/bin/bash" diff --git a/internal/cwd/packageinstaller/utils/backup.go b/internal/cwd/packageinstaller/utils/backup.go index 3b86cb3..619c322 100755 --- a/internal/cwd/packageinstaller/utils/backup.go +++ b/internal/cwd/packageinstaller/utils/backup.go @@ -2,14 +2,15 @@ package utils import ( "archive/zip" - "ela/foundation/errors" - "ela/foundation/perm" "encoding/json" "io" "io/ioutil" "log" "os" "strconv" + + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/perm" ) const CONFIG_FILENAME = "config" diff --git a/internal/cwd/packageinstaller/utils/filesystem.go b/internal/cwd/packageinstaller/utils/filesystem.go index 59ea4d1..d82b4fe 100755 --- a/internal/cwd/packageinstaller/utils/filesystem.go +++ b/internal/cwd/packageinstaller/utils/filesystem.go @@ -1,11 +1,12 @@ package utils import ( - "ela/foundation/errors" "io" "os" "path/filepath" "strings" + + "github.com/cansulting/elabox-system-tools/foundation/errors" ) // create directories if not exist diff --git a/internal/cwd/packageinstaller/utils/systemControl.go b/internal/cwd/packageinstaller/utils/systemControl.go index 03cd55f..c951ba4 100755 --- a/internal/cwd/packageinstaller/utils/systemControl.go +++ b/internal/cwd/packageinstaller/utils/systemControl.go @@ -1,13 +1,14 @@ package utils import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/path" - pkc "ela/internal/cwd/packageinstaller/constants" "os" "os/exec" "path/filepath" + + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" + pkc "github.com/cansulting/elabox-system-tools/internal/cwd/packageinstaller/constants" ) // check if system is currently running diff --git a/internal/cwd/packageinstaller/utils/uninstaller.go b/internal/cwd/packageinstaller/utils/uninstaller.go index bd37bc1..89a9623 100755 --- a/internal/cwd/packageinstaller/utils/uninstaller.go +++ b/internal/cwd/packageinstaller/utils/uninstaller.go @@ -1,10 +1,11 @@ package utils import ( - "ela/foundation/errors" - "ela/foundation/logger" - "ela/registry/app" "os" + + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/registry/app" ) // delete package based package id diff --git a/internal/cwd/packager/package.go b/internal/cwd/packager/package.go index 49bd217..058bf6b 100755 --- a/internal/cwd/packager/package.go +++ b/internal/cwd/packager/package.go @@ -2,17 +2,18 @@ package main import ( "archive/zip" - "ela/foundation/app/data" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/path" - "ela/foundation/perm" - "ela/internal/cwd/global" "encoding/json" "io/fs" "log" "os" "path/filepath" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/foundation/perm" + "github.com/cansulting/elabox-system-tools/internal/cwd/global" ) const VERSION = "0.1.0" diff --git a/internal/cwd/system/appman/appConnect.go b/internal/cwd/system/appman/appConnect.go index 2c063c4..2872fd5 100755 --- a/internal/cwd/system/appman/appConnect.go +++ b/internal/cwd/system/appman/appConnect.go @@ -1,15 +1,16 @@ package appman import ( - "ela/foundation/app/data" - "ela/foundation/constants" - eventd "ela/foundation/event/data" - "ela/foundation/event/protocol" - "ela/foundation/path" - "ela/internal/cwd/system/global" "os" "os/exec" "path/filepath" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + eventd "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" ) /* diff --git a/internal/cwd/system/appman/appConnectManager.go b/internal/cwd/system/appman/appConnectManager.go index 19ddd79..f26eb32 100755 --- a/internal/cwd/system/appman/appConnectManager.go +++ b/internal/cwd/system/appman/appConnectManager.go @@ -1,10 +1,10 @@ package appman import ( - "ela/foundation/event/data" - "ela/foundation/event/protocol" - "ela/internal/cwd/system/global" - registry "ela/registry/app" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" + registry "github.com/cansulting/elabox-system-tools/registry/app" ) // currently running processes diff --git a/internal/cwd/system/appman/initializer.go b/internal/cwd/system/appman/initializer.go index 3323e0b..76de9f9 100755 --- a/internal/cwd/system/appman/initializer.go +++ b/internal/cwd/system/appman/initializer.go @@ -1,6 +1,6 @@ package appman -import "ela/internal/cwd/system/global" +import "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" func Initialize(commandline bool) error { if !commandline && global.RUN_STARTUPAPPS { diff --git a/internal/cwd/system/appman/nodejs.go b/internal/cwd/system/appman/nodejs.go index 0642216..4e21f7c 100755 --- a/internal/cwd/system/appman/nodejs.go +++ b/internal/cwd/system/appman/nodejs.go @@ -1,9 +1,10 @@ package appman import ( - "ela/foundation/app/data" - "ela/foundation/errors" "os/exec" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/errors" ) /* @@ -15,7 +16,7 @@ type Nodejs struct { running bool } -// start running node js +// start running node js func (n *Nodejs) Run() error { n.running = true path := n.Config.GetNodejsDir() + "/index.js" diff --git a/internal/cwd/system/appman/rpcBridge.go b/internal/cwd/system/appman/rpcBridge.go index 2179655..fd331d1 100755 --- a/internal/cwd/system/appman/rpcBridge.go +++ b/internal/cwd/system/appman/rpcBridge.go @@ -1,9 +1,10 @@ package appman import ( - "ela/foundation/event/data" - "ela/foundation/event/protocol" "log" + + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" ) /* diff --git a/internal/cwd/system/commandline.go b/internal/cwd/system/commandline.go index 0066b0f..1f31da2 100755 --- a/internal/cwd/system/commandline.go +++ b/internal/cwd/system/commandline.go @@ -1,13 +1,14 @@ package main import ( - "ela/foundation/constants" - "ela/foundation/event" - "ela/foundation/event/data" - "ela/foundation/event/protocol" - "ela/foundation/system" - "ela/internal/cwd/system/config" "os" + + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/event" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/system" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/config" ) // process commandline diff --git a/internal/cwd/system/config/envvar.go b/internal/cwd/system/config/envvar.go index f432216..309061e 100644 --- a/internal/cwd/system/config/envvar.go +++ b/internal/cwd/system/config/envvar.go @@ -1,13 +1,14 @@ package config import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/path" - "ela/foundation/perm" "encoding/json" "log" "os" + + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/foundation/perm" ) /* diff --git a/internal/cwd/system/config/init.go b/internal/cwd/system/config/init.go index 5685707..1c3e86c 100644 --- a/internal/cwd/system/config/init.go +++ b/internal/cwd/system/config/init.go @@ -1,10 +1,10 @@ package config import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/logger" - "ela/registry/app" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/registry/app" ) const ELAENV = "ELAENV" // environment variable for build mode diff --git a/internal/cwd/system/global/global.go b/internal/cwd/system/global/global.go index 4b4cff6..f7a8d50 100755 --- a/internal/cwd/system/global/global.go +++ b/internal/cwd/system/global/global.go @@ -1,13 +1,13 @@ package global import ( - "ela/foundation/logger" - "ela/server" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/server" ) var Server *server.Manager // the server manager that handles event and web var Running bool = true // true if this system is currently running const INSTALLER_PKG_ID = "ela.installer" // package id of installer const SYSTEM_PKID = "ela.system" -const RUN_STARTUPAPPS = true // true if system runs startup apps -var Logger = logger.Init(SYSTEM_PKID) \ No newline at end of file +const RUN_STARTUPAPPS = true // true if system runs startup apps +var Logger = logger.Init(SYSTEM_PKID) diff --git a/internal/cwd/system/main.go b/internal/cwd/system/main.go index 0a532f6..27d7fe1 100755 --- a/internal/cwd/system/main.go +++ b/internal/cwd/system/main.go @@ -1,13 +1,14 @@ package main import ( - "ela/foundation/system" - "ela/internal/cwd/system/appman" - "ela/internal/cwd/system/config" - "ela/internal/cwd/system/global" - "ela/internal/cwd/system/servicecenter" "os" "time" + + "github.com/cansulting/elabox-system-tools/foundation/system" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/appman" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/config" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/servicecenter" ) func main() { diff --git a/internal/cwd/system/main_test.go b/internal/cwd/system/main_test.go index 2d44cb3..5a946d8 100755 --- a/internal/cwd/system/main_test.go +++ b/internal/cwd/system/main_test.go @@ -1,12 +1,13 @@ package main import ( - "ela/internal/cwd/system/system_update" - reg "ela/registry/app" "log" "os" "os/exec" "testing" + + "github.com/cansulting/elabox-system-tools/internal/cwd/system/system_update" + reg "github.com/cansulting/elabox-system-tools/registry/app" ) // test install a package and register it diff --git a/internal/cwd/system/servicecenter/controller.go b/internal/cwd/system/servicecenter/controller.go index 79b34c1..ef5f09a 100755 --- a/internal/cwd/system/servicecenter/controller.go +++ b/internal/cwd/system/servicecenter/controller.go @@ -1,9 +1,9 @@ package servicecenter import ( - "ela/internal/cwd/system/global" - "ela/internal/cwd/system/web" - "ela/server" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/web" + "github.com/cansulting/elabox-system-tools/server" ) /* diff --git a/internal/cwd/system/servicecenter/services.go b/internal/cwd/system/servicecenter/services.go index 9778974..e034a19 100755 --- a/internal/cwd/system/servicecenter/services.go +++ b/internal/cwd/system/servicecenter/services.go @@ -1,18 +1,20 @@ package servicecenter import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/event/data" - "ela/foundation/event/protocol" - "ela/foundation/system" - "ela/internal/cwd/system/appman" - "ela/internal/cwd/system/global" "os" "time" - "ela/registry/app" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/system" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/appman" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/global" + "log" + + "github.com/cansulting/elabox-system-tools/registry/app" ) // callback when recieved service requests from client diff --git a/internal/cwd/system/system_update/system_update.go b/internal/cwd/system/system_update/system_update.go index 3ffb865..f51d8d6 100755 --- a/internal/cwd/system/system_update/system_update.go +++ b/internal/cwd/system/system_update/system_update.go @@ -1,15 +1,16 @@ package system_update import ( - "ela/foundation/app/data" - "ela/foundation/errors" - "ela/foundation/path" "io/ioutil" "log" "os" "os/exec" "path/filepath" "time" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/path" ) // step: create a copy of this application diff --git a/internal/cwd/system/update_test.go b/internal/cwd/system/update_test.go index 920ef3f..808bddf 100755 --- a/internal/cwd/system/update_test.go +++ b/internal/cwd/system/update_test.go @@ -1,11 +1,12 @@ package main import ( - "ela/foundation/app" - "ela/foundation/constants" - "ela/foundation/event" - "ela/foundation/event/data" "testing" + + "github.com/cansulting/elabox-system-tools/foundation/app" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/event" + "github.com/cansulting/elabox-system-tools/foundation/event/data" ) const SAMPLE_PACKAGE = "ela.system.installer" diff --git a/internal/cwd/system/web/service.go b/internal/cwd/system/web/service.go index 73ff9a3..c8d79dc 100644 --- a/internal/cwd/system/web/service.go +++ b/internal/cwd/system/web/service.go @@ -1,14 +1,15 @@ package web import ( - "ela/foundation/constants" - "ela/foundation/path" "log" "net/http" "os" "runtime/debug" "strings" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/path" + _ "net/http/pprof" ) diff --git a/registry/app/app.go b/registry/app/app.go index e8849a3..6a49e31 100755 --- a/registry/app/app.go +++ b/registry/app/app.go @@ -1,11 +1,11 @@ package app import ( - "ela/foundation/app/data" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/logger" - "ela/registry/util" + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/registry/util" ) /* diff --git a/registry/app/components.go b/registry/app/components.go index 343c5c4..7d16346 100755 --- a/registry/app/components.go +++ b/registry/app/components.go @@ -1,9 +1,9 @@ package app import ( - "ela/foundation/app/data" - "ela/foundation/errors" - "ela/registry/util" + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/registry/util" ) func retrievePackagesFor(action string, table string) ([]string, error) { diff --git a/registry/app/util.go b/registry/app/util.go index 2f3b69d..545219a 100755 --- a/registry/app/util.go +++ b/registry/app/util.go @@ -2,9 +2,10 @@ package app import ( "database/sql" - "ela/foundation/app/data" - "ela/foundation/errors" - "ela/registry/util" + + "github.com/cansulting/elabox-system-tools/foundation/app/data" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/registry/util" ) func convertRawToPackageConfig(rows *sql.Rows) []*data.PackageConfig { diff --git a/registry/util/init.go b/registry/util/init.go index ebeff28..38d4d90 100755 --- a/registry/util/init.go +++ b/registry/util/init.go @@ -2,14 +2,15 @@ package util import ( "database/sql" - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/logger" - "ela/foundation/path" - "ela/foundation/perm" - "ela/registry/config" "os" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/foundation/path" + "github.com/cansulting/elabox-system-tools/foundation/perm" + "github.com/cansulting/elabox-system-tools/registry/config" + _ "github.com/mattn/go-sqlite3" ) diff --git a/server/config/config.go b/server/config/config.go index 0d77609..17f4e0d 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -1,3 +1,3 @@ package config -const PORT = "80" +const PORT = "80" // port will the event and web server will serve diff --git a/server/event/handler.go b/server/event/handler.go index e249814..c3c4f24 100644 --- a/server/event/handler.go +++ b/server/event/handler.go @@ -1,9 +1,9 @@ package event import ( - "ela/foundation/constants" - "ela/foundation/event/data" - "ela/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" ) // use to handle system services such as subscription and broadvcasting diff --git a/server/event/socketIOServer.go b/server/event/socketIOServer.go index 2c40bed..4e2ae2c 100644 --- a/server/event/socketIOServer.go +++ b/server/event/socketIOServer.go @@ -1,9 +1,9 @@ package event import ( - "ela/foundation/constants" - "ela/foundation/event/data" - "ela/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" "log" "net/http" "time" diff --git a/server/event/status.go b/server/event/status.go index 7647cc2..c6223c8 100644 --- a/server/event/status.go +++ b/server/event/status.go @@ -1,8 +1,8 @@ package event import ( - "ela/foundation/constants" - "ela/foundation/system" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/system" "log" socketio "github.com/graarh/golang-socketio" diff --git a/server/server.go b/server/server.go index b2acba8..2ce9966 100644 --- a/server/server.go +++ b/server/server.go @@ -2,14 +2,15 @@ package server import ( "context" - "ela/foundation/event/data" - "ela/foundation/event/protocol" - "ela/foundation/logger" - "ela/server/config" - "ela/server/event" "net/http" "runtime" "time" + + "github.com/cansulting/elabox-system-tools/foundation/event/data" + "github.com/cansulting/elabox-system-tools/foundation/event/protocol" + "github.com/cansulting/elabox-system-tools/foundation/logger" + "github.com/cansulting/elabox-system-tools/server/config" + "github.com/cansulting/elabox-system-tools/server/event" ) type Manager struct { diff --git a/test/logger_test.go b/test/logger_test.go index b42a444..9f81e89 100644 --- a/test/logger_test.go +++ b/test/logger_test.go @@ -1,9 +1,9 @@ package main import ( - "ela/foundation/constants" - "ela/foundation/errors" - "ela/foundation/logger" + "github.com/cansulting/elabox-system-tools/foundation/constants" + "github.com/cansulting/elabox-system-tools/foundation/errors" + "github.com/cansulting/elabox-system-tools/foundation/logger" "testing" ) diff --git a/test/registry_test.go b/test/registry_test.go index a8be2eb..821843d 100755 --- a/test/registry_test.go +++ b/test/registry_test.go @@ -1,11 +1,12 @@ package main import ( - "ela/internal/cwd/system/appman" - "ela/internal/cwd/system/servicecenter" - "ela/registry/app" "log" "testing" + + "github.com/cansulting/elabox-system-tools/internal/cwd/system/appman" + "github.com/cansulting/elabox-system-tools/internal/cwd/system/servicecenter" + "github.com/cansulting/elabox-system-tools/registry/app" ) func TestPackageRegistration(test *testing.T) {