Merge Issue #5 changes

.travis.yml

@@ -0,0 +1,17 @@
+language: erlang
+
+env:
+   - ST=GemStone-3.1.0.6
+   - ST=GemStone-3.2.3
+
+install:
+   - export PROJECT_HOME="$(pwd)"
+   - cd $HOME
+   - wget -q -O builderCI.zip https://github.com/dalehenrich/builderCI/zipball/master
+   - unzip -q builderCI.zip
+   - cd dalehenrich-builderCI*
+   - source build_env_vars
+   - ln -s $PROJECT_HOME $GIT_PATH
+   - ./build_image.sh
+
+script: $BUILDER_CI_HOME/testTravisCI.sh -verbose

repository/BaselineOfServiceVM.package/BaselineOfServiceVM.class/instance/baseline..st

@@ -5,22 +5,30 @@ baseline: spec
     for: #'common'
     do: [ 
       spec
-        configuration: 'Seaside3'
+        baseline: 'Seaside3'
           with: [ 
               spec
-                version: #'release3.1';
-                loads: #('default' 'Zinc' 'Seaside-GemStone-ServiceTask');
-                repository:
-                    'http://www.smalltalkhub.com/mc/Seaside/MetacelloConfigurations/main' ];
+                loads:
+                    #('Core' 'Seaside-GemStone-ServiceTask' 'Seaside-GemStone-GemServer-Core');
+                repository: 'github://GsDevKit/Seaside31:issue_54/repository' ];
+        project: 'Seaside3 Zinc Adaptor'
+          copyFrom: 'Seaside3'
+          with: [ spec loads: #('Seaside-GemStone-Adaptors-Zinc') ];
         yourself.
       spec
         package: 'Seaside-GemStone-ServiceVM-Support'
           with: [ spec requires: #('Seaside3') ];
         package: 'Seaside-GemStone-ServiceExamples'
-          with: [ spec requires: #('Seaside-GemStone-ServiceVM-Support') ];
+          with: [ spec requires: #('Seaside-GemStone-ServiceVM-Support' 'Seaside3 Zinc Adaptor') ];
+        package: 'Seaside-GemStone-ServiceVM-GemServer'
+          with: [ spec requires: #('Seaside3') ];
         yourself.
       spec
         group: 'default' with: #('Core' 'Example');
-        group: 'Core' with: #('Seaside-GemStone-ServiceVM-Support');
+        group: 'Core'
+          with:
+            #('Seaside-GemStone-ServiceVM-Support' 'Seaside-GemStone-ServiceVM-GemServer');
         group: 'Example' with: #('Seaside-GemStone-ServiceExamples');
-        group: 'Tests' with: #() yourself ]
+        group: 'Tests' with: #();
+        group: 'CI' with: #('Core' 'Tests' 'Example');
+        yourself ]

repository/BaselineOfServiceVM.package/BaselineOfServiceVM.class/methodProperties.json

@@ -2,4 +2,4 @@
 	"class" : {
 		 },
 	"instance" : {
-		"baseline:" : "dkh 06/12/2014 23:05" } }
+		"baseline:" : "dkh 12/14/2014 13:36" } }

repository/BaselineOfServiceVM.package/BaselineOfServiceVM.class/properties.json

@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "dkh 06/06/2014 08:28",
+	"commentStamp" : "",
 	"instvars" : [
 		 ],
 	"name" : "BaselineOfServiceVM",

repository/BaselineOfServiceVM.package/monticello.meta/version

@@ -1 +1 @@
-(name 'BaselineOfServiceVM-dkh.7' message 'load ''default'' + Zinc, etc. from Seaside3...oh and include the Seaside-GemStone-ServiceExamples, too' id 'bb7fef7c-3c52-4291-8829-51d9f3ca760d' date '06/12/2014' time '23:06:14' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.6' message 'correct Seaside3 symbolic version' id '28fef02b-9382-440a-854d-73205e125fe7' date '06/12/2014' time '22:59:33' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.5' message 'update baseline with preferred way to reference Seaside3 project (via configuration and using the #release31 version)' id '3f9fcc79-94f0-42ad-9f85-6128c71d2646' date '06/12/2014' time '13:40:36' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.4' message 'Seaside-GemStone-ServiceTask is already in Seaside31 config' id '928e39ce-6004-4f46-bcc6-459c6fd802a8' date '06/08/2014' time '15:26:31' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.3' message 'simplification of ServiceVM example without breaking existing stuff- build new vm hierarchy under WAGemStoneAbstractServiceVM which   is basically WAGemStoneServiceVMTask reafactored to support   multiple subclasses   - new classes WAGemStoneServiceExampleVM (for old example) and     WAGemStoneServiceVM (for new example which will be built upon    Nick''s WAGemStoneServiceTask; block-based and much simpler- restore Seaside-GemStone-ServiceTask-NickAger.20  - implementation of WAGemStoneServiceVMTask left alone in    case folks are using it in production ... evenutally they    should convert and until then ..' id 'bc871cb0-1433-4400-888a-19011c13cd9c' date '06/08/2014' time '14:26:15' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.2' message 'oops ... forgot the class' id '24ab19b3-b944-4dd8-806b-93b69622682a' date '06/06/2014' time '11:32:03' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.1' message 'initial baseline' id 'afc70878-fed8-4cc5-b6fa-411dbdcdb02b' date '06/06/2014' time '08:29:24' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())
+(name 'BaselineOfServiceVM-dkh.13' message 'Issue #5: Seaside-GemStone-ServiceExamples needs to have an adaptor to be functional ... Zinc is a good one to use' id '1b5b827e-bea9-49cf-a02b-3c4eb9c44a34' date '12/14/2014' time '13:50:45' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.12' message 'Issue #5: ''Development'' and ''Zinc'' not specifically needed by ServiceVM ...' id '30b8b9c4-1475-4952-bd0c-6112707d47a3' date '12/14/2014' time '12:29:59' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.11' message 'Issue #5: work on undefined symbols and sent but not implemented...' id '751e90d2-3806-4bce-9f29-16d08308c5bb' date '12/14/2014' time '11:17:03' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.10' message 'Issue #5: reference issue_54 branch of Seaside31 project for now' id 'a2fc1c43-093d-4056-b626-f4410b75a534' date '12/13/2014' time '16:37:35' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.9' message 'Issue #5: update baseline with CI group' id '103b6a66-b06e-4860-b86a-813a70172d6e' date '12/13/2014' time '16:17:32' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.8' message 'Issue #5: start implementation of ServiceVmGemServer' id '1708798c-123e-4e7d-85e0-fd658d646dce' date '12/13/2014' time '15:59:38' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.7' message 'load ''default'' + Zinc, etc. from Seaside3...oh and include the Seaside-GemStone-ServiceExamples, too' id 'bb7fef7c-3c52-4291-8829-51d9f3ca760d' date '06/12/2014' time '23:06:14' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.6' message 'correct Seaside3 symbolic version' id '28fef02b-9382-440a-854d-73205e125fe7' date '06/12/2014' time '22:59:33' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.5' message 'update baseline with preferred way to reference Seaside3 project (via configuration and using the #release31 version)' id '3f9fcc79-94f0-42ad-9f85-6128c71d2646' date '06/12/2014' time '13:40:36' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.4' message 'Seaside-GemStone-ServiceTask is already in Seaside31 config' id '928e39ce-6004-4f46-bcc6-459c6fd802a8' date '06/08/2014' time '15:26:31' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.3' message 'simplification of ServiceVM example without breaking existing stuff- build new vm hierarchy under WAGemStoneAbstractServiceVM which   is basically WAGemStoneServiceVMTask reafactored to support   multiple subclasses   - new classes WAGemStoneServiceExampleVM (for old example) and     WAGemStoneServiceVM (for new example which will be built upon    Nick''s WAGemStoneServiceTask; block-based and much simpler- restore Seaside-GemStone-ServiceTask-NickAger.20  - implementation of WAGemStoneServiceVMTask left alone in    case folks are using it in production ... evenutally they    should convert and until then ..' id 'bc871cb0-1433-4400-888a-19011c13cd9c' date '06/08/2014' time '14:26:15' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.2' message 'oops ... forgot the class' id '24ab19b3-b944-4dd8-806b-93b69622682a' date '06/06/2014' time '11:32:03' author 'dkh' ancestors ((name 'BaselineOfServiceVM-dkh.1' message 'initial baseline' id 'afc70878-fed8-4cc5-b6fa-411dbdcdb02b' date '06/06/2014' time '08:29:24' author 'dkh' ancestors () stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())) stepChildren ())

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/instance/gemServer.st

@@ -0,0 +1,5 @@
+accessing
+gemServer
+  ^ ServiceVmGemServer
+    register: 'ServiceVMServer'
+    for: WAGemStoneServiceExampleVM

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/instance/setUp.st

@@ -0,0 +1,5 @@
+running
+setUp
+  super setUp.
+  registry := GemServerRegistry singleton.
+  GemServerRegistry _singleton: nil

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/instance/tearDown.st

@@ -0,0 +1,4 @@
+running
+tearDown
+  super tearDown.
+  GemServerRegistry _singleton: registry

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/instance/testTimeInLondon.st

@@ -0,0 +1,27 @@
+tests
+testTimeInLondon
+  | gemServer |
+  gemServer := self gemServer.
+  [ 
+  | task |
+  gemServer restartGems.
+  (Delay forSeconds: 3) wait.
+  task := WAGemStoneServiceExampleTask
+    valuable:
+      (WAGemStoneServiceExampleTimeInLondon
+        url: 'http://www.time.org/zones/Europe/London.php').
+  task addToQueue.
+  System commitTransaction.
+  [ 
+  System abortTransaction.
+  Transcript
+    cr;
+    show: task printString.
+  System commitTransaction.
+  task hasValue ]
+    whileFalse: [ (Delay forSeconds: 2) wait ].
+  self deny: task hasError.
+  self assert: task value ~~ nil ]
+    ensure: [ 
+      gemServer stopGems.
+      (Delay forSeconds: 3) wait ]

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/methodProperties.json

@@ -0,0 +1,8 @@
+{
+	"class" : {
+		 },
+	"instance" : {
+		"gemServer" : "dkh 12/14/2014 14:47",
+		"setUp" : "dkh 12/14/2014 14:43",
+		"tearDown" : "dkh 12/14/2014 14:44",
+		"testTimeInLondon" : "dkh 12/14/2014 15:05" } }

repository/Seaside-GemStone-ServiceExamples.package/ServiceExampleGemServerTests.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "Seaside-GemStone-ServiceExamples-Tests",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		"registry" ],
+	"name" : "ServiceExampleGemServerTests",
+	"pools" : [
+		 ],
+	"super" : "TestCase",
+	"type" : "normal" }

repository/Seaside-GemStone-ServiceExamples.package/WAGemStoneServiceExampleTaskComponent.class/properties.json

@@ -4,7 +4,7 @@
 		 ],
 	"classvars" : [
 		 ],
-	"commentStamp" : "dkh 06/09/2014 12:38",
+	"commentStamp" : "",
 	"instvars" : [
 		"task" ],
 	"name" : "WAGemStoneServiceExampleTaskComponent",

repository/Seaside-GemStone-ServiceExamples.package/monticello.meta/categories.st

@@ -1,2 +1,3 @@
 SystemOrganization addCategory: #'Seaside-GemStone-ServiceExamples-Component'!
 SystemOrganization addCategory: #'Seaside-GemStone-ServiceExamples-Core'!
+SystemOrganization addCategory: #'Seaside-GemStone-ServiceExamples-Tests'!

repository/Seaside-GemStone-ServiceVM-GemServer.package/.filetree

@@ -0,0 +1,4 @@
+{
+	"noMethodMetaData" : true,
+	"separateMethodMetaAndSource" : false,
+	"useCypressPropertiesFile" : true }

repository/Seaside-GemStone-ServiceVM-GemServer.package/ServiceVmGemServer.class/class/delayTimeMs.st

@@ -0,0 +1,3 @@
+accessing
+delayTimeMs
+  ^ 200

repository/Seaside-GemStone-ServiceVM-GemServer.package/ServiceVmGemServer.class/class/taskClass.st

@@ -0,0 +1,3 @@
+accessing
+taskClass
+  ^ WAGemStoneServiceVMTask

repository/Seaside-GemStone-ServiceVM-GemServer.package/ServiceVmGemServer.class/instance/startServerOn..st

@@ -0,0 +1,6 @@
+service instance-server
+startServerOn: portOrResourceName
+  "start server in current vm. for gemstone, not expected to return."
+
+  self taskClass vmStartup.
+  super startServerOn: portOrResourceName

repository/Seaside-GemStone-ServiceVM-GemServer.package/ServiceVmGemServer.class/methodProperties.json

@@ -0,0 +1,6 @@
+{
+	"class" : {
+		"delayTimeMs" : "dkh 12/13/2014 15:31",
+		"taskClass" : "dkh 12/13/2014 15:29" },
+	"instance" : {
+		"startServerOn:" : "dkh 01/06/2015 15:50" } }

repository/Seaside-GemStone-ServiceVM-GemServer.package/ServiceVmGemServer.class/properties.json

@@ -0,0 +1,14 @@
+{
+	"category" : "Seaside-GemStone-ServiceVM-GemServer",
+	"classinstvars" : [
+		 ],
+	"classvars" : [
+		 ],
+	"commentStamp" : "",
+	"instvars" : [
+		 ],
+	"name" : "ServiceVmGemServer",
+	"pools" : [
+		 ],
+	"super" : "WAGemStoneAbstractTaskGemServer",
+	"type" : "normal" }

repository/Seaside-GemStone-ServiceVM-GemServer.package/monticello.meta/categories.st

@@ -0,0 +1 @@
+SystemOrganization addCategory: #'Seaside-GemStone-ServiceVM-GemServer'!

repository/Seaside-GemStone-ServiceVM-GemServer.package/monticello.meta/package

@@ -0,0 +1 @@
+(name 'Seaside-GemStone-ServiceVM-GemServer')

repository/Seaside-GemStone-ServiceVM-GemServer.package/monticello.meta/version

@@ -0,0 +1 @@
+(name 'Seaside-GemStone-ServiceVM-GemServer-dkh.2' message 'Issue #5: replace use of ports with portOrResourceNameList in gem server' id 'a38f0876-0392-472c-8f25-48bf83fd5a56' date '01/06/2015' time '16:19:38' author 'dkh' ancestors ((name 'Seaside-GemStone-ServiceVM-GemServer-dkh.1' message 'Issue #5: start implementation of ServiceVmGemServer' id '8d0f0457-16d5-481a-89f4-5f973ffc4973' date '12/13/2014' time '15:59:38' author 'dkh' ancestors () stepChildren ())) stepChildren ())

repository/Seaside-GemStone-ServiceVM-GemServer.package/properties.json

@@ -0,0 +1,2 @@
+{
+	 }

tests/travisCI.st

@@ -0,0 +1,34 @@
+"Load and run tests to be performed by TravisCI"
+| gitCache gitPath loadBlock |
+Transcript cr; show: 'travis---->travisCI.st'.
+
+gitCache := 'git_cache'.
+gitPath := (FileDirectory default directoryNamed: gitCache) fullName.
+
+"Upgrade Grease and Metacello"
+Gofer new
+  package: 'GsUpgrader-Core';
+  url: 'http://ss3.gemtalksystems.com/ss/gsUpgrader';
+  load.
+(Smalltalk at: #GsUpgrader) upgradeGrease.
+
+
+"Load ServiceVM"
+GsDeployer deploy: [
+  Metacello new
+    baseline: 'ServiceVM';
+    repository: 'filetree://', gitPath, '/ServiceVM/repository';
+    load: 'CI' ].
+
+true ifTrue: [
+  "Run all tests in image"
+   TravisCISuiteHarness
+     value: TestCase suite
+     value: 'TravisCISuccess.txt'
+     value: 'TravisCIFailure.txt'.
+] ifFalse: [
+  "Run just the ServiceVM tests"
+  TravisCIHarness
+    value: #( 'BaselineOfServiceVM' )
+    value: 'TravisCISuccess.txt' 
+    value: 'TravisCIFailure.txt' ].