Skip to content

Commit

Permalink
Fix wrong package import
Browse files Browse the repository at this point in the history
  • Loading branch information
@vntw
vntw committed Dec 4, 2017
1 parent 759f07f commit c9e9c38
Show file tree
Hide file tree
Showing 22 changed files with 48 additions and 48 deletions.
4 changes: 2 additions & 2 deletions server/ac/configs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ import (

"github.com/google/uuid"

"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acsrvmanager/server/ac/spec"
"github.com/venyii/acfg/server/ac/config"
"github.com/venyii/acfg/server/ac/spec"
)

type ConfigManager interface {
Expand Down
2 changes: 1 addition & 1 deletion server/ac/configs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ac
import (
"testing"

"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acfg/server/ac/config"
)

func TestCreateServerConfigs(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/ac/logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"sort"
"strings"

instlog "github.com/venyii/acsrvmanager/server/ac/server/log"
"github.com/venyii/acsrvmanager/server/app"
instlog "github.com/venyii/acfg/server/ac/server/log"
"github.com/venyii/acfg/server/app"
)

type ServerLogsManager interface {
Expand Down
6 changes: 3 additions & 3 deletions server/ac/logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ import (
"strings"
"testing"

"github.com/venyii/acsrvmanager/server/ac/config"
instlog "github.com/venyii/acsrvmanager/server/ac/server/log"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acfg/server/ac/config"
instlog "github.com/venyii/acfg/server/ac/server/log"
"github.com/venyii/acfg/server/app"
)

func TestNewServerLog(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/ac/plugins/plugins.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"os"
"os/exec"

"github.com/venyii/acsrvmanager/server/ac/portalloc"
"github.com/venyii/acfg/server/ac/portalloc"
)

type Plugins []Plugin
Expand Down
2 changes: 1 addition & 1 deletion server/ac/plugins/stracker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (

"github.com/go-ini/ini"

"github.com/venyii/acsrvmanager/server/ac/portalloc"
"github.com/venyii/acfg/server/ac/portalloc"
)

var tcpPortRange = []int{
Expand Down
12 changes: 6 additions & 6 deletions server/ac/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ import (

"github.com/google/uuid"

"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acsrvmanager/server/ac/plugins"
"github.com/venyii/acsrvmanager/server/ac/portalloc"
"github.com/venyii/acsrvmanager/server/ac/server"
"github.com/venyii/acsrvmanager/server/ac/spec"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acfg/server/ac/config"
"github.com/venyii/acfg/server/ac/plugins"
"github.com/venyii/acfg/server/ac/portalloc"
"github.com/venyii/acfg/server/ac/server"
"github.com/venyii/acfg/server/ac/spec"
"github.com/venyii/acfg/server/app"
)

type InstanceManager interface {
Expand Down
2 changes: 1 addition & 1 deletion server/ac/server/instance.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"os/exec"
"syscall"

"github.com/venyii/acsrvmanager/server/ac/spec"
"github.com/venyii/acfg/server/ac/spec"
)

type Instance struct {
Expand Down
2 changes: 1 addition & 1 deletion server/ac/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ac
import (
"testing"

"github.com/venyii/acsrvmanager/server/ac/server"
"github.com/venyii/acfg/server/ac/server"
)

func TestNewMemoryInstanceManager(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions server/ac/spec/srvspec.go
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package spec

import (
"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acsrvmanager/server/ac/plugins"
"github.com/venyii/acsrvmanager/server/ac/portalloc"
"github.com/venyii/acfg/server/ac/config"
"github.com/venyii/acfg/server/ac/plugins"
"github.com/venyii/acfg/server/ac/portalloc"
)

type ServerSpec struct {
Expand Down
4 changes: 2 additions & 2 deletions server/ac/spec/srvspec_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package spec
import (
"testing"

"github.com/venyii/acsrvmanager/server/ac/plugins"
"github.com/venyii/acsrvmanager/server/ac/portalloc"
"github.com/venyii/acfg/server/ac/plugins"
"github.com/venyii/acfg/server/ac/portalloc"
)

type dummyPlugin struct {
Expand Down
2 changes: 1 addition & 1 deletion server/handlers/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net/http"
"strings"

"github.com/venyii/acsrvmanager/server/user"
"github.com/venyii/acfg/server/user"
)

func LoginHandler(w http.ResponseWriter, r *http.Request) {
Expand Down
2 changes: 1 addition & 1 deletion server/handlers/auth_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"testing"

"github.com/venyii/acsrvmanager/server/user"
"github.com/venyii/acfg/server/user"
)

func TestLoginHandler(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/handlers/cfgupload.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"path/filepath"
"strings"

"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acfg/server/ac/config"
)

func handleConfigFilesUpload(r *http.Request) (config.ServerConfigFiles, error) {
Expand Down
2 changes: 1 addition & 1 deletion server/handlers/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (

"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acfg/server/ac"
)

func ConfigsUploadHandler(cm ac.ConfigManager) http.HandlerFunc {
Expand Down
4 changes: 2 additions & 2 deletions server/handlers/config_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"github.com/go-ini/ini"
"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/ac/config"
)

func TestConfigsUploadHandler(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions server/handlers/logs.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/app"
)

func LogsHandler(cfg app.Config, sl ac.ServerLogsManager) http.HandlerFunc {
Expand Down
4 changes: 2 additions & 2 deletions server/handlers/logs_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (

"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/app"
)

func TestLogsHandlerWithNoData(t *testing.T) {
Expand Down
10 changes: 5 additions & 5 deletions server/handlers/server.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ import (

"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/ac/plugins"
"github.com/venyii/acsrvmanager/server/ac/server"
"github.com/venyii/acsrvmanager/server/ac/spec"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/ac/plugins"
"github.com/venyii/acfg/server/ac/server"
"github.com/venyii/acfg/server/ac/spec"
"github.com/venyii/acfg/server/app"
)

func ServersHandler(im ac.InstanceManager, si server.InstanceInfoer, cm ac.ConfigManager) http.HandlerFunc {
Expand Down
6 changes: 3 additions & 3 deletions server/handlers/server_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (

"github.com/go-ini/ini"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/ac/config"
"github.com/venyii/acsrvmanager/server/ac/server"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/ac/config"
"github.com/venyii/acfg/server/ac/server"
)

func TestServersHandlerWithNoData(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion server/handlers/static_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"strings"
"testing"

"github.com/venyii/acsrvmanager/server/static"
"github.com/venyii/acfg/server/static"
)

func TestClientAppHandler(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions server/main/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
muxHandlers "github.com/gorilla/handlers"
"github.com/gorilla/mux"

"github.com/venyii/acsrvmanager/server/ac"
"github.com/venyii/acsrvmanager/server/ac/server"
"github.com/venyii/acsrvmanager/server/app"
"github.com/venyii/acsrvmanager/server/handlers"
"github.com/venyii/acsrvmanager/server/static"
"github.com/venyii/acsrvmanager/server/user"
"github.com/venyii/acfg/server/ac"
"github.com/venyii/acfg/server/ac/server"
"github.com/venyii/acfg/server/app"
"github.com/venyii/acfg/server/handlers"
"github.com/venyii/acfg/server/static"
"github.com/venyii/acfg/server/user"
)

func main() {
Expand Down

0 comments on commit c9e9c38

Please sign in to comment.