upgrade go to version 1.5: xml version just 1.0, websocket moved to g…

…olang.org
yangsf5 · Oct 6, 2015 · b03e407 · b03e407
1 parent 8a03e2d
commit b03e407
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 9 deletions.
diff --git a/config/config_harbor1.xml b/config/config_harbor1.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":8889" isMaster="false"></master>

diff --git a/config/config_master.xml b/config/config_master.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":8889" isMaster="true"></master>

diff --git a/example/chat/config/config_harbor1.xml b/example/chat/config/config_harbor1.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":11000" isMaster="false"></master>

diff --git a/example/chat/config/config_harbor2.xml b/example/chat/config/config_harbor2.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":11000" isMaster="false"></master>

diff --git a/example/chat/config/config_master.xml b/example/chat/config/config_master.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":11000" isMaster="true"></master>

diff --git a/example/stress/stress/config/config_harbor1.xml b/example/stress/stress/config/config_harbor1.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":10000" isMaster="false"></master>

diff --git a/example/stress/stress/config/config_harbor2.xml b/example/stress/stress/config/config_harbor2.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":10000" isMaster="false"></master>

diff --git a/example/stress/stress/config/config_master.xml b/example/stress/stress/config/config_master.xml
@@ -1,4 +1,4 @@
-<?xml version="2.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <clawconfig name="config" version="1.0">
 	<!--isMater(true,false)-->
 	<master listenAddr=":10000" isMaster="true"></master>

diff --git a/service/web/web.go b/service/web/web.go
@@ -9,7 +9,8 @@ import (
 	"runtime/debug"
 
 	"github.com/golang/glog"
-	"github.com/golang/net/websocket"
+	"golang.org/x/net/websocket"
+
 	"github.com/yangsf5/claw/center"
 )