Skip to content

Commit

Permalink
updated current package path to github.com/cansulting/elabox-system-t…
Browse files Browse the repository at this point in the history 
…ools
  • Loading branch information
@jhoe123
jhoe123 committed Oct 4, 2021
1 parent fe3d9e7 commit df0b209
Show file tree
Hide file tree
Showing 56 changed files with 224 additions and 196 deletions.
19 changes: 10 additions & 9 deletions foundation/app/controller.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 ////////////////////////////////////
Expand Down
7 changes: 4 additions & 3 deletions foundation/app/data/packageConfig.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion foundation/app/protocol/activityInterface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
6 changes: 3 additions & 3 deletions foundation/app/service/rpcHandler.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion foundation/app/service/rpcInterface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
package service

import (
"ela/foundation/event/data"
"github.com/cansulting/elabox-system-tools/foundation/event/data"
)

type RPCInterface interface {
Expand Down
2 changes: 1 addition & 1 deletion foundation/event/data/action.go
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package data

import (
"ela/foundation/errors"
"github.com/cansulting/elabox-system-tools/foundation/errors"
"encoding/json"
"log"
"reflect"
Expand Down
4 changes: 2 additions & 2 deletions foundation/event/manager.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

/*
Expand Down
2 changes: 1 addition & 1 deletion foundation/event/protocol/connectorClient.go
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package protocol

import "ela/foundation/event/data"
import "github.com/cansulting/elabox-system-tools/foundation/event/data"

/*
connectorClient.go
Expand Down
4 changes: 2 additions & 2 deletions foundation/event/protocol/connectorServer.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions foundation/event/socket/socketIOClient.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions foundation/logger/logger.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions foundation/testing/app/app.go
View file
Original file line number Diff line number Diff line change
@@ -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) {
Expand Down
4 changes: 2 additions & 2 deletions foundation/testing/app/dummySystemService.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion go.mod
100755 → 100644
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module ela
module github.com/cansulting/elabox-system-tools

go 1.16

Expand Down
Empty file modified go.sum
100755 → 100644
View file
Empty file.
11 changes: 6 additions & 5 deletions internal/cwd/packageinstaller/activity.go
View file
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
11 changes: 6 additions & 5 deletions internal/cwd/packageinstaller/commandline.go
View file
Original file line number Diff line number Diff line change
@@ -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"
)

Expand Down
8 changes: 4 additions & 4 deletions internal/cwd/packageinstaller/constants/constants.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
20 changes: 10 additions & 10 deletions internal/cwd/packageinstaller/installer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
11 changes: 6 additions & 5 deletions internal/cwd/packageinstaller/landing/server.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
4 changes: 2 additions & 2 deletions internal/cwd/packageinstaller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
18 changes: 9 additions & 9 deletions internal/cwd/packageinstaller/main_test.go
View file
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
5 changes: 3 additions & 2 deletions internal/cwd/packageinstaller/path.go
View file
Original file line number Diff line number Diff line change
@@ -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() {
Expand Down
15 changes: 8 additions & 7 deletions internal/cwd/packageinstaller/pkg/pkg.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions internal/cwd/packageinstaller/utils/backup.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion internal/cwd/packageinstaller/utils/filesystem.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
9 changes: 5 additions & 4 deletions internal/cwd/packageinstaller/utils/systemControl.go
View file
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading

0 comments on commit df0b209

Please sign in to comment.