From 5a4ebe6a73da0f04feded9b7935f5e89b5c6ea87 Mon Sep 17 00:00:00 2001
From: Cloud Wu <cloudwu@gmail.com>
Date: Thu, 1 Jun 2017 12:18:42 +0800
Subject: [PATCH] move snax to skynet

---
 examples/cluster1.lua        | 2 +-
 examples/share.lua           | 2 +-
 lualib/compat10/snax.lua     | 1 +
 lualib/skynet/cluster.lua    | 2 +-
 lualib/{ => skynet}/snax.lua | 0
 service/console.lua          | 2 +-
 service/debug_console.lua    | 2 +-
 service/service_mgr.lua      | 2 +-
 service/snaxd.lua            | 2 +-
 test/pingserver.lua          | 2 +-
 test/testping.lua            | 2 +-
 test/testqueue.lua           | 2 +-
 12 files changed, 11 insertions(+), 10 deletions(-)
 create mode 100644 lualib/compat10/snax.lua
 rename lualib/{ => skynet}/snax.lua (100%)

diff --git a/examples/cluster1.lua b/examples/cluster1.lua
index 16e01b93..79665826 100644
--- a/examples/cluster1.lua
+++ b/examples/cluster1.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local cluster = require "skynet.cluster"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	cluster.reload {
diff --git a/examples/share.lua b/examples/share.lua
index 8bc4b497..b91e3fc7 100644
--- a/examples/share.lua
+++ b/examples/share.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local sharedata = require "sharedata"
+local sharedata = require "skynet.sharedata"
 
 local mode = ...
 
diff --git a/lualib/compat10/snax.lua b/lualib/compat10/snax.lua
new file mode 100644
index 00000000..bdeda17d
--- /dev/null
+++ b/lualib/compat10/snax.lua
@@ -0,0 +1 @@
+return require "skynet.snax"
\ No newline at end of file
diff --git a/lualib/skynet/cluster.lua b/lualib/skynet/cluster.lua
index 14dee2ac..dd3b9dde 100644
--- a/lualib/skynet/cluster.lua
+++ b/lualib/skynet/cluster.lua
@@ -30,7 +30,7 @@ function cluster.proxy(node, name)
 end
 
 function cluster.snax(node, name, address)
-	local snax = require "snax"
+	local snax = require "skynet.snax"
 	if not address then
 		address = cluster.call(node, ".service", "QUERY", "snaxd" , name)
 	end
diff --git a/lualib/snax.lua b/lualib/skynet/snax.lua
similarity index 100%
rename from lualib/snax.lua
rename to lualib/skynet/snax.lua
diff --git a/service/console.lua b/service/console.lua
index f7d1c6bf..1a7bc343 100644
--- a/service/console.lua
+++ b/service/console.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax   = require "snax"
+local snax   = require "skynet.snax"
 local socket = require "skynet.socket"
 
 local function split_cmdline(cmdline)
diff --git a/service/debug_console.lua b/service/debug_console.lua
index 986efae5..830a81c0 100644
--- a/service/debug_console.lua
+++ b/service/debug_console.lua
@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local codecache = require "skynet.codecache"
 local core = require "skynet.core"
 local socket = require "skynet.socket"
-local snax = require "snax"
+local snax = require "skynet.snax"
 local memory = require "skynet.memory"
 local httpd = require "http.httpd"
 local sockethelper = require "http.sockethelper"
diff --git a/service/service_mgr.lua b/service/service_mgr.lua
index fc63ce25..dcd901fd 100644
--- a/service/service_mgr.lua
+++ b/service/service_mgr.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 require "skynet.manager"	-- import skynet.register
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local cmd = {}
 local service = {}
diff --git a/service/snaxd.lua b/service/snaxd.lua
index 4c9e98f9..6b264930 100644
--- a/service/snaxd.lua
+++ b/service/snaxd.lua
@@ -2,7 +2,7 @@ local skynet = require "skynet"
 local c = require "skynet.core"
 local snax_interface = require "snax.interface"
 local profile = require "skynet.profile"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local snax_name = tostring(...)
 local loaderpath = skynet.getenv"snax_loader"
diff --git a/test/pingserver.lua b/test/pingserver.lua
index 5785b61b..e5213716 100644
--- a/test/pingserver.lua
+++ b/test/pingserver.lua
@@ -1,6 +1,6 @@
 local skynet = require "skynet"
 local queue = require "skynet.queue"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 local i = 0
 local hello = "hello"
diff --git a/test/testping.lua b/test/testping.lua
index c40392cf..084729df 100644
--- a/test/testping.lua
+++ b/test/testping.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	local ps = snax.newservice ("pingserver", "hello world")
diff --git a/test/testqueue.lua b/test/testqueue.lua
index 2076531e..a9053f41 100644
--- a/test/testqueue.lua
+++ b/test/testqueue.lua
@@ -1,5 +1,5 @@
 local skynet = require "skynet"
-local snax = require "snax"
+local snax = require "skynet.snax"
 
 skynet.start(function()
 	local ps = snax.uniqueservice ("pingserver", "test queue")