Skip to content

Commit b5755dc

Browse files
dalehenrichdalehenrich
committed
Merge pull request #18 from GsDevKit/dev
1.0.2 release
2 parents a04be13 + a312674 commit b5755dc

File tree

81 files changed

+254
-80
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+254
-80
lines changed

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/port.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
server compat
1+
local server compat
22
port
33
^ self defaultPortOrResourceNameList first

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/restart.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
server compat
1+
local server compat
22
restart
33
self scriptLogEvent: '-->>Interactive restart ' , self name object: self.
44
self

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/start.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
server compat
1+
local server compat
22
start
33
self interactiveStartServiceOn: 'instance' transactionMode: #'manualBegin'

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/stop.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
server compat
1+
local server compat
22
stop
33
self scriptLogEvent: '-->>Interactive stop ' , self name object: self.
44
self basicServerProcess

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"gemServerName" : "dkh 12/23/2014 13:28",
88
"runTest:client:task:" : "dkh 01/01/2015 11:17",
99
"scheduledTaskList" : "dkh 12/26/2014 18:17",
10-
"setUp" : "dkh 12/26/2014 14:47",
10+
"setUp" : "dkh 01/09/2015 17:20",
1111
"startGems:" : "dkh 12/23/2014 13:04",
1212
"stopGems:" : "dkh 12/23/2014 15:53",
1313
"taskList100" : "dkh 01/02/2015 09:20",

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteServerParallelProcessingExampleTests.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "dkh 12/30/2014 12:46",
7+
"commentStamp" : "",
88
"instvars" : [
99
],
1010
"name" : "GemServerRemoteServerParallelProcessingExampleTests",

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteServerSerialProcessingExampleTests.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "dkh 12/30/2014 12:46",
7+
"commentStamp" : "",
88
"instvars" : [
99
],
1010
"name" : "GemServerRemoteServerSerialProcessingExampleTests",

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteTaskParallelProcessingExample.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "dkh 12/31/2014 20:50",
7+
"commentStamp" : "",
88
"instvars" : [
99
],
1010
"name" : "GemServerRemoteTaskParallelProcessingExample",

‎repository/GsApplicationTools-ExampleV31.package/GemServerRemoteTaskSerialProcessingExample.class/properties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
],
55
"classvars" : [
66
],
7-
"commentStamp" : "dkh 12/31/2014 20:51",
7+
"commentStamp" : "",
88
"instvars" : [
99
],
1010
"name" : "GemServerRemoteTaskSerialProcessingExample",

‎repository/GsApplicationTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"instance" : {
55
"gemServerName" : "dkh 01/02/2015 11:10",
66
"runTest:" : "dkh 01/02/2015 11:45",
7-
"setUp" : "dkh 01/02/2015 14:45",
7+
"setUp" : "dkh 01/09/2015 17:20",
88
"startGems:" : "dkh 01/02/2015 11:11",
99
"stopGems:" : "dkh 01/02/2015 11:11",
1010
"tearDown" : "dkh 01/06/2015 13:42",

‎repository/GsApplicationTools-ExampleV31.package/monticello.meta/version

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry..st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
accessing
2+
basicTransactionReentry: aBlock
3+
basicTransactionReentry value: aBlock

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry.st

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
accessing
2+
basicTransactionReentry
3+
basicTransactionReentry value
4+
ifNil: [ basicTransactionReentry value: self reentryAllowed ].
5+
^ basicTransactionReentry value

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/doBasicTransaction..st

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
transactions-support
22
doBasicTransaction: aBlock
3-
"I do an unconditional commit.
3+
"I do an unconditional commit and I am not reentrant
44
If running in manual transaction mode, the system will be outside of transaction upon
55
returning.
66
Return true, if the transaction completed without conflicts.
@@ -9,14 +9,15 @@ doBasicTransaction: aBlock
99

1010
self transactionMutex
1111
critical: [
12-
| commitResult |
12+
| commitResult oldValue |
13+
self basicTransactionReentry value: 'doBasicTransaction:'. "throw error upon reentry"
14+
oldValue := self basicTransactionReentry.
1315
[
14-
System inTransaction
15-
ifTrue: [ aBlock value ]
16-
ifFalse: [
17-
self doBeginTransaction.
18-
aBlock value ] ]
16+
self basicTransactionReentry: self reentryDisallowed.
17+
self doBeginTransaction.
18+
aBlock value ]
1919
ensure: [
2020
"workaround for Bug 42963: ensure: block executed twice (don't return from ensure: block)"
21-
commitResult := self doCommitTransaction ].
21+
commitResult := self doCommitTransaction.
22+
self basicTransactionReentry: oldValue ].
2223
^ commitResult ]

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/initialize.st

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ initialize
88
transactionMode := #'manualBegin'.
99
enableCreateContinuations := true.
1010
basicServerProcess := TransientValue value: nil.
11+
basicTransactionReentry := TransientStackValue value: nil.
1112
self initCrashLog

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
server specialization
22
isRunning
3-
^self serverClass isRunning
3+
^self serverClass isRunning

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/logControlEvent..st

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
11
private
22
logControlEvent: label
3-
self doTransaction: [ (ObjectLogEntry info: label object: self) addToLog ]
3+
| eventBlock |
4+
eventBlock := [ (ObjectLogEntry info: label object: self) addToLog ].
5+
System inTransaction
6+
ifTrue: [ eventBlock value ]
7+
ifFalse: [ self doTransaction: eventBlock ]

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ accessing
22
name
33

44
name == nil ifTrue: [ ^self serverClass name ].
5-
^name
5+
^name

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/reentryAllowed.st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
private
2+
reentryAllowed
3+
^ [ :methodName | ]

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/reentryDisallowed.st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
private
2+
reentryDisallowed
3+
^ [ :methodName | self error: methodName , ' is not re-entrant' ]

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/scriptLogEvent.object..st

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
11
private
22
scriptLogEvent: label object: anObject
3-
"object log and transcript entries wanted"
3+
"object log"
44

5+
| eventBlock |
56
Transcript
67
cr;
78
show: 'scriptLogEvent: ' , label printString.
8-
self doTransaction: [ (ObjectLogEntry info: label object: anObject) addToLog ]
9+
eventBlock := [ (ObjectLogEntry info: label object: anObject) addToLog ].
10+
System inTransaction
11+
ifTrue: [ eventBlock value ]
12+
ifFalse: [ self doTransaction: eventBlock ]

‎repository/GsApplicationTools-Server.package/GemServer.class/instance/start.st

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
local server compat
2+
start
3+
self interactiveStartServiceOn: self portOrResourceNameList first

‎repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
"basicServerOn:" : "dkh 01/03/2015 15:54",
1919
"basicServerProcess" : "dkh 01/02/2015 17:13",
2020
"basicServerProcess:" : "dkh 01/02/2015 17:13",
21+
"basicTransactionReentry" : "dkh 01/09/2015 14:20",
22+
"basicTransactionReentry:" : "dkh 01/09/2015 13:16",
2123
"bounceServerAfterSetOrClearBreakpoints:" : "dkh 12/09/2014 14:12",
2224
"bounceServerForBreakpointHandling" : "dkh 12/10/2014 14:48",
2325
"clearAllBreakpoints:" : "dkh 12/07/2014 18:24",
@@ -26,7 +28,7 @@
2628
"defaultPortOrResourceNameList" : "dkh 01/06/2015 15:21",
2729
"defaultScriptBinDirPath" : "dkh 11/29/2014 20:08",
2830
"doAbortTransaction" : "dkh 12/22/2014 11:24",
29-
"doBasicTransaction:" : "dkh 12/30/2014 07:19",
31+
"doBasicTransaction:" : "dkh 01/09/2015 13:19",
3032
"doBeginTransaction" : "dkh 12/22/2014 11:24",
3133
"doCommitTransaction" : "dkh 12/22/2014 11:24",
3234
"doInteractiveModePass:" : "dkh 12/31/2014 21:21",
@@ -74,14 +76,14 @@
7476
"gemServerTransaction:onConflict:" : "dkh 12/30/2014 16:56",
7577
"handleGemServerException:" : "dkh 12/30/2014 13:59",
7678
"initCrashLog" : "dkh 12/25/2014 08:06",
77-
"initialize" : "dkh 01/06/2015 15:28",
79+
"initialize" : "dkh 01/09/2015 14:21",
7880
"interactiveMode" : "dkh 12/22/2014 12:55",
7981
"interactiveMode:" : "dkh 12/22/2014 12:57",
8082
"interactiveStartServiceOn:" : "dkh 01/06/2015 15:51",
8183
"interactiveStartServiceOn:transactionMode:" : "dkh 01/06/2015 15:50",
8284
"isRunning" : "SebastianHeidbrink 11/02/2014 15:00",
8385
"isValidName:" : "dkh 11/26/2014 18:31",
84-
"logControlEvent:" : "dkh 12/30/2014 07:24",
86+
"logControlEvent:" : "dkh 01/09/2015 17:16",
8587
"logDebug:" : "dkh 12/07/2014 10:09",
8688
"logInfo:" : "dkh 12/07/2014 10:09",
8789
"logStack:titled:" : "dkh 12/27/2014 12:22",
@@ -94,11 +96,13 @@
9496
"ports" : "dkh 01/07/2015 10:02",
9597
"ports:" : "dkh 01/07/2015 10:02",
9698
"recordGemPid:" : "dkh 12/04/2014 06:56",
99+
"reentryAllowed" : "dkh 01/09/2015 13:12",
100+
"reentryDisallowed" : "dkh 01/09/2015 13:11",
97101
"register" : "dkh 01/06/2015 13:39",
98102
"restartGems" : "dkh 12/06/2014 13:04",
99103
"saveContinuationFor:titled:inTransactionDo:" : "dkh 12/30/2014 07:25",
100104
"scriptBinDirPath" : "dkh 11/29/2014 09:44",
101-
"scriptLogEvent:object:" : "dkh 12/30/2014 07:25",
105+
"scriptLogEvent:object:" : "dkh 01/09/2015 17:18",
102106
"scriptServicePrologOn:" : "dkh 01/03/2015 22:10",
103107
"scriptStartServiceOn:" : "dkh 01/06/2015 15:50",
104108
"serverClass" : "dkh 11/29/2014 14:08",
@@ -112,6 +116,7 @@
112116
"setOrClearBreakpoint:" : "dkh 12/07/2014 18:24",
113117
"setStatmonCacheName" : "dkh 11/30/2014 08:45",
114118
"stackReportLimit" : "dkh 12/30/2014 06:46",
119+
"start" : "dkh 01/09/2015 14:16",
115120
"startBasicServerOn:" : "dkh 01/06/2015 15:53",
116121
"startGems" : "dkh 01/06/2015 15:29",
117122
"startScriptName" : "dkh 12/04/2014 08:02",

‎repository/GsApplicationTools-Server.package/GemServer.class/properties.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
"name",
1010
"serverClassAssoc",
1111
"serverInstance",
12-
"ports",
1312
"portOrResourceNameList",
1413
"enableRemoteBreakpoints",
1514
"transactionMode",
1615
"interactiveMode",
1716
"crashLog",
1817
"enableCreateContinuations",
1918
"gemServerExceptionSet",
20-
"basicServerProcess" ],
19+
"basicServerProcess",
20+
"basicTransactionReentry" ],
2121
"name" : "GemServer",
2222
"pools" : [
2323
],

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
block: anObject
33

4-
block := anObject
4+
block := anObject

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
nativeProcess: anObject
33

4-
nativeProcess := anObject
4+
nativeProcess := anObject

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
nativeProcess
33

4-
^nativeProcess
4+
^nativeProcess

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
nativeSemaphore: anObject
33

4-
nativeSemaphore := anObject
4+
nativeSemaphore := anObject

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
portableProcess: anObject
33

4-
portableProcess := anObject
4+
portableProcess := anObject

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
portableProcess
33

4-
^portableProcess
4+
^portableProcess

‎repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
accessing
22
portableSemaphore: anObject
33

4-
portableSemaphore := anObject
4+
portableSemaphore := anObject

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gem server querying
22
gemServerNamed: aString
3-
^self singleton serverNamed: aString
3+
^self singleton serverNamed: aString

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gem server querying
22
gemServerNames
3-
^self singleton names asSortedCollection
3+
^self singleton names asSortedCollection

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
instance creation
22
new
3-
^self singleton
3+
^self singleton

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
registration
22
removeGemServerNamed: aName
33
self singleton removeServer: aName
4-
.
4+
.

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gem server querying
22
serverGems
3-
^self singleton servers
3+
^self singleton servers

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
gem server querying
22
serversOnPort: aPortNumber
3-
^self singleton serversOnPort: aPortNumber
3+
^self singleton serversOnPort: aPortNumber

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ accessing
22
singleton
33

44
Singleton isNil ifTrue: [self initSingleton].
5-
^Singleton
5+
^Singleton

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ addServer: aServer
33
(self serverNamed: aServer name) notNil
44
ifTrue: [^Error error: 'Server with that name already exists!'].
55

6-
self servers add: aServer
6+
self servers add: aServer

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
other
22
names
33

4-
^self servers collect:[:each | each name].
4+
^self servers collect:[:each | each name].

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ other
22
removeServer: aName
33
|server|
44
server :=self serverNamed:aName.
5-
server == nil ifFalse:[ servers remove: server]
5+
server == nil ifFalse:[ servers remove: server]

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
other
22
serverClasses
33

4-
^self servers collect:[:each | each serverClass].
4+
^self servers collect:[:each | each serverClass].

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
other
22
serverNamed: aString
3-
^self servers detect:[:each | each name = aString] ifNone:[nil]
3+
^self servers detect:[:each | each name = aString] ifNone:[nil]

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
other
22
servers
3-
^servers
3+
^servers

‎repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
other
22
serversOfClass: aClassName
3-
^servers select: [:each | each serverClass name = aClassName]
3+
^servers select: [:each | each serverClass name = aClassName]

0 commit comments

Comments
 (0)