Merge pull request #23 from GsDevKit/dev

dalehenrich · dalehenrich · commit 577953c922a3 · 2015-01-26T16:10:11.000-08:00
Issue #22: if GEMSTONE_LOG_DIR not defined use /opt/gemstone/log for Gem...
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/gemPidFileName..st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/gemPidFileName..st
@@ -2,5 +2,7 @@ service instance-private
 gemPidFileName: portOrResourceName
   "must match bin/stopGemServerGem script"
 
-  ^ (GsFile _expandEnvVariable: 'GEMSTONE_LOGDIR' isClient: false) , '/'
-    , self name , '_server-' , portOrResourceName asString , '.pid'
+  | logDir |
+  logDir := (GsFile _expandEnvVariable: 'GEMSTONE_LOGDIR' isClient: false)
+    ifNil: [ '/opt/gemstone/log' ].
+  ^ logDir , '/' , self name , '_server-' , portOrResourceName asString , '.pid'
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/isRunning.st
@@ -1,3 +1,3 @@
 server specialization
 isRunning
-	^self serverClass isRunning
+	^self serverClass isRunning
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st b/repository/GsApplicationTools-Server.package/GemServer.class/instance/name.st
@@ -2,4 +2,4 @@ accessing
 name
 
 	name == nil ifTrue: [ ^self serverClass name ].
-	^name
+	^name
diff --git a/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json b/repository/GsApplicationTools-Server.package/GemServer.class/methodProperties.json
@@ -42,7 +42,7 @@
 		"executeStartGemCommand:" : "dkh 01/06/2015 15:31",
 		"executeStatusGemCommand:" : "dkh 12/20/2014 21:46",
 		"executeStopGemCommand:" : "dkh 01/06/2015 15:30",
-		"gemPidFileName:" : "dkh 01/06/2015 15:29",
+		"gemPidFileName:" : "dkh 01/26/2015 15:07",
 		"gemServer:" : "dkh 12/30/2014 16:10",
 		"gemServer:beforeUnwind:" : "dkh 12/30/2014 16:11",
 		"gemServer:beforeUnwind:ensure:" : "dkh 12/30/2014 16:11",
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/block..st
@@ -1,4 +1,4 @@
 accessing
 block: anObject
 
-   block := anObject
+   block := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess..st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess: anObject
 
-   nativeProcess := anObject
+   nativeProcess := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeProcess.st
@@ -1,4 +1,4 @@
 accessing
 nativeProcess
 
-   ^nativeProcess
+   ^nativeProcess
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/nativeSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 nativeSemaphore: anObject
 
-   nativeSemaphore := anObject
+   nativeSemaphore := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess..st
@@ -1,4 +1,4 @@
 accessing
 portableProcess: anObject
 
-   portableProcess := anObject
+   portableProcess := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableProcess.st
@@ -1,4 +1,4 @@
 accessing
 portableProcess
 
-   ^portableProcess
+   ^portableProcess
diff --git a/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st b/repository/GsApplicationTools-Server.package/GemServerLauncher.class/instance/portableSemaphore..st
@@ -1,4 +1,4 @@
 accessing
 portableSemaphore: anObject
 
-   portableSemaphore := anObject
+   portableSemaphore := anObject
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNamed..st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNamed: aString
-	^self singleton serverNamed: aString
+	^self singleton serverNamed: aString
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/gemServerNames.st
@@ -1,3 +1,3 @@
 gem server querying
 gemServerNames
-	^self singleton names asSortedCollection
+	^self singleton names asSortedCollection
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/new.st
@@ -1,3 +1,3 @@
 instance creation
 new
-	^self singleton
+	^self singleton
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/removeGemServerNamed..st
@@ -1,4 +1,4 @@
 registration
 removeGemServerNamed: aName
 	self singleton removeServer: aName
-.
+.
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serverGems.st
@@ -1,3 +1,3 @@
 gem server querying
 serverGems
-	^self singleton servers
+	^self singleton servers
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/serversOnPort..st
@@ -1,3 +1,3 @@
 gem server querying
 serversOnPort: aPortNumber
-	^self singleton serversOnPort: aPortNumber
+	^self singleton serversOnPort: aPortNumber
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/class/singleton.st
@@ -2,4 +2,4 @@ accessing
 singleton
 	
 	Singleton isNil ifTrue: [self initSingleton].
-	^Singleton
+	^Singleton
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/addServer..st
@@ -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
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/names.st
@@ -1,4 +1,4 @@
 other
 names
 
-	^self servers collect:[:each | each name].
+	^self servers collect:[:each | each name].
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/removeServer..st
@@ -2,4 +2,4 @@ other
 removeServer: aName
 	|server|
 	server :=self serverNamed:aName.
-	server == nil ifFalse:[ servers remove: server]
+	server == nil ifFalse:[ servers remove: server]
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverClasses.st
@@ -1,4 +1,4 @@
 other
 serverClasses
 
-	^self servers collect:[:each | each serverClass].
+	^self servers collect:[:each | each serverClass].
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serverNamed..st
@@ -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]
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/servers.st
@@ -1,3 +1,3 @@
 other
 servers
-	^servers
+	^servers
diff --git a/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st b/repository/GsApplicationTools-Server.package/GemServerRegistry.class/instance/serversOfClass..st
@@ -1,3 +1,3 @@
 other
 serversOfClass: aClassName
-	^servers select: [:each | each serverClass name = aClassName]
+	^servers select: [:each | each serverClass name = aClassName]
diff --git a/repository/GsApplicationTools-Server.package/monticello.meta/version b/repository/GsApplicationTools-Server.package/monticello.meta/version

-Original file line number
+Diff line change
 name
 	name == nil ifTrue: [ ^self serverClass name ].
 -	^name
 +	^name