Skip to content

Commit

Permalink
Use ws-skeleton repository import. (eclipse-che#8)
Browse files Browse the repository at this point in the history
Import should be changed to eclipse before merge to original repo

Signed-off-by: Oleksandr Andriienko <[email protected]>
  • Loading branch information
AndrienkoAleksandr authored Nov 2, 2018
1 parent e8e4c1d commit db78bec
Show file tree
Hide file tree
Showing 13 changed files with 22 additions and 22 deletions.
4 changes: 2 additions & 2 deletions api/jsonrpc/handlers.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
package jsonrpc

import (
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"

"github.com/eclipse/che-machine-exec/exec"
"github.com/ws-skeleton/che-machine-exec/exec"
"github.com/eclipse/che/agents/go-agents/core/jsonrpc"
"log"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion api/jsonrpc/jsonrpc-api.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package jsonrpc

import (
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"
"github.com/eclipse/che/agents/go-agents/core/jsonrpc"
)

Expand Down
2 changes: 1 addition & 1 deletion api/model/model_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"bytes"
"fmt"
"github.com/docker/docker/api/types"
"github.com/eclipse/che-machine-exec/line-buffer"
"github.com/ws-skeleton/che-machine-exec/line-buffer"
"github.com/gorilla/websocket"
"k8s.io/client-go/tools/remotecommand"
"log"
Expand Down
2 changes: 1 addition & 1 deletion api/websocket/attach.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package websocket

import (
"errors"
"github.com/eclipse/che-machine-exec/exec"
"github.com/ws-skeleton/che-machine-exec/exec"
"github.com/eclipse/che/agents/go-agents/core/rest"
"github.com/gorilla/websocket"
"log"
Expand Down
6 changes: 3 additions & 3 deletions exec/docker-infra/docker_exec_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ import (
"fmt"
"github.com/docker/docker/api/types"
"github.com/docker/docker/client"
"github.com/eclipse/che-machine-exec/api/model"
wsConnHandler "github.com/eclipse/che-machine-exec/exec/ws-conn"
"github.com/eclipse/che-machine-exec/line-buffer"
"github.com/ws-skeleton/che-machine-exec/api/model"
wsConnHandler "github.com/ws-skeleton/che-machine-exec/exec/ws-conn"
"github.com/ws-skeleton/che-machine-exec/line-buffer"
"github.com/gorilla/websocket"
"golang.org/x/net/context"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion exec/docker-infra/machine_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"errors"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/filters"
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"
"golang.org/x/net/context"
)

Expand Down
6 changes: 3 additions & 3 deletions exec/exec-manager-provider.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
package exec

import (
"github.com/eclipse/che-machine-exec/api/model"
"github.com/eclipse/che-machine-exec/exec/docker-infra"
"github.com/eclipse/che-machine-exec/exec/kubernetes-infra"
"github.com/ws-skeleton/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/exec/docker-infra"
"github.com/ws-skeleton/che-machine-exec/exec/kubernetes-infra"
"github.com/gorilla/websocket"
"log"
"os"
Expand Down
6 changes: 3 additions & 3 deletions exec/kubernetes-infra/kubernetes_exec_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ package kubernetes_infra

import (
"errors"
"github.com/eclipse/che-machine-exec/api/model"
wsConnHandler "github.com/eclipse/che-machine-exec/exec/ws-conn"
"github.com/eclipse/che-machine-exec/line-buffer"
"github.com/ws-skeleton/che-machine-exec/api/model"
wsConnHandler "github.com/ws-skeleton/che-machine-exec/exec/ws-conn"
"github.com/ws-skeleton/che-machine-exec/line-buffer"
"github.com/gorilla/websocket"
"k8s.io/api/core/v1"
"k8s.io/client-go/kubernetes"
Expand Down
2 changes: 1 addition & 1 deletion exec/kubernetes-infra/machine_filter.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package kubernetes_infra

import (
"errors"
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
corev1 "k8s.io/client-go/kubernetes/typed/core/v1"
Expand Down
4 changes: 2 additions & 2 deletions exec/kubernetes-infra/machine_filter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package kubernetes_infra

import (
"errors"
"github.com/eclipse/che-machine-exec/api/model"
"github.com/eclipse/che-machine-exec/mocks"
"github.com/ws-skeleton/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/mocks"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
corev1 "k8s.io/api/core/v1"
Expand Down
2 changes: 1 addition & 1 deletion exec/kubernetes-infra/pty_handler.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package kubernetes_infra

import (
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"
"k8s.io/client-go/tools/remotecommand"
)

Expand Down
2 changes: 1 addition & 1 deletion exec/ws-conn/conn-reader.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
package ws_conn

import (
"github.com/eclipse/che-machine-exec/api/model"
"github.com/ws-skeleton/che-machine-exec/api/model"
"github.com/gorilla/websocket"
"log"
)
Expand Down
4 changes: 2 additions & 2 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ package main

import (
"flag"
jsonRpcApi "github.com/eclipse/che-machine-exec/api/jsonrpc"
"github.com/eclipse/che-machine-exec/api/websocket"
jsonRpcApi "github.com/ws-skeleton/che-machine-exec/api/jsonrpc"
"github.com/ws-skeleton/che-machine-exec/api/websocket"
"github.com/eclipse/che/agents/go-agents/core/jsonrpc"
"github.com/eclipse/che/agents/go-agents/core/jsonrpc/jsonrpcws"
"github.com/eclipse/che/agents/go-agents/core/rest"
Expand Down

0 comments on commit db78bec

Please sign in to comment.