Moving tunneld and rps into the examples directory.
Change-Id: I6dde5cc8f81aae2ee0b1a565a5e139f4c64846b1
diff --git a/rps/common/common.go b/examples/rps/common/common.go
similarity index 98%
rename from rps/common/common.go
rename to examples/rps/common/common.go
index 4ab7bb4..58bbab1 100644
--- a/rps/common/common.go
+++ b/examples/rps/common/common.go
@@ -10,7 +10,7 @@
"os"
"time"
- "v.io/apps/rps"
+ "v.io/x/ref/examples/rps"
"v.io/v23"
"v.io/v23/context"
diff --git a/rps/rpsbot/impl.go b/examples/rps/rpsbot/impl.go
similarity index 98%
rename from rps/rpsbot/impl.go
rename to examples/rps/rpsbot/impl.go
index 1942094..572896d 100644
--- a/rps/rpsbot/impl.go
+++ b/examples/rps/rpsbot/impl.go
@@ -3,7 +3,7 @@
import (
"errors"
- "v.io/apps/rps"
+ "v.io/x/ref/examples/rps"
"v.io/v23/context"
"v.io/v23/ipc"
"v.io/v23/vtrace"
diff --git a/rps/rpsbot/impl_test.go b/examples/rps/rpsbot/impl_test.go
similarity index 99%
rename from rps/rpsbot/impl_test.go
rename to examples/rps/rpsbot/impl_test.go
index e80fe67..9eeb483 100644
--- a/rps/rpsbot/impl_test.go
+++ b/examples/rps/rpsbot/impl_test.go
@@ -12,7 +12,7 @@
"strconv"
"testing"
- "v.io/apps/rps"
+ "v.io/x/ref/examples/rps"
"v.io/core/veyron/lib/testutil"
mtlib "v.io/core/veyron/services/mounttable/lib"
diff --git a/rps/rpsbot/judge.go b/examples/rps/rpsbot/judge.go
similarity index 98%
rename from rps/rpsbot/judge.go
rename to examples/rps/rpsbot/judge.go
index c7240dd..df29fb7 100644
--- a/rps/rpsbot/judge.go
+++ b/examples/rps/rpsbot/judge.go
@@ -7,8 +7,8 @@
"sync"
"time"
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
"v.io/core/veyron/lib/stats"
"v.io/core/veyron/lib/stats/counter"
"v.io/v23/context"
diff --git a/rps/rpsbot/main.go b/examples/rps/rpsbot/main.go
similarity index 96%
rename from rps/rpsbot/main.go
rename to examples/rps/rpsbot/main.go
index 56b7c8e..439a170 100644
--- a/rps/rpsbot/main.go
+++ b/examples/rps/rpsbot/main.go
@@ -20,8 +20,8 @@
_ "v.io/core/veyron/profiles/roaming"
sflag "v.io/core/veyron/security/flag"
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
)
var (
diff --git a/rps/rpsbot/player.go b/examples/rps/rpsbot/player.go
similarity index 98%
rename from rps/rpsbot/player.go
rename to examples/rps/rpsbot/player.go
index 1181d25..74ad8a4 100644
--- a/rps/rpsbot/player.go
+++ b/examples/rps/rpsbot/player.go
@@ -4,8 +4,8 @@
"math/rand"
"time"
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
"v.io/core/veyron/lib/stats"
"v.io/core/veyron/lib/stats/counter"
"v.io/v23/context"
diff --git a/rps/rpsbot/scorekeeper.go b/examples/rps/rpsbot/scorekeeper.go
similarity index 91%
rename from rps/rpsbot/scorekeeper.go
rename to examples/rps/rpsbot/scorekeeper.go
index 6fad0aa..429647f 100644
--- a/rps/rpsbot/scorekeeper.go
+++ b/examples/rps/rpsbot/scorekeeper.go
@@ -1,8 +1,8 @@
package main
import (
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
"v.io/core/veyron/lib/stats"
"v.io/core/veyron/lib/stats/counter"
"v.io/v23/ipc"
diff --git a/rps/rpsplayer/main.go b/examples/rps/rpsplayer/main.go
similarity index 98%
rename from rps/rpsplayer/main.go
rename to examples/rps/rpsplayer/main.go
index 2bba584..13e40b8 100644
--- a/rps/rpsplayer/main.go
+++ b/examples/rps/rpsplayer/main.go
@@ -21,8 +21,8 @@
_ "v.io/core/veyron/profiles/roaming"
sflag "v.io/core/veyron/security/flag"
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
)
var (
diff --git a/rps/rpsscorekeeper/main.go b/examples/rps/rpsscorekeeper/main.go
similarity index 95%
rename from rps/rpsscorekeeper/main.go
rename to examples/rps/rpsscorekeeper/main.go
index 4533eb5..6485360 100644
--- a/rps/rpsscorekeeper/main.go
+++ b/examples/rps/rpsscorekeeper/main.go
@@ -15,8 +15,8 @@
_ "v.io/core/veyron/profiles/roaming"
sflag "v.io/core/veyron/security/flag"
- "v.io/apps/rps"
- "v.io/apps/rps/common"
+ "v.io/x/ref/examples/rps"
+ "v.io/x/ref/examples/rps/common"
)
type impl struct {
diff --git a/rps/service.vdl b/examples/rps/service.vdl
similarity index 100%
rename from rps/service.vdl
rename to examples/rps/service.vdl
diff --git a/rps/service.vdl.go b/examples/rps/service.vdl.go
similarity index 96%
rename from rps/service.vdl.go
rename to examples/rps/service.vdl.go
index 49d8f17..2b6cbcf 100644
--- a/rps/service.vdl.go
+++ b/examples/rps/service.vdl.go
@@ -35,7 +35,7 @@
}
func (GameID) __VDLReflect(struct {
- Name string "v.io/apps/rps.GameID"
+ Name string "v.io/x/ref/examples/rps.GameID"
}) {
}
@@ -46,14 +46,14 @@
}
func (GameOptions) __VDLReflect(struct {
- Name string "v.io/apps/rps.GameOptions"
+ Name string "v.io/x/ref/examples/rps.GameOptions"
}) {
}
type GameTypeTag byte
func (GameTypeTag) __VDLReflect(struct {
- Name string "v.io/apps/rps.GameTypeTag"
+ Name string "v.io/x/ref/examples/rps.GameTypeTag"
}) {
}
@@ -75,7 +75,7 @@
PlayerActionQuit struct{ Value unused } // Indicates that the player is quitting the game.
// __PlayerActionReflect describes the PlayerAction union type.
__PlayerActionReflect struct {
- Name string "v.io/apps/rps.PlayerAction"
+ Name string "v.io/x/ref/examples/rps.PlayerAction"
Type PlayerAction
Union struct {
Move PlayerActionMove
@@ -98,7 +98,7 @@
}
func (unused) __VDLReflect(struct {
- Name string "v.io/apps/rps.unused"
+ Name string "v.io/x/ref/examples/rps.unused"
}) {
}
@@ -126,7 +126,7 @@
JudgeActionScore struct{ Value ScoreCard } // The result of the game.
// __JudgeActionReflect describes the JudgeAction union type.
__JudgeActionReflect struct {
- Name string "v.io/apps/rps.JudgeAction"
+ Name string "v.io/x/ref/examples/rps.JudgeAction"
Type JudgeAction
Union struct {
PlayerNum JudgeActionPlayerNum
@@ -166,7 +166,7 @@
type PlayersMoves [2]string
func (PlayersMoves) __VDLReflect(struct {
- Name string "v.io/apps/rps.PlayersMoves"
+ Name string "v.io/x/ref/examples/rps.PlayersMoves"
}) {
}
@@ -180,7 +180,7 @@
}
func (Round) __VDLReflect(struct {
- Name string "v.io/apps/rps.Round"
+ Name string "v.io/x/ref/examples/rps.Round"
}) {
}
@@ -189,7 +189,7 @@
type WinnerTag byte
func (WinnerTag) __VDLReflect(struct {
- Name string "v.io/apps/rps.WinnerTag"
+ Name string "v.io/x/ref/examples/rps.WinnerTag"
}) {
}
@@ -199,7 +199,7 @@
}
func (PlayResult) __VDLReflect(struct {
- Name string "v.io/apps/rps.PlayResult"
+ Name string "v.io/x/ref/examples/rps.PlayResult"
}) {
}
@@ -214,7 +214,7 @@
}
func (ScoreCard) __VDLReflect(struct {
- Name string "v.io/apps/rps.ScoreCard"
+ Name string "v.io/x/ref/examples/rps.ScoreCard"
}) {
}
@@ -474,7 +474,7 @@
// descJudge hides the desc to keep godoc clean.
var descJudge = ipc.InterfaceDesc{
Name: "Judge",
- PkgPath: "v.io/apps/rps",
+ PkgPath: "v.io/x/ref/examples/rps",
Methods: []ipc.MethodDesc{
{
Name: "CreateGame",
@@ -696,7 +696,7 @@
// descPlayer hides the desc to keep godoc clean.
var descPlayer = ipc.InterfaceDesc{
Name: "Player",
- PkgPath: "v.io/apps/rps",
+ PkgPath: "v.io/x/ref/examples/rps",
Doc: "// Player can receive challenges from other players.",
Methods: []ipc.MethodDesc{
{
@@ -819,7 +819,7 @@
// descScoreKeeper hides the desc to keep godoc clean.
var descScoreKeeper = ipc.InterfaceDesc{
Name: "ScoreKeeper",
- PkgPath: "v.io/apps/rps",
+ PkgPath: "v.io/x/ref/examples/rps",
Doc: "// ScoreKeeper receives the outcome of games from Judges.",
Methods: []ipc.MethodDesc{
{
@@ -946,10 +946,10 @@
// descRockPaperScissors hides the desc to keep godoc clean.
var descRockPaperScissors = ipc.InterfaceDesc{
Name: "RockPaperScissors",
- PkgPath: "v.io/apps/rps",
+ PkgPath: "v.io/x/ref/examples/rps",
Embeds: []ipc.EmbedDesc{
- {"Judge", "v.io/apps/rps", ``},
- {"Player", "v.io/apps/rps", "// Player can receive challenges from other players."},
- {"ScoreKeeper", "v.io/apps/rps", "// ScoreKeeper receives the outcome of games from Judges."},
+ {"Judge", "v.io/x/ref/examples/rps", ``},
+ {"Player", "v.io/x/ref/examples/rps", "// Player can receive challenges from other players."},
+ {"ScoreKeeper", "v.io/x/ref/examples/rps", "// ScoreKeeper receives the outcome of games from Judges."},
},
}
diff --git a/tunnel/tunnel.vdl b/examples/tunnel/tunnel.vdl
similarity index 100%
rename from tunnel/tunnel.vdl
rename to examples/tunnel/tunnel.vdl
diff --git a/tunnel/tunnel.vdl.go b/examples/tunnel/tunnel.vdl.go
similarity index 98%
rename from tunnel/tunnel.vdl.go
rename to examples/tunnel/tunnel.vdl.go
index e1cbb01..cd212f8 100644
--- a/tunnel/tunnel.vdl.go
+++ b/examples/tunnel/tunnel.vdl.go
@@ -24,7 +24,7 @@
}
func (ShellOpts) __VDLReflect(struct {
- Name string "v.io/apps/tunnel.ShellOpts"
+ Name string "v.io/x/ref/examples/tunnel.ShellOpts"
}) {
}
@@ -34,7 +34,7 @@
}
func (WindowSize) __VDLReflect(struct {
- Name string "v.io/apps/tunnel.WindowSize"
+ Name string "v.io/x/ref/examples/tunnel.WindowSize"
}) {
}
@@ -65,7 +65,7 @@
ClientShellPacketWinSize struct{ Value WindowSize }
// __ClientShellPacketReflect describes the ClientShellPacket union type.
__ClientShellPacketReflect struct {
- Name string "v.io/apps/tunnel.ClientShellPacket"
+ Name string "v.io/x/ref/examples/tunnel.ClientShellPacket"
Type ClientShellPacket
Union struct {
Stdin ClientShellPacketStdin
@@ -94,7 +94,7 @@
}
func (unused) __VDLReflect(struct {
- Name string "v.io/apps/tunnel.unused"
+ Name string "v.io/x/ref/examples/tunnel.unused"
}) {
}
@@ -120,7 +120,7 @@
ServerShellPacketStderr struct{ Value []byte }
// __ServerShellPacketReflect describes the ServerShellPacket union type.
__ServerShellPacketReflect struct {
- Name string "v.io/apps/tunnel.ServerShellPacket"
+ Name string "v.io/x/ref/examples/tunnel.ServerShellPacket"
Type ServerShellPacket
Union struct {
Stdout ServerShellPacketStdout
@@ -499,7 +499,7 @@
// descTunnel hides the desc to keep godoc clean.
var descTunnel = ipc.InterfaceDesc{
Name: "Tunnel",
- PkgPath: "v.io/apps/tunnel",
+ PkgPath: "v.io/x/ref/examples/tunnel",
Methods: []ipc.MethodDesc{
{
Name: "Forward",
diff --git a/tunnel/tunneld/impl.go b/examples/tunnel/tunneld/impl.go
similarity index 98%
rename from tunnel/tunneld/impl.go
rename to examples/tunnel/tunneld/impl.go
index 96dda4e..685f385 100644
--- a/tunnel/tunneld/impl.go
+++ b/examples/tunnel/tunneld/impl.go
@@ -12,8 +12,8 @@
"os/exec"
"syscall"
- "v.io/apps/tunnel"
- "v.io/apps/tunnel/tunnelutil"
+ "v.io/x/ref/examples/tunnel"
+ "v.io/x/ref/examples/tunnel/tunnelutil"
"v.io/x/lib/vlog"
)
diff --git a/tunnel/tunneld/iomanager.go b/examples/tunnel/tunneld/iomanager.go
similarity index 99%
rename from tunnel/tunneld/iomanager.go
rename to examples/tunnel/tunneld/iomanager.go
index 9f12ce2..3133dc5 100644
--- a/tunnel/tunneld/iomanager.go
+++ b/examples/tunnel/tunneld/iomanager.go
@@ -5,7 +5,7 @@
"io"
"sync"
- "v.io/apps/tunnel"
+ "v.io/x/ref/examples/tunnel"
"v.io/x/lib/vlog"
)
diff --git a/tunnel/tunneld/main.go b/examples/tunnel/tunneld/main.go
similarity index 98%
rename from tunnel/tunneld/main.go
rename to examples/tunnel/tunneld/main.go
index 4e5b199..bbf00a9 100644
--- a/tunnel/tunneld/main.go
+++ b/examples/tunnel/tunneld/main.go
@@ -15,7 +15,7 @@
_ "v.io/core/veyron/profiles/roaming"
sflag "v.io/core/veyron/security/flag"
- "v.io/apps/tunnel"
+ "v.io/x/ref/examples/tunnel"
)
// firstHardwareAddrInUse returns the hwaddr of the first network interface
diff --git a/tunnel/tunneld/tunneld_v23_test.go b/examples/tunnel/tunneld/tunneld_v23_test.go
similarity index 95%
rename from tunnel/tunneld/tunneld_v23_test.go
rename to examples/tunnel/tunneld/tunneld_v23_test.go
index 2b8638a..b5a9dd0 100644
--- a/tunnel/tunneld/tunneld_v23_test.go
+++ b/examples/tunnel/tunneld/tunneld_v23_test.go
@@ -18,8 +18,8 @@
func V23TestTunneld(t *v23tests.T) {
v23tests.RunRootMT(t, "--veyron.tcp.address=127.0.0.1:0")
- tunneldBin := t.BuildGoPkg("v.io/apps/tunnel/tunneld")
- vsh := t.BuildGoPkg("v.io/apps/tunnel/vsh")
+ tunneldBin := t.BuildGoPkg("v.io/x/ref/examples/tunnel/tunneld")
+ vsh := t.BuildGoPkg("v.io/x/ref/examples/tunnel/vsh")
mounttableBin := t.BuildGoPkg("v.io/core/veyron/tools/mounttable")
port, err := testutil.FindUnusedPort()
diff --git a/tunnel/tunneld/v23_test.go b/examples/tunnel/tunneld/v23_test.go
similarity index 100%
rename from tunnel/tunneld/v23_test.go
rename to examples/tunnel/tunneld/v23_test.go
diff --git a/tunnel/tunnelutil/forward.go b/examples/tunnel/tunnelutil/forward.go
similarity index 100%
rename from tunnel/tunnelutil/forward.go
rename to examples/tunnel/tunnelutil/forward.go
diff --git a/tunnel/tunnelutil/terminal.go b/examples/tunnel/tunnelutil/terminal.go
similarity index 100%
rename from tunnel/tunnelutil/terminal.go
rename to examples/tunnel/tunnelutil/terminal.go
diff --git a/tunnel/vsh/iomanager.go b/examples/tunnel/vsh/iomanager.go
similarity index 98%
rename from tunnel/vsh/iomanager.go
rename to examples/tunnel/vsh/iomanager.go
index 9effbd9..0ce8681 100644
--- a/tunnel/vsh/iomanager.go
+++ b/examples/tunnel/vsh/iomanager.go
@@ -8,8 +8,8 @@
"sync"
"syscall"
- "v.io/apps/tunnel"
- "v.io/apps/tunnel/tunnelutil"
+ "v.io/x/ref/examples/tunnel"
+ "v.io/x/ref/examples/tunnel/tunnelutil"
"v.io/x/lib/vlog"
)
diff --git a/tunnel/vsh/main.go b/examples/tunnel/vsh/main.go
similarity index 98%
rename from tunnel/vsh/main.go
rename to examples/tunnel/vsh/main.go
index a66ea11..8207851 100644
--- a/tunnel/vsh/main.go
+++ b/examples/tunnel/vsh/main.go
@@ -17,8 +17,8 @@
_ "v.io/core/veyron/profiles"
- "v.io/apps/tunnel"
- "v.io/apps/tunnel/tunnelutil"
+ "v.io/x/ref/examples/tunnel"
+ "v.io/x/ref/examples/tunnel/tunnelutil"
"v.io/core/veyron/lib/signals"
)
