--- a/AbstractSettingsApplication.st Thu Jan 25 16:43:00 2007 +0100
+++ b/AbstractSettingsApplication.st Thu Jan 25 18:03:51 2007 +0100
@@ -572,6 +572,12 @@
^ self subclassResponsibility
!
+isEnabledInSettingsDialog:aSettingsDialog
+ ^ true
+
+ "Created: / 25-01-2007 / 16:47:45 / cg"
+!
+
itemPathName
^ settingsDialog getNameOfApplication:self.
! !
@@ -3815,6 +3821,7 @@
(InputFieldSpec
name: 'EntryField1'
layout: (LayoutFrame 40 0 20 0 111 0 42 0)
+ enableChannel: hasHTTPServerClass
model: portNumberChannel
type: number
immediateAccept: true
@@ -3838,6 +3845,7 @@
name: 'Button4'
translateLabel: true
model: createServer
+ enableChannel: hasHTTPServerClass
useDefaultExtent: true
)
(ActionButtonSpec
@@ -3845,6 +3853,7 @@
name: 'Button7'
translateLabel: true
model: createFcgiServer
+ enableChannel: hasFCGIServerClass
useDefaultExtent: true
)
(ActionButtonSpec
@@ -3852,6 +3861,7 @@
name: 'Button6'
translateLabel: true
model: createServerFromFile
+ enableChannel: hasHTTPServerClass
useDefaultExtent: true
)
(ActionButtonSpec
@@ -3884,6 +3894,8 @@
)
)
+
+ "Modified: / 25-01-2007 / 17:51:17 / cg"
! !
!AbstractSettingsApplication::HTTPStartServerSettingsApplication class methodsFor:'servers access'!
@@ -4204,16 +4216,44 @@
notEmpty
!
+hasFCGIServerClass
+ ^ FCGIServer notNil
+
+ "Created: / 25-01-2007 / 17:50:14 / cg"
+!
+
+hasHTTPServerClass
+ ^ self serverClass notNil
+
+ "Created: / 25-01-2007 / 17:50:03 / cg"
+!
+
hasUnsavedChanges
^ false
!
+isEnabledInSettingsDialog:aSettingsDialog
+ ^ true
+"/ ^ self serverClass notNil
+"/ or:[ HTTPServer notNil
+"/ or:[ FCGIServer notNil ]]
+
+ "Created: / 25-01-2007 / 16:48:18 / cg"
+ "Modified: / 25-01-2007 / 17:49:24 / cg"
+!
+
serverClass
"answer the default class for instanciating servers.
Note that we may instanciate FCGIServer as well"
^ HTTPServer
+!
+
+whyDisabledInSettingsDialogInfo
+ ^ 'there is no HTTPServer class in the system'
+
+ "Created: / 25-01-2007 / 17:16:46 / cg"
! !
!AbstractSettingsApplication::KbdMappingSettingsAppl class methodsFor:'image specs'!
@@ -5814,7 +5854,7 @@
label: 'SmallTeam Server enabled'
name: 'CheckBox4'
layout: (LayoutFrame 5 0 0 0 600 0 22 0)
- enableChannel: smallTeamAvailable
+ enableChannel: smallTeamServerAvailable
model: smallTeamServerEnabled
translateLabel: true
)
@@ -6024,6 +6064,8 @@
)
)
+
+ "Modified: / 25-01-2007 / 17:54:04 / cg"
! !
!AbstractSettingsApplication::MiscCommunicationSettingsAppl methodsFor:'actions'!
@@ -8584,7 +8626,7 @@
label: 'SQL Server Enabled'
name: 'EnableCheckBox'
layout: (LayoutFrame 5 0 0 0 -5 1 22 0)
- enableChannel: hasRDoitServerClass
+ enableChannel: hasSQLServerClass
model: sqlServerEnabled
translateLabel: true
)
@@ -8608,7 +8650,7 @@
(InputFieldSpec
name: 'EntryField1'
layout: (LayoutFrame 150 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlServerPort
acceptOnReturn: true
acceptOnTab: true
@@ -8636,7 +8678,7 @@
label: 'Log Errors'
name: 'ErrorLoggingCheckBox'
layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlErrorLogging
translateLabel: true
)
@@ -8654,7 +8696,7 @@
label: 'Log Requests'
name: 'LogRequestsCheckBox'
layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlLogging
translateLabel: true
)
@@ -8672,7 +8714,7 @@
label: 'Log Data'
name: 'LogDataCheckBox'
layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlDataLogging
translateLabel: true
)
@@ -8690,7 +8732,7 @@
label: 'Debug Errors'
name: 'DebugErrorsCheckBox'
layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlErrorDebugging
translateLabel: true
)
@@ -8712,7 +8754,7 @@
label: 'Virtual Smalltalk Tables Enabled'
name: 'EnableSmalltalkCheckBox'
layout: (LayoutFrame 25 0 0 0 -5 1 22 0)
- enableChannel: rDoitsEnabled
+ enableChannel: sqlServerEnabled
model: sqlSmalltalkServerEnabled
translateLabel: true
)
@@ -8729,19 +8771,24 @@
)
)
+
+ "Modified: / 25-01-2007 / 17:48:20 / cg"
! !
!AbstractSettingsApplication::SQLServerSettingsAppl methodsFor:'actions'!
basicReadSettings
- (self hasSQLServer and:[SQLServer::SQLServer isLoaded]) ifTrue:[
- self sqlServerEnabled value:SQLServer::SQLServer serverRunning.
- self sqlSmalltalkServerEnabled value:SQLServer::SQLServer isSmalltalkServerEnabled.
- self sqlLogging value:SQLServer::SQLServer isLogging.
- self sqlErrorLogging value:SQLServer::SQLServer isErrorLogging.
- self sqlDataLogging value:SQLServer::SQLServer isDataLogging.
- self sqlErrorDebugging value:SQLServer::SQLServer isErrorCatching not.
- self sqlServerPort value:SQLServer::SQLServer defaultPort
+ |sqlServerClass|
+
+ sqlServerClass := self sqlServerClass.
+ (sqlServerClass notNil and:[sqlServerClass isLoaded]) ifTrue:[
+ self sqlServerEnabled value:sqlServerClass serverRunning.
+ self sqlSmalltalkServerEnabled value:sqlServerClass isSmalltalkServerEnabled.
+ self sqlLogging value:sqlServerClass isLogging.
+ self sqlErrorLogging value:sqlServerClass isErrorLogging.
+ self sqlDataLogging value:sqlServerClass isDataLogging.
+ self sqlErrorDebugging value:sqlServerClass isErrorCatching not.
+ self sqlServerPort value:sqlServerClass defaultPort
] ifFalse:[
self sqlServerEnabled value:false.
self sqlSmalltalkServerEnabled value:false.
@@ -8751,37 +8798,43 @@
self sqlErrorDebugging value:false.
self sqlServerPort value:nil
].
+
+ "Modified: / 25-01-2007 / 17:40:53 / cg"
!
basicSaveSettings
- |shouldRun port|
+ |sqlServerClass shouldRun port|
+
+ sqlServerClass := self sqlServerClass.
port := self sqlServerPort value.
port isNumber ifFalse:[
port := port asInteger.
].
- SQLServer::SQLServer defaultPort:port.
- SQLServer::SQLServer logging:self sqlLogging value.
- SQLServer::SQLServer errorLogging:self sqlErrorLogging value.
- SQLServer::SQLServer dataLogging:self sqlDataLogging value.
- SQLServer::SQLServer errorCatching:(self sqlErrorDebugging value not).
- SQLServer::SQLServer smalltalkServerEnabled:(self sqlSmalltalkServerEnabled value).
+ sqlServerClass defaultPort:port.
+ sqlServerClass logging:self sqlLogging value.
+ sqlServerClass errorLogging:self sqlErrorLogging value.
+ sqlServerClass dataLogging:self sqlDataLogging value.
+ sqlServerClass errorCatching:(self sqlErrorDebugging value not).
+ sqlServerClass smalltalkServerEnabled:(self sqlSmalltalkServerEnabled value).
shouldRun := self sqlServerEnabled value.
- shouldRun ~~ SQLServer::SQLServer serverRunning ifTrue:[
+ shouldRun ~~ sqlServerClass serverRunning ifTrue:[
shouldRun ifFalse:[
- SQLServer::SQLServer stop
+ sqlServerClass stop
] ifTrue:[
- SQLServer::SQLServer start.
+ sqlServerClass start.
"/ must wait a bit; give it a chance to
"/ really start (before checking)
Delay waitForSeconds:1.
- SQLServer::SQLServer serverRunning ifFalse:[
+ sqlServerClass serverRunning ifFalse:[
self warn:'SQLServer startup failed (see stderr).'
]
]
].
+
+ "Modified: / 25-01-2007 / 17:41:20 / cg"
!
helpFilename
@@ -8852,43 +8905,56 @@
self updateModifiedChannel.
self sqlServerEnabled value ifTrue:[
sqlServerPort value isEmptyOrNil ifTrue:[
- sqlServerPort value:(SQLServer::SQLServer defaultPort)
+ sqlServerPort value:(self sqlServerClass defaultPort)
]
]
+
+ "Modified: / 25-01-2007 / 17:46:07 / cg"
!
sqlSmalltalkServerEnabledChanged
self updateModifiedChannel.
self sqlSmalltalkServerEnabled value ifTrue:[
sqlServerPort value isEmptyOrNil ifTrue:[
- sqlServerPort value:(SQLServer::SQLServer defaultPort)
+ sqlServerPort value:(self sqlServerClass defaultPort)
]
]
+
+ "Modified: / 25-01-2007 / 17:40:03 / cg"
! !
!AbstractSettingsApplication::SQLServerSettingsAppl methodsFor:'queries'!
-hasSQLServer
- ^ SQLServer::SQLServer notNil and:[SQLServer::SQLServer isLoaded]
-!
-
hasSQLServerClass
- ^ SQLServer::SQLServer notNil
+ ^ self sqlServerClass notNil
+
+ "Created: / 25-01-2007 / 17:45:54 / cg"
!
hasUnsavedChanges
- (self hasSQLServer and:[SQLServer::SQLServer isLoaded]) ifTrue:[
- self sqlServerEnabled value ~= SQLServer::SQLServer serverRunning ifTrue:[^ true].
- SQLServer::SQLServer serverRunning ifTrue:[
- self sqlSmalltalkServerEnabled value ~= SQLServer::SQLServer isSmalltalkServerEnabled ifTrue:[^ true].
- self sqlLogging value ~= SQLServer::SQLServer isLogging ifTrue:[^ true].
- self sqlErrorLogging value ~= SQLServer::SQLServer isErrorLogging ifTrue:[^ true].
- self sqlDataLogging value ~= SQLServer::SQLServer isDataLogging ifTrue:[^ true].
- self sqlErrorDebugging value ~= SQLServer::SQLServer isErrorCatching not ifTrue:[^ true].
- self sqlServerPort value ~= SQLServer::SQLServer defaultPort ifTrue:[^ true].
- ]
+ |sqlServerClass|
+
+ sqlServerClass := self sqlServerClass.
+ (sqlServerClass notNil and:[sqlServerClass isLoaded]) ifFalse:[^ false ].
+
+ self sqlServerEnabled value ~= sqlServerClass serverRunning ifTrue:[^ true].
+ sqlServerClass serverRunning ifTrue:[
+ self sqlSmalltalkServerEnabled value ~= sqlServerClass isSmalltalkServerEnabled ifTrue:[^ true].
+ self sqlLogging value ~= sqlServerClass isLogging ifTrue:[^ true].
+ self sqlErrorLogging value ~= sqlServerClass isErrorLogging ifTrue:[^ true].
+ self sqlDataLogging value ~= sqlServerClass isDataLogging ifTrue:[^ true].
+ self sqlErrorDebugging value ~= sqlServerClass isErrorCatching not ifTrue:[^ true].
+ self sqlServerPort value ~= sqlServerClass defaultPort ifTrue:[^ true].
].
^ false
+
+ "Modified: / 25-01-2007 / 17:47:32 / cg"
+!
+
+sqlServerClass
+ ^ SQLServer::SQLServer
+
+ "Created: / 25-01-2007 / 17:29:59 / cg"
! !
!AbstractSettingsApplication::STCCompilerSettingsAppl class methodsFor:'defaults'!
@@ -14120,5 +14186,5 @@
!AbstractSettingsApplication class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.274 2007-01-25 15:43:00 cg Exp $'
-! !
+ ^ '$Header: /cvs/stx/stx/libtool/AbstractSettingsApplication.st,v 1.275 2007-01-25 17:03:51 cg Exp $'
+! !