Issue #58: tweak options trasnfer between gemServer and ZnServer

GsDevKit · Dec 14, 2014 · 6d4dd84 · 6d4dd84
1 parent 6aac715
commit 6d4dd84
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 10 deletions.
diff --git a/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/startBasicServerOn..st b/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/startBasicServerOn..st
@@ -6,7 +6,7 @@ startBasicServerOn: port
   server := (self serverClass on: port)
     debugMode: self debugMode;
     log: self log;
-    _options: options;
+    gemServerOptions: options;
     yourself.
   startMessage := server printString , ' (native thread: '
     , self activeProcessIsNative printString , ')'.

diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/methodProperties.json b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/methodProperties.json
@@ -40,7 +40,7 @@
 		"scheme" : "dkh 12/13/2014 19:24",
 		"serverUrl" : "dkh 12/14/2014 07:36",
 		"serverUrl:" : "dkh 12/14/2014 07:37",
-		"startBasicServerOn:" : "dkh 12/14/2014 07:40",
+		"startBasicServerOn:" : "dkh 12/14/2014 09:10",
 		"stop" : "dkh 12/13/2014 19:43",
 		"useGzipCompressionAndChunking" : "dkh 12/14/2014 07:37",
 		"useGzipCompressionAndChunking:" : "dkh 12/14/2014 07:37" } }
diff --git a/repository/Zinc-GemStone-Server-Tools.package/monticello.meta/version b/repository/Zinc-GemStone-Server-Tools.package/monticello.meta/version
diff --git a/repository/Zinc-HTTP.package/ZnServer.class/instance/_options..st b/repository/Zinc-HTTP.package/ZnServer.class/instance/_options..st
diff --git a/repository/Zinc-HTTP.package/ZnServer.class/instance/gemServerOptions..st b/repository/Zinc-HTTP.package/ZnServer.class/instance/gemServerOptions..st
@@ -0,0 +1,6 @@
+options
+gemServerOptions: aGemServerOptionsDictionary
+  "apply options from aGemServerOptionsDictionary"
+
+  aGemServerOptionsDictionary
+    keysAndValuesDo: [ :key :value | options at: key put: value ]
diff --git a/repository/Zinc-HTTP.package/ZnServer.class/methodProperties.json b/repository/Zinc-HTTP.package/ZnServer.class/methodProperties.json
@@ -16,7 +16,6 @@
 		"stopDefault" : "SvenVanCaekenberghe 12/22/2011 11:29",
 		"unregister:" : "SvenVanCaekenberghe 8/18/2011 14:10" },
 	"instance" : {
-		"_options:" : "dkh 12/14/2014 07:40",
 		"authenticator" : "SvenVanCaekenberghe 9/5/2012 11:17",
 		"authenticator:" : "SvenVanCaekenberghe 9/5/2012 11:17",
 		"bindingAddress" : "SvenVanCaekenberghe 9/5/2012 10:07",
@@ -25,6 +24,7 @@
 		"debugMode:" : "SvenVanCaekenberghe 1/31/2013 11:44",
 		"delegate" : "SvenVanCaekenberghe 9/5/2012 11:17",
 		"delegate:" : "SvenVanCaekenberghe 9/5/2012 11:17",
+		"gemServerOptions:" : "dkh 12/14/2014 09:12",
 		"isListening" : "SvenVanCaekenberghe 12/15/2010 21:22",
 		"isRunning" : "SvenVanCaekenberghe 12/15/2010 15:26",
 		"localUrl" : "JohanBrichau 06/16/2013 15:27",

diff --git a/repository/Zinc-HTTP.package/monticello.meta/version b/repository/Zinc-HTTP.package/monticello.meta/version