Skip to content

Commit

Permalink
Merge pull request #7 from GsDevKit/master
Browse files Browse the repository at this point in the history 
v1.0.2
  • Loading branch information
@dalehenrich
dalehenrich committed Jan 15, 2015
2 parents 5760e37 + b5755dc commit 7343d78
Show file tree
Hide file tree
Showing 81 changed files with 254 additions and 80 deletions.
2 changes: 1 addition & 1 deletion ...ApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/port.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
server compat
local server compat
port
^ self defaultPortOrResourceNameList first
2 changes: 1 addition & 1 deletion ...licationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/restart.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server compat
local server compat
restart
self scriptLogEvent: '-->>Interactive restart ' , self name object: self.
self
Expand Down
2 changes: 1 addition & 1 deletion ...pplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/start.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
server compat
local server compat
start
self interactiveStartServiceOn: 'instance' transactionMode: #'manualBegin'
2 changes: 1 addition & 1 deletion ...ApplicationTools-ExampleV31.package/GemServerRemoteAbstractExample.class/instance/stop.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
server compat
local server compat
stop
self scriptLogEvent: '-->>Interactive stop ' , self name object: self.
self basicServerProcess
Expand Down
2 changes: 1 addition & 1 deletion ...ionTools-ExampleV31.package/GemServerRemoteServerExampleTests.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"gemServerName" : "dkh 12/23/2014 13:28",
"runTest:client:task:" : "dkh 01/01/2015 11:17",
"scheduledTaskList" : "dkh 12/26/2014 18:17",
"setUp" : "dkh 12/26/2014 14:47",
"setUp" : "dkh 01/09/2015 17:20",
"startGems:" : "dkh 12/23/2014 13:04",
"stopGems:" : "dkh 12/23/2014 15:53",
"taskList100" : "dkh 01/02/2015 09:20",
Expand Down
2 changes: 1 addition & 1 deletion ...mpleV31.package/GemServerRemoteServerParallelProcessingExampleTests.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "dkh 12/30/2014 12:46",
"commentStamp" : "",
"instvars" : [
],
"name" : "GemServerRemoteServerParallelProcessingExampleTests",
Expand Down
2 changes: 1 addition & 1 deletion ...xampleV31.package/GemServerRemoteServerSerialProcessingExampleTests.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "dkh 12/30/2014 12:46",
"commentStamp" : "",
"instvars" : [
],
"name" : "GemServerRemoteServerSerialProcessingExampleTests",
Expand Down
2 changes: 1 addition & 1 deletion ...ols-ExampleV31.package/GemServerRemoteTaskParallelProcessingExample.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "dkh 12/31/2014 20:50",
"commentStamp" : "",
"instvars" : [
],
"name" : "GemServerRemoteTaskParallelProcessingExample",
Expand Down
2 changes: 1 addition & 1 deletion ...Tools-ExampleV31.package/GemServerRemoteTaskSerialProcessingExample.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
],
"classvars" : [
],
"commentStamp" : "dkh 12/31/2014 20:51",
"commentStamp" : "",
"instvars" : [
],
"name" : "GemServerRemoteTaskSerialProcessingExample",
Expand Down
2 changes: 1 addition & 1 deletion ...ionTools-ExampleV31.package/GemServerSeasideStyleExampleTests.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"instance" : {
"gemServerName" : "dkh 01/02/2015 11:10",
"runTest:" : "dkh 01/02/2015 11:45",
"setUp" : "dkh 01/02/2015 14:45",
"setUp" : "dkh 01/09/2015 17:20",
"startGems:" : "dkh 01/02/2015 11:11",
"stopGems:" : "dkh 01/02/2015 11:11",
"tearDown" : "dkh 01/06/2015 13:42",
Expand Down
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-ExampleV31.package/monticello.meta/version
View file

Large diffs are not rendered by default.

3 changes: 3 additions & 0 deletions ...ry/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
accessing
basicTransactionReentry: aBlock
basicTransactionReentry value: aBlock
5 changes: 5 additions & 0 deletions ...ory/GsApplicationTools-Server.package/GemServer.class/instance/basicTransactionReentry.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
accessing
basicTransactionReentry
basicTransactionReentry value
ifNil: [ basicTransactionReentry value: self reentryAllowed ].
^ basicTransactionReentry value
17 changes: 9 additions & 8 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/doBasicTransaction..st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
transactions-support
doBasicTransaction: aBlock
"I do an unconditional commit.
"I do an unconditional commit and I am not reentrant
If running in manual transaction mode, the system will be outside of transaction upon
returning.
Return true, if the transaction completed without conflicts.
Expand All @@ -9,14 +9,15 @@ doBasicTransaction: aBlock

self transactionMutex
critical: [
| commitResult |
| commitResult oldValue |
self basicTransactionReentry value: 'doBasicTransaction:'. "throw error upon reentry"
oldValue := self basicTransactionReentry.
[
System inTransaction
ifTrue: [ aBlock value ]
ifFalse: [
self doBeginTransaction.
aBlock value ] ]
self basicTransactionReentry: self reentryDisallowed.
self doBeginTransaction.
aBlock value ]
ensure: [
"workaround for Bug 42963: ensure: block executed twice (don't return from ensure: block)"
commitResult := self doCommitTransaction ].
commitResult := self doCommitTransaction.
self basicTransactionReentry: oldValue ].
^ commitResult ]
1 change: 1 addition & 0 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/initialize.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,5 @@ initialize
transactionMode := #'manualBegin'.
enableCreateContinuations := true.
basicServerProcess := TransientValue value: nil.
basicTransactionReentry := TransientStackValue value: nil.
self initCrashLog
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
server specialization
isRunning
^self serverClass isRunning
^self serverClass isRunning
6 changes: 5 additions & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/instance/logControlEvent..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
private
logControlEvent: label
self doTransaction: [ (ObjectLogEntry info: label object: self) addToLog ]
| eventBlock |
eventBlock := [ (ObjectLogEntry info: label object: self) addToLog ].
System inTransaction
ifTrue: [ eventBlock value ]
ifFalse: [ self doTransaction: eventBlock ]
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
name

name == nil ifTrue: [ ^self serverClass name ].
^name
^name
3 changes: 3 additions & 0 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/reentryAllowed.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
private
reentryAllowed
^ [ :methodName | ]
3 changes: 3 additions & 0 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/reentryDisallowed.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
private
reentryDisallowed
^ [ :methodName | self error: methodName , ' is not re-entrant' ]
8 changes: 6 additions & 2 deletions ...tory/GsApplicationTools-Server.package/GemServer.class/instance/scriptLogEvent.object..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
private
scriptLogEvent: label object: anObject
"object log and transcript entries wanted"
"object log"

| eventBlock |
Transcript
cr;
show: 'scriptLogEvent: ' , label printString.
self doTransaction: [ (ObjectLogEntry info: label object: anObject) addToLog ]
eventBlock := [ (ObjectLogEntry info: label object: anObject) addToLog ].
System inTransaction
ifTrue: [ eventBlock value ]
ifFalse: [ self doTransaction: eventBlock ]
3 changes: 3 additions & 0 deletions repository/GsApplicationTools-Server.package/GemServer.class/instance/start.st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
local server compat
start
self interactiveStartServiceOn: self portOrResourceNameList first
13 changes: 9 additions & 4 deletions repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
"basicServerOn:" : "dkh 01/03/2015 15:54",
"basicServerProcess" : "dkh 01/02/2015 17:13",
"basicServerProcess:" : "dkh 01/02/2015 17:13",
"basicTransactionReentry" : "dkh 01/09/2015 14:20",
"basicTransactionReentry:" : "dkh 01/09/2015 13:16",
"bounceServerAfterSetOrClearBreakpoints:" : "dkh 12/09/2014 14:12",
"bounceServerForBreakpointHandling" : "dkh 12/10/2014 14:48",
"clearAllBreakpoints:" : "dkh 12/07/2014 18:24",
Expand All @@ -26,7 +28,7 @@
"defaultPortOrResourceNameList" : "dkh 01/06/2015 15:21",
"defaultScriptBinDirPath" : "dkh 11/29/2014 20:08",
"doAbortTransaction" : "dkh 12/22/2014 11:24",
"doBasicTransaction:" : "dkh 12/30/2014 07:19",
"doBasicTransaction:" : "dkh 01/09/2015 13:19",
"doBeginTransaction" : "dkh 12/22/2014 11:24",
"doCommitTransaction" : "dkh 12/22/2014 11:24",
"doInteractiveModePass:" : "dkh 12/31/2014 21:21",
Expand Down Expand Up @@ -74,14 +76,14 @@
"gemServerTransaction:onConflict:" : "dkh 12/30/2014 16:56",
"handleGemServerException:" : "dkh 12/30/2014 13:59",
"initCrashLog" : "dkh 12/25/2014 08:06",
"initialize" : "dkh 01/06/2015 15:28",
"initialize" : "dkh 01/09/2015 14:21",
"interactiveMode" : "dkh 12/22/2014 12:55",
"interactiveMode:" : "dkh 12/22/2014 12:57",
"interactiveStartServiceOn:" : "dkh 01/06/2015 15:51",
"interactiveStartServiceOn:transactionMode:" : "dkh 01/06/2015 15:50",
"isRunning" : "SebastianHeidbrink 11/02/2014 15:00",
"isValidName:" : "dkh 11/26/2014 18:31",
"logControlEvent:" : "dkh 12/30/2014 07:24",
"logControlEvent:" : "dkh 01/09/2015 17:16",
"logDebug:" : "dkh 12/07/2014 10:09",
"logInfo:" : "dkh 12/07/2014 10:09",
"logStack:titled:" : "dkh 12/27/2014 12:22",
Expand All @@ -94,11 +96,13 @@
"ports" : "dkh 01/07/2015 10:02",
"ports:" : "dkh 01/07/2015 10:02",
"recordGemPid:" : "dkh 12/04/2014 06:56",
"reentryAllowed" : "dkh 01/09/2015 13:12",
"reentryDisallowed" : "dkh 01/09/2015 13:11",
"register" : "dkh 01/06/2015 13:39",
"restartGems" : "dkh 12/06/2014 13:04",
"saveContinuationFor:titled:inTransactionDo:" : "dkh 12/30/2014 07:25",
"scriptBinDirPath" : "dkh 11/29/2014 09:44",
"scriptLogEvent:object:" : "dkh 12/30/2014 07:25",
"scriptLogEvent:object:" : "dkh 01/09/2015 17:18",
"scriptServicePrologOn:" : "dkh 01/03/2015 22:10",
"scriptStartServiceOn:" : "dkh 01/06/2015 15:50",
"serverClass" : "dkh 11/29/2014 14:08",
Expand All @@ -112,6 +116,7 @@
"setOrClearBreakpoint:" : "dkh 12/07/2014 18:24",
"setStatmonCacheName" : "dkh 11/30/2014 08:45",
"stackReportLimit" : "dkh 12/30/2014 06:46",
"start" : "dkh 01/09/2015 14:16",
"startBasicServerOn:" : "dkh 01/06/2015 15:53",
"startGems" : "dkh 01/06/2015 15:29",
"startScriptName" : "dkh 12/04/2014 08:02",
Expand Down
4 changes: 2 additions & 2 deletions repository/GsApplicationTools-Server.package/GemServer.class/properties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
"name",
"serverClassAssoc",
"serverInstance",
"ports",
"portOrResourceNameList",
"enableRemoteBreakpoints",
"transactionMode",
"interactiveMode",
"crashLog",
"enableCreateContinuations",
"gemServerExceptionSet",
"basicServerProcess" ],
"basicServerProcess",
"basicTransactionReentry" ],
"name" : "GemServer",
"pools" : [
],
Expand Down
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
block: anObject

block := anObject
block := anObject
2 changes: 1 addition & 1 deletion ...tory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeProcess: anObject

nativeProcess := anObject
nativeProcess := anObject
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeProcess

^nativeProcess
^nativeProcess
2 changes: 1 addition & 1 deletion ...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
nativeSemaphore: anObject

nativeSemaphore := anObject
nativeSemaphore := anObject
2 changes: 1 addition & 1 deletion ...ry/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableProcess: anObject

portableProcess := anObject
portableProcess := anObject
2 changes: 1 addition & 1 deletion ...ory/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableProcess

^portableProcess
^portableProcess
2 changes: 1 addition & 1 deletion .../GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
accessing
portableSemaphore: anObject

portableSemaphore := anObject
portableSemaphore := anObject
2 changes: 1 addition & 1 deletion ...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
gemServerNamed: aString
^self singleton serverNamed: aString
^self singleton serverNamed: aString
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
gemServerNames
^self singleton names asSortedCollection
^self singleton names asSortedCollection
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
instance creation
new
^self singleton
^self singleton
2 changes: 1 addition & 1 deletion .../GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
registration
removeGemServerNamed: aName
self singleton removeServer: aName
.
.
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
serverGems
^self singleton servers
^self singleton servers
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
gem server querying
serversOnPort: aPortNumber
^self singleton serversOnPort: aPortNumber
^self singleton serversOnPort: aPortNumber
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ accessing
singleton

Singleton isNil ifTrue: [self initSingleton].
^Singleton
^Singleton
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ addServer: aServer
(self serverNamed: aServer name) notNil
ifTrue: [^Error error: 'Server with that name already exists!'].

self servers add: aServer
self servers add: aServer
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
names

^self servers collect:[:each | each name].
^self servers collect:[:each | each name].
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ other
removeServer: aName
|server|
server :=self serverNamed:aName.
server == nil ifFalse:[ servers remove: server]
server == nil ifFalse:[ servers remove: server]
2 changes: 1 addition & 1 deletion ...itory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
other
serverClasses

^self servers collect:[:each | each serverClass].
^self servers collect:[:each | each serverClass].
2 changes: 1 addition & 1 deletion ...sitory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
other
serverNamed: aString
^self servers detect:[:each | each name = aString] ifNone:[nil]
^self servers detect:[:each | each name = aString] ifNone:[nil]
2 changes: 1 addition & 1 deletion repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
other
servers
^servers
^servers
2 changes: 1 addition & 1 deletion ...ory/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
other
serversOfClass: aClassName
^servers select: [:each | each serverClass name = aClassName]
^servers select: [:each | each serverClass name = aClassName]
Loading

0 comments on commit 7343d78

Please sign in to comment.