Author: ckornacker Date: Fri Jan 25 16:40:36 2008 New Revision: 43919 URL: http://svn.opensuse.org/viewcvs/yast?rev=43919&view=rev Log: initial mysql-server python module Added: trunk/mysql-server/ trunk/mysql-server/.cvsignore trunk/mysql-server/MAINTAINER trunk/mysql-server/Makefile.cvs trunk/mysql-server/RPMNAME trunk/mysql-server/VERSION trunk/mysql-server/conf/ trunk/mysql-server/conf/.cvsignore trunk/mysql-server/conf/Makefile.am trunk/mysql-server/conf/cfg_myconf.scr trunk/mysql-server/configure.in.in trunk/mysql-server/doc/ trunk/mysql-server/doc/.cvsignore trunk/mysql-server/doc/Makefile.am trunk/mysql-server/doc/TODO.txt trunk/mysql-server/doc/autodocs/ trunk/mysql-server/doc/autodocs/.cvsignore trunk/mysql-server/doc/autodocs/Makefile.am trunk/mysql-server/package/ trunk/mysql-server/package/.cvsignore trunk/mysql-server/package/yast2-mysql-server.changes trunk/mysql-server/src/ trunk/mysql-server/src/.cvsignore trunk/mysql-server/src/Makefile.am trunk/mysql-server/src/Mysql.py trunk/mysql-server/src/defaults.py trunk/mysql-server/src/dialogs.py trunk/mysql-server/src/mysql.py (with props) trunk/mysql-server/src/wizards.py trunk/mysql-server/testsuite/ trunk/mysql-server/testsuite/.cvsignore trunk/mysql-server/testsuite/Makefile.am trunk/mysql-server/testsuite/README trunk/mysql-server/yast2-mysql-server.spec.in Added: trunk/mysql-server/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/.cvsignore (added) +++ trunk/mysql-server/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,22 @@ +Makefile +Makefile.am +Makefile.am.common +Makefile.in +aclocal.m4 +autom4te.cache +config.cache +config.guess +config.h +config.h.in +config.log +config.status +config.sub +configure +configure.in +depcomp +install-sh +libtool +ltmain.sh +missing +mkinstalldirs +stamp-h* Added: trunk/mysql-server/MAINTAINER URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/MAINTAINER?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/MAINTAINER (added) +++ trunk/mysql-server/MAINTAINER Fri Jan 25 16:40:36 2008 @@ -0,0 +1 @@ +Christian Kornacker Added: trunk/mysql-server/Makefile.cvs URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/Makefile.cvs?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/Makefile.cvs (added) +++ trunk/mysql-server/Makefile.cvs Fri Jan 25 16:40:36 2008 @@ -0,0 +1,18 @@ +# +# Makefile.cvs for libycp +# +configure: all + ./configure + +all: + y2tool y2autoconf + y2tool y2automake + autoreconf --force --install + +install: configure + make + make install + +reconf: all + ./config.status --recheck + ./config.status Added: trunk/mysql-server/RPMNAME URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/RPMNAME?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/RPMNAME (added) +++ trunk/mysql-server/RPMNAME Fri Jan 25 16:40:36 2008 @@ -0,0 +1 @@ +yast2-mysql-server Added: trunk/mysql-server/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/VERSION?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/VERSION (added) +++ trunk/mysql-server/VERSION Fri Jan 25 16:40:36 2008 @@ -0,0 +1 @@ +2.15.0 Added: trunk/mysql-server/conf/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/conf/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/conf/.cvsignore (added) +++ trunk/mysql-server/conf/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/mysql-server/conf/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/conf/Makefile.am?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/conf/Makefile.am (added) +++ trunk/mysql-server/conf/Makefile.am Fri Jan 25 16:40:36 2008 @@ -0,0 +1,7 @@ +# +# Makefile.am for .../mysql-server/conf +# + +scrconf_DATA = cfg_myconf.scr + +EXTRA_DIST = $(scrconf_DATA) Added: trunk/mysql-server/conf/cfg_myconf.scr URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/conf/cfg_myconf.scr?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/conf/cfg_myconf.scr (added) +++ trunk/mysql-server/conf/cfg_myconf.scr Fri Jan 25 16:40:36 2008 @@ -0,0 +1,43 @@ +# + +.etc.my + +`ag_ini( + `IniAgent("/etc/my.cnf", $[ + "options" : [ "no_nested_sections", "ignore_case", "line_can_continue", "comments_last", "repeat_names" ], + "comments": [ + "^[ \t]*$", // empty line + "^[ \t]+[;#].*$", // comment char is not first char + "^[;#][ \t]*$", // only comment chars + "^[;#][ \t]*\\[[^]]*$", // comment chars followed by '[' without matching ']' + "^[;#][^ \t[]", // comment char followed by non-blank nor '[' + "^[;#][ \t]+[^[a-z \t].*$", // comment chars followed by non a-z char nor '[' nor blank + "^[;#][ \t]+[a-z ]*[a-z][ \t]*$", // comment chars followed by a-z or blank chars + "^[;#][ \t]+[a-z ]*[a-z][ \t]*[^a-z \t=].*$", // like above, but followed by non a-z nor blank nor '=' chars + ], + "sections" : [ + $[ + "begin" : [ "^[ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "[%s]" ], + ], $[ + // this is a special type for commenting out the values + "begin" : [ "^[#;][ \t]*\\[[ \t]*(.*[^ \t])[ \t]*\\][ \t]*", "# [%s]" ], + ] + ], + // we need to exclude ; because of the second matching rule + "params" : [ + $[ + "match" : [ "^[ \t]*([a-z:_ ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "\t%s = %s"], + ], $[ + // this is a special type for commenting out the values +// "match" : [ "^[;#]+[ \t]*([a-z ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "#\t%s = %s"], + "match" : [ "^[#;][ \t]+([a-z ]*[a-z])[ \t]*=[ \t]*(.*[^ \t])[ \t]*$" , "#\t%s = %s"], + ], $[ + // rule only for writting + // comment key/value pairs with '##' instead of one '#' used for disabled items + "match" : [ "^# FAKE MATCH RULE - ONLY FOR WRITTING$" , "##\t%s = %s"], + ] + ] + ] + ) +) + Added: trunk/mysql-server/configure.in.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/configure.in.in?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/configure.in.in (added) +++ trunk/mysql-server/configure.in.in Fri Jan 25 16:40:36 2008 @@ -0,0 +1,12 @@ +## SCR agent configure.in.in + +## initialize +@YAST2-INIT-COMMON@ +@YAST2-INIT-PROGRAM@ + +## some common checks +@YAST2-CHECKS-COMMON@ +@YAST2-CHECKS-PROGRAM@ + +## and generate the output +@YAST2-OUTPUT@ Added: trunk/mysql-server/doc/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/doc/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/doc/.cvsignore (added) +++ trunk/mysql-server/doc/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/mysql-server/doc/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/doc/Makefile.am?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/doc/Makefile.am (added) +++ trunk/mysql-server/doc/Makefile.am Fri Jan 25 16:40:36 2008 @@ -0,0 +1,10 @@ +# +# Makefile.am for .../mysql-server/doc +# + +SUBDIRS = autodocs + +htmldir = $(docdir) + +html_DATA = TODO.txt +EXTRA_DIST = $(html_DATA) Added: trunk/mysql-server/doc/TODO.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/doc/TODO.txt?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/doc/TODO.txt (added) +++ trunk/mysql-server/doc/TODO.txt Fri Jan 25 16:40:36 2008 @@ -0,0 +1,13 @@ +This is a TODO file for the MysqlServer module. +---------------------------------------------- +$Id: TODO.txt 2808 2002-06-21 20:41:00Z kkaempf $ + +TODO: +----- + +- mapping the config values to my.cnf parameters +- Term to Function conversion (in python bindings) +- Fix SCR.Write() +- GUI stuff ( this really needs to be done :) ) +- documentation / help texts + Added: trunk/mysql-server/doc/autodocs/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/doc/autodocs/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/doc/autodocs/.cvsignore (added) +++ trunk/mysql-server/doc/autodocs/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,9 @@ +Makefile +Makefile.in +*.html +*.png +*.tag +doxygen.css +doxygen.log +doxygen.conf +installdox Added: trunk/mysql-server/doc/autodocs/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/doc/autodocs/Makefile.am?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/doc/autodocs/Makefile.am (added) +++ trunk/mysql-server/doc/autodocs/Makefile.am Fri Jan 25 16:40:36 2008 @@ -0,0 +1,3 @@ +# Makefile.am for .../mysql-server/doc/autodocs + +include $(top_srcdir)/autodocs-cc-off.ami Added: trunk/mysql-server/package/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/package/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/package/.cvsignore (added) +++ trunk/mysql-server/package/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,3 @@ +*.bz2 +*.tar.gz +*.spec Added: trunk/mysql-server/package/yast2-mysql-server.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/package/yast2-mysql-server.changes?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/package/yast2-mysql-server.changes (added) +++ trunk/mysql-server/package/yast2-mysql-server.changes Fri Jan 25 16:40:36 2008 @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Mon Jan 14 12:37:30 2008 - ckornacker@suse.de + +- Initial version + Added: trunk/mysql-server/src/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/.cvsignore (added) +++ trunk/mysql-server/src/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,9 @@ +Makefile +Makefile.in +*.o +*.lo +*.la +.libs +.deps +ag_mysql-server +*.kdoc Added: trunk/mysql-server/src/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/Makefile.am?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/Makefile.am (added) +++ trunk/mysql-server/src/Makefile.am Fri Jan 25 16:40:36 2008 @@ -0,0 +1,4 @@ +# +# Makefile.am for .../mysql-server/src +# + Added: trunk/mysql-server/src/Mysql.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/Mysql.py?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/Mysql.py (added) +++ trunk/mysql-server/src/Mysql.py Fri Jan 25 16:40:36 2008 @@ -0,0 +1,180 @@ +#!/usr/bin/env python + +# +# File: mysql-server/Mysql.py +# Package: Configuration of mysql-server +# Summary: SCR.Read() and SCR.Write() +# Authors: Christian Kornacker +# Jozef Uhliarik +# +# $Id: Mysql.py 43761 2008-01-21 10:01:31Z ckornacker $ +# + +from ycp import * +import gettext +from gettext import textdomain +textdomain('mysql') + +import_module('Progress') +import_module('Report') +import_module('Message') +import_module('Wizard') + +import time +from ycp import * + +# This values are going to be read +client_vars = ('port', '') +mysqld_vars = ('key_buffer', 'table_cache', 'sort_buffer_size', + 'read_buffer_size', 'read_rnd_buffer_size', + 'query_cache_size', 'bdb_cache_size', + 'innodb_data_file_path', 'innodb_buffer_pool_size', + 'innodb_log_file_size', '') +mysqldump_vars = ('') +isamchk_vars = ('key_buffer', 'sort_buffer_size', '') +myisamchk_vars = ('key_buffer', 'sort_buffer_size', '') + +def Read() : + + #/* MySQL read dialog caption */ + caption = 'Initializing the MySQL Configuration' + + steps = 2 + + Progress.New( caption, ' ', steps, [ + 'Read the current MySQL configuration', + 'Read the current MySQL state' + ], [ + + "Reading the current MySQL configuration...", + + "Reading the current MySQL state...", + + Message.Finished() + ], + '' + ) + + for var in client_vars: + client[var] = SCR.Read(Path('.etc.my.value.client.' + var)) + + for var in mysqld_vars: + mysqld[var] = SCR.Read(Path('.etc.my.value.mysqld.' + var)) + + for var in mysqldump_vars: + mysqldump[var] = SCR.Read(Path('.etc.my.value.mysqldump.' + var)) + + for var in isamchk_vars: + isamchk[var] = SCR.Read(Path('.etc.my.value.isamchk.' + var)) + + for var in myisamchk_vars: + myisamchk[var] = SCR.Read(Path('.etc.my.value.myisamchk.' + var)) + + if False: + return False + Progress.NextStage() + #/* Error message */ + if False: + Report.Error(Message.CannotReadCurrentSettings()) + time.sleep(1) + + if False: + return False + + Progress.NextStep() + #/* Error message */ + if False: + Report.Error('Cannot read the current MySQL state.') + time.sleep(1) + + if False: + return False + + Progress.NextStage () + time.sleep(1) + + return True + + + +#def Write(mysqld, client, mysqld_settings, client_settings) : +def Write() : + #/* MySQL read dialog caption */ + caption = 'Saving the MySQL Configuration' + + steps = 2 + + Progress.New(caption, ' ', steps, [ + #/* Progress stage 1/2 */ + 'Write the MySQL settings', + #/* Progress stage 2/2 */ + 'Adjust the MySQL service' + ], [ + #/* Progress step 1/2 */ + 'Writing the MySQL settings...', + #/* Progress step 2/2 */ + 'Adjusting the MySQL service...', + Message.Finished() + ], + '' + ) + +# for var in client_vars: +# SCR.Write(Path('.etc.my.value.client.' + var), client_vars[var]) +# +# for var in mysqld_vars: +# SCR.Write(Path('.etc.my.value.mysqld.' + var), mysqld_vars[var]) +# +# for var in mysqldump_vars: +# SCR.Write(Path('.etc.my.value.mysqldump.' + var), mysqldump_vars[var]) +# +# for var in isamchk_vars: +# SCR.Write(Path('.etc.my.value.isamchk.' + var), isamchk_vars[var]) +# +# for var in myisamchk_vars: +# SCR.Write(Path('.etc.my.value.myisamchk.' + var), myisamchk_vars[var]) + + time.sleep(1) + + if False: + return False + Progress.NextStage() + #/* Error message */ + if False: + Report.Error ('Cannot write the MySQL settings.') + time.sleep(1) + + if False: + return False + Progress.NextStage () + #/* Error message */ + if False: + Report.Error (Message.CannotAdjustService('mysql')) + time.sleep(1) + + Progress.NextStage () + time.sleep(1) + + return True + + +def ReadDialog(): + + Wizard.RestoreHelp('Any text for help') + Wizard.SetTitleIcon('yast-mysql') + ret = Read() + if ret: + return Symbol('next') + else: + return Symbol('abort') + + +def WriteDialog() : + Wizard.RestoreHelp('Any text for help 2') + Wizard.SetTitleIcon('yast-mysql') + ret = Write() + if ret: + return Symbol('next') + else: + return Symbol('abort') + Added: trunk/mysql-server/src/defaults.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/defaults.py?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/defaults.py (added) +++ trunk/mysql-server/src/defaults.py Fri Jan 25 16:40:36 2008 @@ -0,0 +1,184 @@ +#!/usr/bin/env python + +# +# File: mysql-server/defaults.py +# Package: Configuration of mysql-server +# Summary: default configuration settings +# Authors: Christian Kornacker +# +# $Id: defaults.py 43761 2008-01-21 10:01:31Z ckornacker $ +# + +from ycp import * +import_module('UI') + +# the settings dict consists of a list of values for the several my.cnf sections. +# the sections are: [0] => client +# [1] => mysqld +# [2] => mysqldump +# [3] => isamchk +# [4] => myisamchk +# +# i.e. if one has chosen 'Server', and the settings dict looks like this: +# Settings = { +# 'Server' : [ { 'a_client_var' : 'a_client_var_value', +# 'another_client_var' : 'another_value' }, +# { 'a_mysqld_var' : 'a_mysqld_value' }, +# {}, +# {}, +# { 'a_myisamchk_var' : 'a_myisamchk_value' } +# ] +# } +# +# the values can now be grabbed like this: +# my_choice = Settings['Server'] +# client_values = my_choice[0] +# print client_values['another_client_var'] +# >>> another_value +# + +ServerTypeSettings = { + 'Developer Machine' : [ {}, + { 'key_buffer' : '16k', + 'table_cache' : '4', + 'sort_buffer_size' : '64k', + 'read_rnd_buffer_size' : '2k' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Server' : [ {}, + { 'key_buffer' : '16M', + 'table_cache' : '64', + 'sort_buffer_size' : '512k', + 'read_buffer_size' : '256k', + 'read_rnd_buffer_size' : '512k', + 'bdb_cache_size' : '4M', + 'innodb_data_file_path' : 'ibdata1:10M:autoextend', + 'innodb_buffer_pool_size' : '16M', + 'innodb_log_file_size' : '5M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Dedicated' : [ {}, + { 'key_buffer' : '256M', + 'table_cache' : '256', + 'sort_buffer_size' : '1M', + 'read_buffer_size' : '1M', + 'read_rnd_buffer_size' : '4M', + 'query_cache_size' : '16M', + 'bdb_cache_size' : '64M', + 'innodb_data_file_path' : 'ibdata1:1000:autoextend', + 'innodb_buffer_pool_size' : '256M', + 'innodb_log_file_size' : '64M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + 'Custom' : [ {}, + {}, + {}, + {}, + {} + ] + } + + +DatabaseUsageSettings = { + 'Multifunctional' : [ {}, + { 'key_buffer' : '16k', + 'read_rnd_buffer_size' : '2k' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Transactional' : [ {}, + { 'key_buffer' : '16M', + 'innodb_log_file_size' : '5M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Non-Transactional' : [ {}, + { 'key_buffer' : '256M', + 'innodb_log_file_size' : '64M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ] + } + + +ServerConnectionSettings = { + 'Decision' : [ {}, + { 'key_buffer' : '16k', + 'read_rnd_buffer_size' : '2k' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Online' : [ {}, + { 'key_buffer' : '16M', + 'innodb_log_file_size' : '5M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Manual' : [ {}, + { 'key_buffer' : UI.QueryWidget(id('Connections'), Symbol('Value')), + 'innodb_log_file_size' : '64M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ] + } + + +CharacterSetSettings = { + 'Standard' : [ {}, + { 'key_buffer' : '16k', + 'read_rnd_buffer_size' : '2k' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Multilingual' : [ {}, + { 'key_buffer' : '16M', + 'innodb_log_file_size' : '5M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ], + + 'Manual' : [ {}, + { 'key_buffer' : UI.QueryWidget(id('charset'), Symbol('Value')), + 'innodb_log_file_size' : '64M' }, + {}, + { 'key_buffer' : '4M' }, + {} + ] + } + +ServerFeaturesSettings = { + 'all' : [ {}, + { 'TCPIP' : UI.QueryWidget(id('TCPIP'), Symbol('CurrentButton')), + 'Strict' : UI.QueryWidget(id('Strict'), Symbol('CurrentButton')) }, + {}, + {}, + } + +SecuritySettings = { + 'all' : [ {}, + { 'Password' : UI.QueryWidget(id('NewPassword'), Symbol('Value')), + 'Anonymous' : UI.QueryWidget(id('AnonymousAccount'), Symbol('Value')) }, + {}, + {} + } Added: trunk/mysql-server/src/dialogs.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/dialogs.py?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/dialogs.py (added) +++ trunk/mysql-server/src/dialogs.py Fri Jan 25 16:40:36 2008 @@ -0,0 +1,249 @@ +#!/usr/bin/env python + +# +# File: mysql-server/dialog.py +# Package: Configuration of mysql-server +# Summary: dialog +# Authors: Christian Kornacker +# +# $Id: defaults.py 43761 2008-01-21 10:01:31Z ckornacker $ +# + +from ycp import * + +import gettext +from gettext import textdomain + +textdomain('mysql') + +import_module('Label') +import_module('Wizard') +import_module('UI') + +from ycp import * +import Mysql + +from defaults import ServerTypeSettings +from defaults import DatabaseUsageSettings +from defaults import ServerConnectionSettings +from defaults import CharacterSetSettings +from defaults import ServerFeaturesSettings +from defaults import SecuritySettings + +caption = gettext.gettext('MySQL Server Configuration') + +# ShowSequenceDialog +# contents = +# values = Button/TextBox/... values +# help = the dialog's help text +# back = show 'back' button or not + +def ShowSequenceDialog(contents, values, help, back): + Wizard.SetContentsButtons(caption, contents, help, Label.BackButton(), Label.NextButton()) + Wizard.SetTitleIcon('yast-mysql') + + + for ID in values.keys(): + UI.ChangeWidget( id(ID), Symbol('Value'), values[ID]) + + if not back: + Wizard.DisableBackButton() + + ret = None; + while True : + ret = UI.UserInput() + + #abort + if ret.value == 'abort': + break + + #next + elif ret.value == 'next': + break + + break + + return ret; + +def ServerTypeDialog(): + # specify how the dialog should look like + contents = VBox( + Left(Term('Label','MySQL Server Type')), + VBox( + VSpacing(1), + Frame( + 'Server Type', + RadioButtonGroup( id( 'ServerType' ), + VBox( + Left( RadioButton( id( 'Developer Machine'), '&Developer Machine')), + Left( RadioButton( id( 'Server'), '&Server Machine')), + Left( RadioButton( id( 'Dedicated'), 'D&edicated Machine')), + Left( RadioButton( id( 'Custom'), '&Custom')) + ) + ) + ), + VStretch() + ) + ) + + # default values + # need to be read from my.cnf + values = {'Server':True} + + # help text for this dialog + help = 'Server Configuration...' + + # bring it to the screen... + ret = ShowSequenceDialog(contents, values, help, False); + + # chose the settings depending on which button the user has pressed + selection = ServerTypeSettings[UI.QueryWidget(id('ServerType'), Symbol('CurrentButton'))] + + return ret + +def DatabaseUsageDialog(): + contents = VBox( + Left(Term('Label','Database Usage')), + VBox( + VSpacing(1), + Frame( + 'Server Features', + RadioButtonGroup( id( 'DatabaseUsage' ), + VBox( + Left( RadioButton( id( 'Multifunctional'), 'Multifunctional Database')), + Left( RadioButton( id( 'Transactional'), 'Transactional Database Only')), + Left( RadioButton( id( 'Non-Transactional'), 'Non-Transactional Database Only')) + ) + ) + ), + VStretch() + ) + ) + + values = {'Transactional':True} + + help = 'Server Configuration...' + + ret = ShowSequenceDialog(contents, values, help, True); + + selection = DatabaseUsageSettings[UI.QueryWidget(id('DatabaseUsage'), Symbol('CurrentButton'))] + + return ret + + +def ServerConnectionsDialog(): + contents = VBox( + Left(Term('Label','Concurrent connections to the Server')), + VBox( + VSpacing(1), + Frame( + 'Server Features', + RadioButtonGroup( id( 'ServerConnections' ), + VBox( + Left( RadioButton( id( 'Decision'), '&Decision Support (DSS)/OLAP')), + Left( RadioButton( id( 'Online'), '&Online Transaction Processing (OLTP)')), + Left( RadioButton( id( 'Manual'), '&Manual Setting')), + VBox( + Right( TextEntry( id( 'Connections'), '&Concurrent connections:'))) + ) + ) + ), + VStretch() + ) + ) + + values = {'Decision':True} + + help = 'Server Configuration...' + + ret = ShowSequenceDialog(contents, values, help, True); + + selection = ServerConnectionSettings[UI.QueryWidget(id('ServerConnections'), Symbol('CurrentButton'))] + + return ret + +def ServerNetworkingDialog(): + contents = VBox( + Left(Term('Label','Networking Options')), + VBox( + VSpacing(1), + Frame( + 'Server Features', + VBox( + Left( CheckBox( id( 'TCPIP'), 'Enable &TCP/IP Networking')), + Left( CheckBox( id( 'Strict'), 'Enable &Strict Mode')) + ) + ), + VStretch() + ) + ) + + values = {'TCPIP':True, 'Strict':True} + + help = 'Server Configuration...' + + ret = ShowSequenceDialog(contents, values, help, True); + + return ret + +def CharacterSetDialog(): + contents = VBox( + Left(Term('Label','Character Set')), + VBox( + VSpacing(1), + Frame( + 'Server Features', + RadioButtonGroup( id( 'CharacterSet' ), + VBox( + Left( RadioButton( id( 'Standard'), '&Standard Character Set')), + Left( RadioButton( id( 'Multilingual'), '&Best for Multilingual Support')), + Left( RadioButton( id( 'Manual'), '&Manually Selected Default Character Set')), + VBox( + Right( SelectionBox( id( 'charset'), 'Character Set:', [ 'latin1', 'utf8' ])) + ) + ) + ) + ), + VStretch() + ) + ) + + values = {'Standard':True} + + help = 'Server Configuration...' + + ret = ShowSequenceDialog(contents, values, help, True); + + selection = CharacterSetSettings[UI.QueryWidget(id('CharacterSet'), Symbol('CurrentButton'))] + + return ret + +def SecurityConfigurationDialog(): + contents = VBox( + Left(Term('Label','Security Options')), + VBox( + VSpacing(1), + Frame( + 'Server Features', + VBox( + Left( CheckBox( id( 'Modify'), '&Modify MySQL Security Settings')), + VBox( + Right( Password( id( 'OldPassword'), 'Current root Password:')), + Right( Password( id( 'NewPassword'), 'New root Passsword:')), + Right( Password( id( 'Confirm'), 'Confirm new Password:')) + ), + Left( CheckBox( id( 'AnonymousAccount'), '&Create Anonymous Account')), + ) + ), + VStretch() + ) + ) + + help = 'Server Configuration...' + + values = {'AnonymousAccount':True} + + ret = ShowSequenceDialog(contents, values, help, True); + + return ret + Added: trunk/mysql-server/src/mysql.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/mysql.py?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/mysql.py (added) +++ trunk/mysql-server/src/mysql.py Fri Jan 25 16:40:36 2008 @@ -0,0 +1,79 @@ +#!/usr/bin/env python + +# +# File: mysql-server/mysql.py +# Package: Configuration of mysql-server +# Summary: module description +# Authors: Christian Kornacker +# Jozef Uhliarik +# +# $Id: mysql.py 43761 2008-01-21 10:01:31Z ckornacker $ +# + +from ycp import * +import gettext +from gettext import textdomain +textdomain('mysql') +init_ui('qt') + +import_module('Progress') +import_module('Report') +import_module('CommandLine') +import_module('Path') + +import wizards +import Mysql + +from ycp import * + + + +cmdline_description = { + 'id' : 'mysql', + 'help' : 'Configuration of mysql', + 'guihandler' : wizards.MysqlSequence, + 'initialize' : Mysql.Read(), + 'finish' : Mysql.Write(), + 'actions' : { + 'ports' : { + 'help' : 'Ports used by MySQL Server', + 'example' : [ + 'ports show', + 'ports add=3306', + 'ports remove=3306', + ], + } + }, + 'options' : { + 'show' : { + 'help' : 'Show current settings' + }, + 'add' : { + 'type' : 'string', + #// TRANSLATORS: CommandLine help + 'help' : 'Add a new record', + }, + 'remove' : { + 'type' : 'string', + #// TRANSLATORS: CommandLine help + 'help' : 'Remove a record' + } + }, + 'mappings' : { + 'ports' : [ + 'show', 'add', 'remove' + ] + } +} + +#/* main ui function */ + +if __name__ == "__main__": + + + ret = None + ret = CommandLine.Run(cmdline_description); + + print ret + + Added: trunk/mysql-server/src/wizards.py URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/src/wizards.py?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/src/wizards.py (added) +++ trunk/mysql-server/src/wizards.py Fri Jan 25 16:40:36 2008 @@ -0,0 +1,107 @@ +#!/usr/bin/env python + +# +# File: mysql-server/wizards.py +# Package: Configuration of mysql-server +# Summary: Dialog Sequence +# Authors: Christian Kornacker +# Jozef Uhliarik +# +# $Id: wizards.py 43761 2008-01-21 10:01:31Z ckornacker $ +# + +from ycp import * +import gettext +from gettext import textdomain +textdomain('mysql') + + +import_module('Sequencer') +import_module('Wizard') +import_module('UI') + + +from ycp import * +import dialogs +import Mysql + + +def MainSequence(): + + + aliases = { + 'server_type' : Code(dialogs.ServerTypeDialog), + 'server_usage' : Code(dialogs.DatabaseUsageDialog), + 'server_connections' : Code(dialogs.ServerConnectionsDialog), + 'server_networking' : Code(dialogs.ServerNetworkingDialog), + 'server_characterset' : Code(dialogs.CharacterSetDialog), + 'server_security' : Code(dialogs.SecurityConfigurationDialog) + } + + sequence = { + 'ws_start' : 'server_type', + 'server_type' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'server_usage' + }, + 'server_usage' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'server_connections' + }, + 'server_connections' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'server_networking' + }, + 'server_networking' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'server_characterset' + }, + 'server_characterset' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'server_security' + }, + 'server_security' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : Symbol('next') + } + } + + #Wizard.CreateDialog() + #Wizard.SetTitleIcon('yast-mysql') + ret = Sequencer.Run(aliases, sequence) + #UI.CloseDialog() + return ret + + + +def MysqlSequence() : + + aliases = { + 'read' : [Code(Mysql.ReadDialog), True], + 'main' : Code(MainSequence), + 'write' : Code(Mysql.WriteDialog) + } + + sequence = { + 'ws_start' : 'read', + 'read' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'main' + }, + 'main' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : 'write' + }, + 'write' : { + Symbol('abort') : Symbol('abort'), + Symbol('next') : Symbol('next') + } + } + + Wizard.CreateDialog() + Wizard.SetTitleIcon('yast-mysql') + + ret = Sequencer.Run(aliases, sequence) + + UI.CloseDialog() + return ret Added: trunk/mysql-server/testsuite/.cvsignore URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/testsuite/.cvsignore?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/testsuite/.cvsignore (added) +++ trunk/mysql-server/testsuite/.cvsignore Fri Jan 25 16:40:36 2008 @@ -0,0 +1,2 @@ +Makefile +Makefile.in Added: trunk/mysql-server/testsuite/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/testsuite/Makefile.am?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/testsuite/Makefile.am (added) +++ trunk/mysql-server/testsuite/Makefile.am Fri Jan 25 16:40:36 2008 @@ -0,0 +1,10 @@ +# +# Makefile.am for .../mysql-server/testsuite +# + +AUTOMAKE_OPTIONS = dejagnu + +clean-local: + rm -f tmp.err.* tmp.out.* site.exp site.bak + +EXTRA_DIST = README Added: trunk/mysql-server/testsuite/README URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/testsuite/README?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/testsuite/README (added) +++ trunk/mysql-server/testsuite/README Fri Jan 25 16:40:36 2008 @@ -0,0 +1 @@ +Testsuite for mysql-server. Added: trunk/mysql-server/yast2-mysql-server.spec.in URL: http://svn.opensuse.org/viewcvs/yast/trunk/mysql-server/yast2-mysql-server.spec.in?rev=43919&view=auto ============================================================================== --- trunk/mysql-server/yast2-mysql-server.spec.in (added) +++ trunk/mysql-server/yast2-mysql-server.spec.in Fri Jan 25 16:40:36 2008 @@ -0,0 +1,21 @@ +@HEADER-COMMENT@ + +@HEADER@ +BuildRequires: python yast2 yast2-devtools yast2-testsuite +Summary: - + +%description +- + +@PREP@ + +@BUILD@ + +@INSTALL@ + +@CLEAN@ + +%files +%defattr(-,root,root) +@scrconfdir@/*.scr +%doc @docdir@ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org