Skip to content

Commit

Permalink
initial edit to fix package names (not compiled yet)
Browse files Browse the repository at this point in the history
  • Loading branch information
@larryr
larryr committed Jan 17, 2018
1 parent 474a8f1 commit cdf7eca
Show file tree
Hide file tree
Showing 70 changed files with 186 additions and 188 deletions.
4 changes: 2 additions & 2 deletions x/accounts/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
"io/ioutil"
"net/http"
)
Expand Down
4 changes: 2 additions & 2 deletions x/accounts/mock/auth.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package mock

import (
gomock "github.com/golang/mock/gomock"
. "github.com/lrt/x/accounts"
management "github.com/verizonlabs/northstar/pkg/management"
. "github.com/lavaorg/lrt/x/accounts"
management "github.com/lavaorg/lrt/x/management"
)

// Mock of AuthClient interface
Expand Down
4 changes: 2 additions & 2 deletions x/accounts/mock/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package mock

import (
gomock "github.com/golang/mock/gomock"
. "github.com/lrt/x/accounts"
management "github.com/verizonlabs/northstar/pkg/management"
. "github.com/lavaorg/lrt/x/accounts"
management "github.com/lavaorg/lrt/x/management"
)

// Mock of Client interface
Expand Down
4 changes: 2 additions & 2 deletions x/accounts/user.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"encoding/json"
"errors"
"fmt"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
"os"
)

Expand Down
10 changes: 5 additions & 5 deletions x/cmd/ekk/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ limitations under the License.
package main

import (
"github.com/verizonlabs/northstar/pkg/ekk"
"github.com/verizonlabs/northstar/pkg/ekk/config"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/verizonlabs/northstar/pkg/service_master"
"github.com/lavaorg/lrt/x/ekk"
"github.com/lavaorg/lrt/x/ekk/config"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
"github.com/lavaorg/lrt/x/service_master"
)

type (
Expand Down
2 changes: 1 addition & 1 deletion x/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package config

import (
"errors"
"github.com/lavaorg/lrt/x/mlog"
"os"
"github.com/verizonlabs/northstar/pkg/mlog"
"strconv"
)

Expand Down
4 changes: 2 additions & 2 deletions x/database/storage.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package database

import (
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
"encoding/json"
_ "github.com/gocql/gocql"
"net/http"
Expand Down
4 changes: 2 additions & 2 deletions x/database/storage_database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"time"

"github.com/gocql/gocql"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
)

type Database struct {
Expand Down
2 changes: 1 addition & 1 deletion x/database/storage_memory.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.
package database

import (
"github.com/verizonlabs/northstar/pkg/management"
"github.com/lavaorg/lrt/x/management"
"net/http"
"reflect"
"strconv"
Expand Down
2 changes: 1 addition & 1 deletion x/ekk/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ limitations under the License.

package config

import "github.com/verizonlabs/northstar/pkg/config"
import "github.com/lavaorg/lrt/x/config"

// Logging Topics
const (
Expand Down
4 changes: 2 additions & 2 deletions x/ekk/elasticsearch.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"
"time"

"github.com/verizonlabs/northstar/pkg/ekk/config"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/ekk/config"
"github.com/lavaorg/lrt/x/mlog"

"strings"

Expand Down
4 changes: 2 additions & 2 deletions x/ekk/kafka.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package ekk

import (
"github.com/verizonlabs/northstar/pkg/ekk/config"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/ekk/config"
"github.com/lavaorg/lrt/x/msgq"
)

type (
Expand Down
4 changes: 2 additions & 2 deletions x/file/file.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ limitations under the License.
package file

import (
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
"io/ioutil"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
)

func ReadFile(file string) (string, error) {
Expand Down
6 changes: 3 additions & 3 deletions x/httpclientlb/lb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ import (
"sync"
"time"

"github.com/verizonlabs/northstar/pkg/config"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/config"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
)

var (
Expand Down
4 changes: 2 additions & 2 deletions x/kafka/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package kafka

import (
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
)

type ProcessMsg struct {
Expand Down
4 changes: 2 additions & 2 deletions x/kafka/mocks/msgq.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package msgq

import (
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
)

type MockMessageQueue struct{}
Expand Down
4 changes: 2 additions & 2 deletions x/kafka/mocks/msgq_consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package msgq

import (
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
)

type MockConsumer struct{}
Expand Down
4 changes: 2 additions & 2 deletions x/kafka/mocks/msgq_producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"

"github.com/Shopify/sarama"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
)

type MockProducer struct{}
Expand Down
2 changes: 1 addition & 1 deletion x/lualib/log.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ limitations under the License.
package lualib

import (
"github.com/lavaorg/lrt/x/mlog"
"github.com/yuin/gopher-lua"
"github.com/verizonlabs/northstar/pkg/mlog"
)

type mlogModule struct {
Expand Down
2 changes: 1 addition & 1 deletion x/lualib/marathon.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"fmt"

marathon "github.com/gambol99/go-marathon"
"github.com/lavaorg/lrt/x/mlog"
"github.com/yuin/gopher-lua"
"github.com/verizonlabs/northstar/pkg/mlog"
)

var errorMarathonNotConfigured = "MARATHON Client not configured"
Expand Down
2 changes: 1 addition & 1 deletion x/lualib/redis.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package lualib

import (
"fmt"
"github.com/lavaorg/lrt/x/redis"
"github.com/yuin/gopher-lua"
"github.com/verizonlabs/northstar/pkg/redis"
)

var errorRedisNotConfigured = "REDIS Client not configured"
Expand Down
2 changes: 1 addition & 1 deletion x/management/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"strings"
"time"

"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/mlog"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion x/management/management.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ import (
"time"

"github.com/gin-gonic/gin"
log "github.com/verizonlabs/northstar/pkg/mlog"
log "github.com/lavaorg/lrt/x/mlog"
)

var (
Expand Down
6 changes: 3 additions & 3 deletions x/marathon/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package marathon

import (
"github.com/gambol99/go-marathon"
"github.com/verizonlabs/northstar/pkg/config"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/config"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
)

type MarathonClient struct {
Expand Down
7 changes: 3 additions & 4 deletions x/middleware/authorize.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,10 @@ package middleware
import (
"errors"
"github.com/gin-gonic/gin"
"github.com/lavaorg/lrt/x/accounts"
"github.com/lavaorg/lrt/x/management"
"github.com/lavaorg/lrt/x/mlog"
"net/http"
"github.com/verizonlabs/northstar/pkg/management"
"github.com/verizonlabs/northstar/pkg/thingspace"
. "github.com/verizonlabs/northstar/pkg/thingspace/api"
"github.com/verizonlabs/northstar/pkg/mlog"
"strings"
)

Expand Down
2 changes: 1 addition & 1 deletion x/middleware/cors.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ package middleware

import (
"github.com/gin-gonic/gin"
"github.com/lavaorg/lrt/x/mlog"
"net/http"
"github.com/verizonlabs/northstar/pkg/mlog"
"strconv"
"strings"
"time"
Expand Down
2 changes: 1 addition & 1 deletion x/middleware/monitoring.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/lavaorg/lrt/x/mlog"
"github.com/pborman/uuid"
"github.com/verizonlabs/northstar/pkg/mlog"
)

type TxnInfo struct {
Expand Down
2 changes: 1 addition & 1 deletion x/msgq/config/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package config
import (
"time"

"github.com/verizonlabs/northstar/pkg/config"
"github.com/lavaorg/lrt/x/config"
)

var (
Expand Down
10 changes: 5 additions & 5 deletions x/msgq/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"time"

"github.com/Shopify/sarama"
"github.com/verizonlabs/northstar/pkg/crypto"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/zklib"
"github.com/verizonlabs/northstar/pkg/zklib/config"
"github.com/verizonlabs/northstar/pkg/vaultlib"
"github.com/lavaorg/lrt/x/crypto"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/vaultlib"
"github.com/lavaorg/lrt/x/zklib"
"github.com/lavaorg/lrt/x/zklib/config"
)

func (cons *Consumer) Receive() chan *ConsumerEvent {
Expand Down
4 changes: 2 additions & 2 deletions x/msgq/examples/consumerApp/consumer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package main

import (
"fmt"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
"os"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"strconv"
"time"
)
Expand Down
4 changes: 2 additions & 2 deletions x/msgq/examples/producerApp/producer.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ package main

import (
"fmt"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
"os"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"strconv"
"strings"
"sync"
Expand Down
4 changes: 2 additions & 2 deletions x/msgq/examples/receive/receive.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ package main
import (
// "encoding/json"
"fmt"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
"time"
)

Expand Down
14 changes: 7 additions & 7 deletions x/msgq/examples/send/send.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"fmt"
"time"
//"encoding/binary"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/verizonlabs/northstar/pkg/msgq"
"github.com/verizonlabs/northstar/pkg/msgs"
//"github.com/verizonlabs/northstar/pkg/external/utils"
"github.com/verizonlabs/northstar/pkg/sdscodec"
//"github.com/verizonlabs/northstar/pkg/servdisc"
"github.com/verizonlabs/northstar/pkg/msgq/topics"
"github.com/lavaorg/lrt/x/mlog"
"github.com/lavaorg/lrt/x/msgq"
"github.com/lavaorg/lrt/x/msgs"
//"github.com/lavaorg/lrt/x/external/utils"
"github.com/lavaorg/lrt/x/sdscodec"
//"github.com/lavaorg/lrt/x/servdisc"
"github.com/lavaorg/lrt/x/msgq/topics"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion x/msgq/kafkaAvailMonitor.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/Shopify/sarama"
vzbreaker "github.com/Shopify/sarama/vz/breaker"
"github.com/eapache/go-resiliency/breaker"
"github.com/verizonlabs/northstar/pkg/mlog"
"github.com/lavaorg/lrt/x/mlog"
"sync"
"time"
)
Expand Down
Loading

0 comments on commit cdf7eca

Please sign in to comment.