Issue #58: fix up options handling ....

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

Hide file tree

Showing 13 changed files with 23 additions and 11 deletions.
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/options.st b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/options.st
@@ -0,0 +1,4 @@
+accessing
+options
+  options ifNil: [ options := Dictionary new ].
+  ^ options
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;
-    gemServerOptions: options;
+    gemServerOptions: self 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
@@ -33,14 +33,15 @@
 		"optionAt:ifAbsent:" : "dkh 12/14/2014 07:34",
 		"optionAt:ifAbsentPut:" : "dkh 12/14/2014 07:34",
 		"optionAt:put:" : "dkh 12/14/2014 07:33",
+		"options" : "dkh 12/14/2014 09:43",
 		"reader" : "dkh 12/14/2014 07:36",
 		"reader:" : "dkh 12/14/2014 07:36",
 		"route" : "dkh 12/14/2014 07:36",
 		"route:" : "dkh 12/14/2014 07:36",
 		"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 09:10",
+		"startBasicServerOn:" : "dkh 12/14/2014 09:40",
 		"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/gemServerOptions..st b/repository/Zinc-HTTP.package/ZnServer.class/instance/gemServerOptions..st
@@ -3,4 +3,4 @@ gemServerOptions: aGemServerOptionsDictionary
   "apply options from aGemServerOptionsDictionary"
 
   aGemServerOptionsDictionary
-    keysAndValuesDo: [ :key :value | options at: key put: value ]
+    keysAndValuesDo: [ :key :value | self optionsAt: key put: value ]
diff --git a/repository/Zinc-HTTP.package/ZnServer.class/methodProperties.json b/repository/Zinc-HTTP.package/ZnServer.class/methodProperties.json
@@ -24,7 +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",
+		"gemServerOptions:" : "dkh 12/14/2014 09:34",
 		"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
diff --git a/repository/Zinc-Tests.package/ZnGsServerTests.class/instance/tearDown.st b/repository/Zinc-Tests.package/ZnGsServerTests.class/instance/tearDown.st
@@ -0,0 +1,4 @@
+Running
+tearDown
+  super tearDown.
+  GemServerRegistry removeGemServerNamed: self gemServerName
diff --git a/repository/Zinc-Tests.package/ZnGsServerTests.class/methodProperties.json b/repository/Zinc-Tests.package/ZnGsServerTests.class/methodProperties.json
@@ -2,6 +2,7 @@
 	"class" : {
 		"shouldInheritSelectors" : "dkh 12/14/2014 07:21" },
 	"instance" : {
+		"tearDown" : "dkh 12/14/2014 09:37",
 		"testDefault" : "dkh 12/14/2014 07:11",
 		"testSessionExpired" : "dkh 12/14/2014 08:03",
 		"testUrl" : "dkh 12/14/2014 08:10",

diff --git a/repository/Zinc-Tests.package/ZnServerBasedTests.class/instance/gemServerName.st b/repository/Zinc-Tests.package/ZnServerBasedTests.class/instance/gemServerName.st
@@ -0,0 +1,3 @@
+private
+gemServerName
+  ^ 'ZnServerBasedTestServer'
diff --git a/repository/Zinc-Tests.package/ZnServerBasedTests.class/instance/withGemServerDo..st b/repository/Zinc-Tests.package/ZnServerBasedTests.class/instance/withGemServerDo..st
@@ -1,9 +1,7 @@
 private
 withGemServerDo: block
   | gemServer |
-  gemServer := (ZnGemServer
-    register: 'ZnServerBasedTestServer'
-    on: {(self port)})
+  gemServer := (ZnGemServer register: self gemServerName on: {(self port)})
     logToObjectLog;
     logEverything;
     yourself.

diff --git a/repository/Zinc-Tests.package/ZnServerBasedTests.class/methodProperties.json b/repository/Zinc-Tests.package/ZnServerBasedTests.class/methodProperties.json
@@ -2,9 +2,10 @@
 	"class" : {
 		 },
 	"instance" : {
+		"gemServerName" : "dkh 12/14/2014 09:35",
 		"logRunCase" : "dkh 06/29/2014 23:11",
 		"port" : "dkh 06/29/2014 11:01",
 		"runCase" : "dkh 06/29/2014 11:05",
 		"runCaseAsFailure:" : "dkh 06/29/2014 11:05",
-		"withGemServerDo:" : "dkh 12/13/2014 19:30",
+		"withGemServerDo:" : "dkh 12/14/2014 09:35",
 		"withServerDo:" : "dkh 06/29/2014 23:11" } }
diff --git a/repository/Zinc-Tests.package/monticello.meta/version b/repository/Zinc-Tests.package/monticello.meta/version