Merge branch 'dev'

dalehenrich · dalehenrich · commit 898232bd73ae · 2015-07-16T09:23:35.000-07:00
diff --git a/.travis.yml b/.travis.yml
@@ -18,7 +18,7 @@ env:
    - ST=GemStone-3.0.1 
    - ST=GemStone-3.1.0.6
    - ST=GemStone-3.2.0
-   - ST=GemStone-3.2.6
+   - ST=GemStone-3.2.7
 
 install:
    - export PROJECT_HOME="$(pwd)"
diff --git a/repository/BaselineOfGsApplicationTools.package/BaselineOfGsApplicationTools.class/methodProperties.json b/repository/BaselineOfGsApplicationTools.package/BaselineOfGsApplicationTools.class/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 12/26/2014 11:59" } }
+		"baseline:" : "dkh 07/15/2015 17:34" } }
diff --git a/repository/BaselineOfGsApplicationTools.package/monticello.meta/version b/repository/BaselineOfGsApplicationTools.package/monticello.meta/version
@@ -1 +1 @@
-(name 'BaselineOfGsApplicationTools-dkh.8' message 'Issue #10: change baseline to require GLASS1...clean up sent but not implemented' id '87cb8c31-5c93-432a-aa56-919a9717192c' date '12/26/2014' time '12:05:27' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.7' message 'Issue #10: breakpoint, halt and another http example' id '3ac7606c-22da-4206-9d45-446a8c2b09e9' date '12/23/2014' time '16:28:41' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.6' message 'Issue #10: expand gemserver api a bit more ... add simple test for GemServerRemoteServerExample and it is passing' id 'b48a9dcd-2492-4eaa-b60c-b9e187f8e8c0' date '12/23/2014' time '14:01:05' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.5' message 'Issue #10: add GemServer>>gemServer: and GemServer>>gemServer:onError: as non-transactional veriants for handling server errors, breakpoints and halts (should satisfy Issue #12)...refactor GemServer>>gemServerTransaction:onError:  to use GemServer>>gemServer:onError: ... add GemServer>>handleGemServerException: to isolate server error and interactiveMoe logic ... GemServer>>serverError:titled:inTransactionDo: allows for performing optional work in the same transaction as the continuation ... if one is already in transaction a commit is expected to come from the caller ... started work on an example server as the GemServerTestServer has been sacrificed to being able to test various error conditions and is no longer a clean example ...' id '83fef897-46b4-46cb-ab20-c3224414c21e' date '12/23/2014' time '11:19:31' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.4' message 'Issue #2: split out GemServer>>performOnServer: into separate 2.4 and 3.x packages ... add new packages and update baseline' id '04a850bf-fa2b-4431-aaf6-c2881f208745' date '11/29/2014' time '19:14:19' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.3' message 'Issue #2: correct mistakes in baseline for package renames' id 'fd5a3af5-23ff-4999-8f85-014970aa05e1' date '11/26/2014' time '14:35:15' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.2' message 'Issue #2: rename packages to have GsApplication-Tools as base name' id 'dde6d24e-71be-4e7e-acc1-cca1b40370bb' date '11/26/2014' time '14:25:46' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.1' message 'Issue #1: define baseline' id '716d27b8-3b41-4a1e-ac1e-60496cf001e3' date '11/26/2014' time '11:18:40' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'BaselineOfGsApplicationTools-dkh.10' message 'Issue #35: the package GsApplicationTools-ServerExtensionsV30 with GsProcess>>convertToPortableStack is not needed ...' id '79dbd8f9-25ca-4ab3-8dc3-c583689b24dc' date '07/15/2015' time '17:34:53' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.9' message 'Issue #35: implement GsProcess>>convertToPortableStack for GemStone versions 3.0 thru 3.2 in package GsApplicationTools-ServerExtensionsV30' id 'd7cd8b66-fa67-4946-af11-a92e59c839ed' date '07/15/2015' time '17:06:38' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.8' message 'Issue #10: change baseline to require GLASS1...clean up sent but not implemented' id '87cb8c31-5c93-432a-aa56-919a9717192c' date '12/26/2014' time '12:05:27' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.7' message 'Issue #10: breakpoint, halt and another http example' id '3ac7606c-22da-4206-9d45-446a8c2b09e9' date '12/23/2014' time '16:28:41' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.6' message 'Issue #10: expand gemserver api a bit more ... add simple test for GemServerRemoteServerExample and it is passing' id 'b48a9dcd-2492-4eaa-b60c-b9e187f8e8c0' date '12/23/2014' time '14:01:05' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.5' message 'Issue #10: add GemServer>>gemServer: and GemServer>>gemServer:onError: as non-transactional veriants for handling server errors, breakpoints and halts (should satisfy Issue #12)...refactor GemServer>>gemServerTransaction:onError:  to use GemServer>>gemServer:onError: ... add GemServer>>handleGemServerException: to isolate server error and interactiveMoe logic ... GemServer>>serverError:titled:inTransactionDo: allows for performing optional work in the same transaction as the continuation ... if one is already in transaction a commit is expected to come from the caller ... started work on an example server as the GemServerTestServer has been sacrificed to being able to test various error conditions and is no longer a clean example ...' id '83fef897-46b4-46cb-ab20-c3224414c21e' date '12/23/2014' time '11:19:31' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.4' message 'Issue #2: split out GemServer>>performOnServer: into separate 2.4 and 3.x packages ... add new packages and update baseline' id '04a850bf-fa2b-4431-aaf6-c2881f208745' date '11/29/2014' time '19:14:19' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.3' message 'Issue #2: correct mistakes in baseline for package renames' id 'fd5a3af5-23ff-4999-8f85-014970aa05e1' date '11/26/2014' time '14:35:15' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.2' message 'Issue #2: rename packages to have GsApplication-Tools as base name' id 'dde6d24e-71be-4e7e-acc1-cca1b40370bb' date '11/26/2014' time '14:25:46' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.1' message 'Issue #1: define baseline' id '716d27b8-3b41-4a1e-ac1e-60496cf001e3' date '11/26/2014' time '11:18:40' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
diff --git a/repository/GsApplicationTools-ServerV30.package/GemServerLauncher.extension/instance/convertToPortable.st b/repository/GsApplicationTools-ServerV30.package/GemServerLauncher.extension/instance/convertToPortable.st
@@ -7,7 +7,7 @@ convertToPortable
   activeProcess := ProcessorScheduler scheduler activeProcess.
   [ 
   activeProcess localStackDepth.
-  activeProcess _convertToPortableStack.
+  activeProcess convertToPortableStack.
   sema signal ]
     fork.
   sema wait
diff --git a/repository/GsApplicationTools-ServerV30.package/GemServerLauncher.extension/methodProperties.json b/repository/GsApplicationTools-ServerV30.package/GemServerLauncher.extension/methodProperties.json
@@ -2,4 +2,4 @@
 	"class" : {
 		"activeProcessIsNative" : "dkh 12/09/2014 14:21" },
 	"instance" : {
-		"convertToPortable" : "dkh 12/08/2014 13:47" } }
+		"convertToPortable" : "dkh 07/15/2015 16:58" } }
diff --git a/repository/GsApplicationTools-ServerV30.package/monticello.meta/version b/repository/GsApplicationTools-ServerV30.package/monticello.meta/version

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		-(name 'BaselineOfGsApplicationTools-dkh.8' message 'Issue #10: change baseline to require GLASS1...clean up sent but not implemented' id '87cb8c31-5c93-432a-aa56-919a9717192c' date '12/26/2014' time '12:05:27' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.7' message 'Issue #10: breakpoint, halt and another http example' id '3ac7606c-22da-4206-9d45-446a8c2b09e9' date '12/23/2014' time '16:28:41' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.6' message 'Issue #10: expand gemserver api a bit more ... add simple test for GemServerRemoteServerExample and it is passing' id 'b48a9dcd-2492-4eaa-b60c-b9e187f8e8c0' date '12/23/2014' time '14:01:05' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.5' message 'Issue #10: add GemServer>>gemServer: and GemServer>>gemServer:onError: as non-transactional veriants for handling server errors, breakpoints and halts (should satisfy Issue #12)...refactor GemServer>>gemServerTransaction:onError: to use GemServer>>gemServer:onError: ... add GemServer>>handleGemServerException: to isolate server error and interactiveMoe logic ... GemServer>>serverError:titled:inTransactionDo: allows for performing optional work in the same transaction as the continuation ... if one is already in transaction a commit is expected to come from the caller ... started work on an example server as the GemServerTestServer has been sacrificed to being able to test various error conditions and is no longer a clean example ...' id '83fef897-46b4-46cb-ab20-c3224414c21e' date '12/23/2014' time '11:19:31' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.4' message 'Issue #2: split out GemServer>>performOnServer: into separate 2.4 and 3.x packages ... add new packages and update baseline' id '04a850bf-fa2b-4431-aaf6-c2881f208745' date '11/29/2014' time '19:14:19' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.3' message 'Issue #2: correct mistakes in baseline for package renames' id 'fd5a3af5-23ff-4999-8f85-014970aa05e1' date '11/26/2014' time '14:35:15' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.2' message 'Issue #2: rename packages to have GsApplication-Tools as base name' id 'dde6d24e-71be-4e7e-acc1-cca1b40370bb' date '11/26/2014' time '14:25:46' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.1' message 'Issue #1: define baseline' id '716d27b8-3b41-4a1e-ac1e-60496cf001e3' date '11/26/2014' time '11:18:40' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
	`1`	+(name 'BaselineOfGsApplicationTools-dkh.10' message 'Issue #35: the package GsApplicationTools-ServerExtensionsV30 with GsProcess>>convertToPortableStack is not needed ...' id '79dbd8f9-25ca-4ab3-8dc3-c583689b24dc' date '07/15/2015' time '17:34:53' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.9' message 'Issue #35: implement GsProcess>>convertToPortableStack for GemStone versions 3.0 thru 3.2 in package GsApplicationTools-ServerExtensionsV30' id 'd7cd8b66-fa67-4946-af11-a92e59c839ed' date '07/15/2015' time '17:06:38' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.8' message 'Issue #10: change baseline to require GLASS1...clean up sent but not implemented' id '87cb8c31-5c93-432a-aa56-919a9717192c' date '12/26/2014' time '12:05:27' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.7' message 'Issue #10: breakpoint, halt and another http example' id '3ac7606c-22da-4206-9d45-446a8c2b09e9' date '12/23/2014' time '16:28:41' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.6' message 'Issue #10: expand gemserver api a bit more ... add simple test for GemServerRemoteServerExample and it is passing' id 'b48a9dcd-2492-4eaa-b60c-b9e187f8e8c0' date '12/23/2014' time '14:01:05' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.5' message 'Issue #10: add GemServer>>gemServer: and GemServer>>gemServer:onError: as non-transactional veriants for handling server errors, breakpoints and halts (should satisfy Issue #12)...refactor GemServer>>gemServerTransaction:onError: to use GemServer>>gemServer:onError: ... add GemServer>>handleGemServerException: to isolate server error and interactiveMoe logic ... GemServer>>serverError:titled:inTransactionDo: allows for performing optional work in the same transaction as the continuation ... if one is already in transaction a commit is expected to come from the caller ... started work on an example server as the GemServerTestServer has been sacrificed to being able to test various error conditions and is no longer a clean example ...' id '83fef897-46b4-46cb-ab20-c3224414c21e' date '12/23/2014' time '11:19:31' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.4' message 'Issue #2: split out GemServer>>performOnServer: into separate 2.4 and 3.x packages ... add new packages and update baseline' id '04a850bf-fa2b-4431-aaf6-c2881f208745' date '11/29/2014' time '19:14:19' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.3' message 'Issue #2: correct mistakes in baseline for package renames' id 'fd5a3af5-23ff-4999-8f85-014970aa05e1' date '11/26/2014' time '14:35:15' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.2' message 'Issue #2: rename packages to have GsApplication-Tools as base name' id 'dde6d24e-71be-4e7e-acc1-cca1b40370bb' date '11/26/2014' time '14:25:46' author 'dkh' ancestors ((name 'BaselineOfGsApplicationTools-dkh.1' message 'Issue #1: define baseline' id '716d27b8-3b41-4a1e-ac1e-60496cf001e3' date '11/26/2014' time '11:18:40' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ convertToPortable`
`7`	`7`	`activeProcess := ProcessorScheduler scheduler activeProcess.`
`8`	`8`	`[`
`9`	`9`	`activeProcess localStackDepth.`
`10`		`- activeProcess _convertToPortableStack.`
	`10`	`+ activeProcess convertToPortableStack.`
`11`	`11`	`sema signal ]`
`12`	`12`	`fork.`
`13`	`13`	`sema wait`