Issue GsDevKit#58: mods to be minimally compatible with GsApplication…

…Tools v1.0.0
glassdb · Jan 6, 2015 · 62385cf · 62385cf
1 parent 8e8f831
commit 62385cf
Show file tree

Hide file tree

Showing 21 changed files with 29 additions and 49 deletions.
diff --git a/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st b/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/instance/baseline..st
@@ -133,7 +133,7 @@ baseline: spec
               spec
                 loads: #('Core');
                 repository:
-                    'github://GsDevKit/gsApplicationTools:master/repository' ];
+                    'github://GsDevKit/gsApplicationTools:v1.?/repository' ];
         baseline: 'NeoJSON'
           with: [ spec repository: 'github://GsDevKit/NeoJSON:gs_master/repository' ];
         yourself.

diff --git a/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/methodProperties.json b/...lineOfZincHTTPComponents.package/BaselineOfZincHTTPComponents.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 12/02/2014 16:26" } }
+		"baseline:" : "dkh 01/06/2015 11:54" } }
diff --git a/repository/BaselineOfZincHTTPComponents.package/monticello.meta/version b/repository/BaselineOfZincHTTPComponents.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfZincHTTPComponents-dkh.15' message 'Issue #58: ZnSingleThreadedServer>>handleRequestProtected: don''t pass the exception ... debugMode doesn''t quite appy to GemStone ... need different granularity I think ... GsPharo 0.9.2 needs to be used' id '6f7305be-3dbd-40f9-a81f-3f920132534e' date '12/02/2014' time '16:29:14' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.14' message 'Issue #58: add dependency upon GsApplicationTools for Zinc-GemStone-Server-Tools, a new package which holds ZnServerStarter class needed by web socket tests ...' id 'e09422d2-1065-4ceb-8845-084f10a4c4f7' date '11/26/2014' time '13:39:44' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.13' message 'NeoJSON is on gs_master branch now' id 'f6fdee09-f8c6-4738-907c-215a6eae7bcf' date '11/22/2014' time '12:39:05' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.12' message 'Issue #58: load NeoJSON tests now ... they should be passing?' id '71ee4921-b3f1-4550-bec2-277fe6363086' date '11/20/2014' time '17:43:32' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.11' message 'Issue #58: switch Cryptography project to use GsDevKit/Cryptography project and add backin into CI group, since the project should now load without errors' id '7602ba2b-54cc-45de-a7ad-567191c9b1c5' date '11/18/2014' time '12:09:24' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.10' message 'Issue #58: pull WebSockt from CI group ... interested in seeing how things are for NeoJSON and and zinc core' id '3b28664e-1ba7-4d76-aff5-e5c89eb2236b' date '11/17/2014' time '18:16:16' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.9' message 'Issue #60: reference GsDevKit/NeoJSON directory and only load Core, since NeoJSON tests are known not to pass: https://github.com/GsDevKit/NeoJSON/issues/3' id '73c88fdd-cbe7-4a5c-8485-923f314c6c44' date '11/17/2014' time '18:14:59' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.8' message 'Issue #58: re-enable websocket as part of CI ... this will take longer to get straightened out as both NeoJSON and WebSockets have issues' id '342aa976-a532-4d8b-a428-6e7cb9111a41' date '11/17/2014' time '18:03:43' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.7' message 'Issue #58: disable web-socket test load for ''CI'' until Cryptography load issue resolvedIssue #60: fix NeoJSON specification and add ''REST'' to ''CI'' group ... defer reference to GsDevKit/NeoJSON project until travis tests have been enabled ...' id 'fec29f56-7062-41a6-85d2-9d7a439559e4' date '11/17/2014' time '16:33:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.6' message 'Issue #58: cryptography configuration needed updating, so added stable version while I was at it ...' id '00296be5-2d30-418d-a474-2f373393e313' date '11/01/2014' time '13:00:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.5' message 'Issue #58: no stable version defined in the current Cryptography configuration...' id '67a67e96-6cf9-4c32-a87a-9e3d8bc3d647' date '11/01/2014' time '12:46:46' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.4' message 'Issue #58: create CI group to specifiy packages to be loaded by travis-ci for testing ... for GemStone that includes Zinc-WebSocket-Tests ... expect failures since Cryptography project is not up to snuff...yet' id '15af9af6-9829-412c-be6b-70cdc7fda24a' date '11/01/2014' time '12:28:52' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.3' message 'Issue #55: bump mcz version of the gs_master branch BaselineOfZincHTTPComponents, to avoid duplice mcz versions' id 'e175a78c-9a07-4da1-97a2-96eb0d40ba96' date '10/27/2014' time '15:10:49' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.2' message 'restore Zodiac packages and groups to configuration ... not ported to GemStone yet, see Issue #55 for details' id '6311a4fb-03de-42dc-81c7-b96971d30368' date '10/15/2014' time '11:55:57' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-JohanBrichau.1' message 'renamed BaselineOfZinc to BaselineOfZincHTTPComponents' id 'e022a66b-5bb4-47eb-b582-74a3ebaa1f9e' date '07/09/2014' time '21:16:19' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'BaselineOfZincHTTPComponents-dkh.16' message 'Issue #58: mods to be minimally compatible with GsApplicationTools v1.0.0' id '34566c61-ca88-4eaf-b4ad-2149de6755fe' date '01/06/2015' time '11:59:55' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.15' message 'Issue #58: ZnSingleThreadedServer>>handleRequestProtected: don''t pass the exception ... debugMode doesn''t quite appy to GemStone ... need different granularity I think ... GsPharo 0.9.2 needs to be used' id '6f7305be-3dbd-40f9-a81f-3f920132534e' date '12/02/2014' time '16:29:14' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.14' message 'Issue #58: add dependency upon GsApplicationTools for Zinc-GemStone-Server-Tools, a new package which holds ZnServerStarter class needed by web socket tests ...' id 'e09422d2-1065-4ceb-8845-084f10a4c4f7' date '11/26/2014' time '13:39:44' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.13' message 'NeoJSON is on gs_master branch now' id 'f6fdee09-f8c6-4738-907c-215a6eae7bcf' date '11/22/2014' time '12:39:05' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.12' message 'Issue #58: load NeoJSON tests now ... they should be passing?' id '71ee4921-b3f1-4550-bec2-277fe6363086' date '11/20/2014' time '17:43:32' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.11' message 'Issue #58: switch Cryptography project to use GsDevKit/Cryptography project and add backin into CI group, since the project should now load without errors' id '7602ba2b-54cc-45de-a7ad-567191c9b1c5' date '11/18/2014' time '12:09:24' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.10' message 'Issue #58: pull WebSockt from CI group ... interested in seeing how things are for NeoJSON and and zinc core' id '3b28664e-1ba7-4d76-aff5-e5c89eb2236b' date '11/17/2014' time '18:16:16' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.9' message 'Issue #60: reference GsDevKit/NeoJSON directory and only load Core, since NeoJSON tests are known not to pass: https://github.com/GsDevKit/NeoJSON/issues/3' id '73c88fdd-cbe7-4a5c-8485-923f314c6c44' date '11/17/2014' time '18:14:59' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.8' message 'Issue #58: re-enable websocket as part of CI ... this will take longer to get straightened out as both NeoJSON and WebSockets have issues' id '342aa976-a532-4d8b-a428-6e7cb9111a41' date '11/17/2014' time '18:03:43' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.7' message 'Issue #58: disable web-socket test load for ''CI'' until Cryptography load issue resolvedIssue #60: fix NeoJSON specification and add ''REST'' to ''CI'' group ... defer reference to GsDevKit/NeoJSON project until travis tests have been enabled ...' id 'fec29f56-7062-41a6-85d2-9d7a439559e4' date '11/17/2014' time '16:33:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.6' message 'Issue #58: cryptography configuration needed updating, so added stable version while I was at it ...' id '00296be5-2d30-418d-a474-2f373393e313' date '11/01/2014' time '13:00:26' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.5' message 'Issue #58: no stable version defined in the current Cryptography configuration...' id '67a67e96-6cf9-4c32-a87a-9e3d8bc3d647' date '11/01/2014' time '12:46:46' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.4' message 'Issue #58: create CI group to specifiy packages to be loaded by travis-ci for testing ... for GemStone that includes Zinc-WebSocket-Tests ... expect failures since Cryptography project is not up to snuff...yet' id '15af9af6-9829-412c-be6b-70cdc7fda24a' date '11/01/2014' time '12:28:52' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.3' message 'Issue #55: bump mcz version of the gs_master branch BaselineOfZincHTTPComponents, to avoid duplice mcz versions' id 'e175a78c-9a07-4da1-97a2-96eb0d40ba96' date '10/27/2014' time '15:10:49' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-dkh.2' message 'restore Zodiac packages and groups to configuration ... not ported to GemStone yet, see Issue #55 for details' id '6311a4fb-03de-42dc-81c7-b96971d30368' date '10/15/2014' time '11:55:57' author 'dkh' ancestors ((name 'BaselineOfZincHTTPComponents-JohanBrichau.1' message 'renamed BaselineOfZinc to BaselineOfZincHTTPComponents' id 'e022a66b-5bb4-47eb-b582-74a3ebaa1f9e' date '07/09/2014' time '21:16:19' author 'JohanBrichau' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

diff --git a/...ory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/enableContinuations..st b/...ory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/enableContinuations..st
diff --git a/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/enableContinuations.st b/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/enableContinuations.st
diff --git a/...y/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/gemServerExceptionSet..st b/...y/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/gemServerExceptionSet..st
diff --git a/...ry/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/gemServerExceptionSet.st b/...ry/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/gemServerExceptionSet.st
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/initialize.st b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/initialize.st
@@ -1,5 +1,4 @@
 initialization
 initialize
   super initialize.
-  self logErrorsOnly.
-  self gemServerExceptionSet: self class gemServerExceptionSet
+  self logErrorsOnly
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/log.st b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/instance/log.st
@@ -3,7 +3,7 @@ log
   log
     ifNil: [ 
       log := ZnGemServerLogSupport new
-        enableContinuations: self enableContinuations;
+        enableCreateContinuations: self enableCreateContinuations;
         addListener: self logListener;
         gemServerExceptionSet: self gemServerExceptionSet;
         yourself ].

diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/methodProperties.json b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/methodProperties.json
@@ -10,13 +10,9 @@
 		"debugMode:" : "dkh 12/14/2014 07:35",
 		"delegate" : "dkh 12/14/2014 07:35",
 		"delegate:" : "dkh 12/14/2014 07:36",
-		"enableContinuations" : "dkh 12/03/2014 12:21",
-		"enableContinuations:" : "dkh 12/04/2014 09:56",
-		"gemServerExceptionSet" : "dkh 12/20/2014 10:40",
-		"gemServerExceptionSet:" : "dkh 12/20/2014 10:40",
-		"initialize" : "dkh 12/20/2014 10:40",
+		"initialize" : "dkh 12/28/2014 08:22",
 		"localUrl" : "dkh 12/13/2014 19:26",
-		"log" : "dkh 12/20/2014 10:42",
+		"log" : "dkh 01/02/2015 17:29",
 		"log:" : "dkh 11/30/2014 11:08",
 		"logDebug:" : "dkh 12/07/2014 10:09",
 		"logErrorsOnly" : "dkh 12/04/2014 06:36",

diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/properties.json b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServer.class/properties.json
@@ -6,11 +6,9 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"enableContinuations",
 		"log",
 		"logListener",
 		"logFilter",
-		"gemServerExceptionSet",
 		"options" ],
 	"name" : "ZnGemServer",
 	"pools" : [

diff --git a/...GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/createContinuation..st b/...GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/createContinuation..st
@@ -1,6 +1,6 @@
 private
 createContinuation: errorDescription
-  (self enabled and: [ self enableContinuations ])
+  (self enabled and: [ self enableCreateContinuations ])
     ifTrue: [ 
       GRPlatform current
         doTransaction: [ DebuggerLogEntry createContinuationLabeled: errorDescription ] ]
diff --git a/...emStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableContinuations..st b/...emStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableContinuations..st
diff --git a/...GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableContinuations.st b/...GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableContinuations.st
diff --git a/...e-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableCreateContinuations..st b/...e-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableCreateContinuations..st
@@ -0,0 +1,4 @@
+accessing
+enableCreateContinuations: anObject
+
+   enableCreateContinuations := anObject
diff --git a/...ne-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableCreateContinuations.st b/...ne-Server-Tools.package/ZnGemServerLogSupport.class/instance/enableCreateContinuations.st
@@ -0,0 +1,4 @@
+accessing
+enableCreateContinuations
+
+   ^enableCreateContinuations
diff --git a/...mStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/gemServerExceptionSet.st b/...mStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/gemServerExceptionSet.st
@@ -1,4 +1,3 @@
 accessing
 gemServerExceptionSet
-  gemServerExceptionSet ifNil: [ gemServerExceptionSet := ExceptionSet new ].
   ^ gemServerExceptionSet
diff --git a/...ory/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/initialize.st b/...ory/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/instance/initialize.st
@@ -0,0 +1,5 @@
+initialization
+initialize
+  super initialize.
+  enableCreateContinuations := true.
+  gemServerExceptionSet := ExceptionSet new
diff --git a/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/methodProperties.json b/...tory/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/methodProperties.json
@@ -2,11 +2,12 @@
 	"class" : {
 		 },
 	"instance" : {
-		"createContinuation:" : "dkh 12/03/2014 14:34",
-		"enableContinuations" : "dkh 12/03/2014 12:14",
-		"enableContinuations:" : "dkh 12/03/2014 12:13",
+		"createContinuation:" : "dkh 01/02/2015 17:29",
+		"enableCreateContinuations" : "dkh 01/02/2015 17:28",
+		"enableCreateContinuations:" : "dkh 01/02/2015 17:28",
 		"error:" : "dkh 11/30/2014 19:35",
 		"error:message:" : "dkh 11/30/2014 19:35",
-		"gemServerExceptionSet" : "dkh 12/20/2014 10:41",
+		"gemServerExceptionSet" : "dkh 12/23/2014 10:29",
 		"gemServerExceptionSet:" : "dkh 12/20/2014 10:41",
-		"handleBreakpointException:resumeIfResumable:" : "dkh 12/11/2014 06:54" } }
+		"handleBreakpointException:resumeIfResumable:" : "dkh 12/11/2014 06:54",
+		"initialize" : "dkh 01/02/2015 17:30" } }
diff --git a/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/properties.json b/repository/Zinc-GemStone-Server-Tools.package/ZnGemServerLogSupport.class/properties.json
@@ -6,7 +6,7 @@
 		 ],
 	"commentStamp" : "",
 	"instvars" : [
-		"enableContinuations",
+		"enableCreateContinuations",
 		"gemServerExceptionSet" ],
 	"name" : "ZnGemServerLogSupport",
 	"pools" : [