--- a/AbstractLauncherApplication.st Wed Sep 10 18:19:56 2003 +0200
+++ b/AbstractLauncherApplication.st Thu Sep 11 14:53:22 2003 +0200
@@ -1899,7 +1899,7 @@
(hasHTTPServer := HTTPServer notNil) ifTrue:[
HTTPServer isLoaded ifTrue:[
httpServerRunning := HTTPServer isRunning.
- httpServerFileRoot := HTTPServer fileRoot.
+ "/ httpServerFileRoot := HTTPServer fileRoot.
httpServerHomeURL := HTTPServer homeURL.
httpServerPort := HTTPServer port.
httpServerLogFile := HTTPServer logFile.
@@ -1918,7 +1918,7 @@
httpServerRunning
onChangeEvaluate:[
- httpServerFileRoot value:(HTTPServer fileRoot).
+ "/ httpServerFileRoot value:(HTTPServer fileRoot).
httpServerHomeURL value:(HTTPServer homeURL).
httpServerPort value:(HTTPServer port).
httpServerLogFile value:(HTTPServer logFile)
@@ -2099,14 +2099,14 @@
in acceptChannel:acceptChannel.
in enableChannel:httpServerRunning.
- in := box
- addLabelledInputField:(resources string:'File Root:')
- adjust:#right
- on:httpServerFileRoot
- tabable:true
- separateAtX:0.3.
- in acceptChannel:acceptChannel.
- in enableChannel:httpServerRunning.
+"/ in := box
+"/ addLabelledInputField:(resources string:'File Root:')
+"/ adjust:#right
+"/ on:httpServerFileRoot
+"/ tabable:true
+"/ separateAtX:0.3.
+"/ in acceptChannel:acceptChannel.
+"/ in enableChannel:httpServerRunning.
in := box
addLabelledInputField:(resources string:'Home URL:')
@@ -6390,5 +6390,5 @@
!AbstractLauncherApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.289 2003-09-04 19:02:36 stefan Exp $'
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractLauncherApplication.st,v 1.290 2003-09-11 12:53:22 cg Exp $'
! !
--- a/AbstractSettingsApplication.st Wed Sep 10 18:19:56 2003 +0200
+++ b/AbstractSettingsApplication.st Thu Sep 11 14:53:22 2003 +0200
@@ -3382,7 +3382,7 @@
instances := HTTPServer runningServers asSet.
instances addAll:((self settingsDialog getAllChildrenAppsForApplication:self) collect:[:aApp| aApp httpServerInstance]).
highestUsedPortNr := instances
- inject:(HTTPServer port - 1)
+ inject:(HTTPServer defaultPort - 1)
into:[:maxSoFar :thisServer | thisServer port max:maxSoFar].
portToUse := highestUsedPortNr + 1
@@ -10897,5 +10897,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.104 2003-09-10 15:31:04 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.105 2003-09-11 12:53:06 cg Exp $'
+! !