Hello community,
here is the log from the commit of package yast2-http-server
checked in at Wed May 30 01:13:19 CEST 2007.
--------
--- yast2-http-server/yast2-http-server.changes 2007-05-11 14:32:16.000000000 +0200
+++ /mounts/work_src_done/NOARCH/yast2-http-server/yast2-http-server.changes 2007-05-29 09:10:52.000000000 +0200
@@ -1,0 +2,6 @@
+Tue May 29 09:08:05 CEST 2007 - mzugec@suse.cz
+
+- improved workflow dialogs (host/hosts)
+- 2.15.4
+
+-------------------------------------------------------------------
Old:
----
yast2-http-server-2.15.3.tar.bz2
New:
----
yast2-http-server-2.15.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-http-server.spec ++++++
--- /var/tmp/diff_new_pack.K14427/_old 2007-05-30 01:12:44.000000000 +0200
+++ /var/tmp/diff_new_pack.K14427/_new 2007-05-30 01:12:44.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-http-server (Version 2.15.3)
+# spec file for package yast2-http-server (Version 2.15.4)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild
Name: yast2-http-server
-Version: 2.15.3
+Version: 2.15.4
Release: 1
License: GNU General Public License (GPL)
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-http-server-2.15.3.tar.bz2
+Source0: yast2-http-server-2.15.4.tar.bz2
prefix: /usr
BuildRequires: docbook-xsl-stylesheets doxygen libxslt libzio perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-dns-server yast2-network yast2-packagemanager-devel yast2-perl-bindings yast2-testsuite
Requires: yast2 yast2-network yast2-perl-bindings libzio yast2-dns-server
@@ -35,7 +35,7 @@
Stanislav Visnovsky
%prep
-%setup -n yast2-http-server-2.15.3
+%setup -n yast2-http-server-2.15.4
%build
%{prefix}/bin/y2tool y2autoconf
@@ -72,6 +72,9 @@
%doc %{prefix}/share/doc/packages/yast2-http-server
%changelog
+* Tue May 29 2007 - mzugec@suse.cz
+- improved workflow dialogs (host/hosts)
+- 2.15.4
* Fri May 11 2007 - mzugec@suse.cz
- validation for VhostID when create new virtual host (#245155)
- 2.15.3
++++++ yast2-http-server-2.15.3.tar.bz2 -> yast2-http-server-2.15.4.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/configure new/yast2-http-server-2.15.4/configure
--- old/yast2-http-server-2.15.3/configure 2007-05-11 14:25:59.000000000 +0200
+++ new/yast2-http-server-2.15.4/configure 2007-05-29 09:07:30.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for yast2-http-server 2.15.2.
+# Generated by GNU Autoconf 2.60 for yast2-http-server 2.15.3.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -559,8 +559,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-http-server'
PACKAGE_TARNAME='yast2-http-server'
-PACKAGE_VERSION='2.15.2'
-PACKAGE_STRING='yast2-http-server 2.15.2'
+PACKAGE_VERSION='2.15.3'
+PACKAGE_STRING='yast2-http-server 2.15.3'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1181,7 +1181,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-http-server 2.15.2 to adapt to many kinds of systems.
+\`configure' configures yast2-http-server 2.15.3 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1252,7 +1252,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-http-server 2.15.2:";;
+ short | recursive ) echo "Configuration of yast2-http-server 2.15.3:";;
esac
cat <<\_ACEOF
@@ -1330,7 +1330,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-http-server configure 2.15.2
+yast2-http-server configure 2.15.3
generated by GNU Autoconf 2.60
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1344,7 +1344,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-http-server $as_me 2.15.2, which was
+It was created by yast2-http-server $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
$ $0 $@
@@ -2145,7 +2145,7 @@
# Define the identity of the package.
PACKAGE='yast2-http-server'
- VERSION='2.15.2'
+ VERSION='2.15.3'
cat >>confdefs.h <<_ACEOF
@@ -2372,7 +2372,7 @@
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
@@ -3258,7 +3258,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-http-server $as_me 2.15.2, which was
+This file was extended by yast2-http-server $as_me 2.15.3, which was
generated by GNU Autoconf 2.60. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3301,7 +3301,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-yast2-http-server config.status 2.15.2
+yast2-http-server config.status 2.15.3
configured by $0, generated by GNU Autoconf 2.60,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/configure.in new/yast2-http-server-2.15.4/configure.in
--- old/yast2-http-server-2.15.3/configure.in 2007-05-11 14:25:55.000000000 +0200
+++ new/yast2-http-server-2.15.4/configure.in 2007-05-29 09:07:26.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-http-server, 2.15.2, http://bugs.opensuse.org/, yast2-http-server)
+AC_INIT(yast2-http-server, 2.15.3, http://bugs.opensuse.org/, yast2-http-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
dnl Important YaST2 variables
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-http-server"
MAINTAINER="Michal Zugec "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/dialogs.ycp new/yast2-http-server-2.15.4/src/dialogs.ycp
--- old/yast2-http-server-2.15.3/src/dialogs.ycp 2007-02-22 16:19:43.000000000 +0100
+++ new/yast2-http-server-2.15.4/src/dialogs.ycp 2007-05-29 09:08:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: dialogs.ycp 36405 2007-02-22 15:17:37Z mzugec $
+ * $Id: dialogs.ycp 38165 2007-05-29 07:08:50Z mzugec $
*/
{
@@ -257,7 +257,7 @@
// translators: dialog caption, %1 is the host name
string caption = sformat( _("SSL Configuration for '%1'"),
// translators: human-readable "default host"
- HttpServerWidgets::currenthost == "defaulthost" ? _("Default Host")
+ HttpServerWidgets::currenthost == "main" ? _("Default Host")
: HttpServerWidgets::get_host_value ( "ServerName"
, YaST::HTTPDData::GetHost(HttpServerWidgets::currenthost), HttpServerWidgets::currenthost ) );
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/HttpServerWidgets.ycp new/yast2-http-server-2.15.4/src/HttpServerWidgets.ycp
--- old/yast2-http-server-2.15.3/src/HttpServerWidgets.ycp 2007-05-11 14:30:16.000000000 +0200
+++ new/yast2-http-server-2.15.4/src/HttpServerWidgets.ycp 2007-05-29 09:08:49.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Jiri Srain
* Stanislav Visnovsky
*
- * $Id: HttpServerWidgets.ycp 37934 2007-05-11 12:30:09Z mzugec $
+ * $Id: HttpServerWidgets.ycp 38165 2007-05-29 07:08:50Z mzugec $
*/
{
@@ -202,7 +202,6 @@
// skip ourself also when this is main server
if (( host == hostid ) || (hostid == "main")) continue;
if (host == "main") continue;
-// list< map > desc = YaST::HTTPDData::GetHost (host);
// find out the server name
string value = (string)get_host_value ( "ServerName", YaST::HTTPDData::GetHost (host), nil );
if (value == servername)
@@ -214,7 +213,6 @@
break;
}
-// value = (string)get_host_value ("HostIP", desc, nil);
map vhost = YaST::HTTPDData::GetVhostType(host);
if (! FileUtils::CheckAndCreatePath( documentroot )){
@@ -319,12 +317,6 @@
]);
return nil;
}
-//symbol showAccessLogPopup (any key, map event);
-//symbol showErrorLogPopup (any key, map event);
-
-//list <string> host_ids = nil;
-
-//void OverviewInit (string widget) { }
/**
* Handle overview (listen) widget
@@ -636,8 +628,6 @@
global void storeServiceStatus (string key, map event);
global void initAdaptFirewall (string key);
global void storeAdaptFirewall (string opt_id, map event);
-//global void DirectoryOptionInit (any key, string id);
-//global void DirectoryOptionStore (any key, string id);
// wizard widget functions
global void initOpenPort (string key);
@@ -647,10 +637,9 @@
global boolean validateListenInterfaces(string key, map event);
global void initFwOpen (string key);
global void storeFwOpen (string opt_id, map event);
-//void initExpertConf (string key);
global symbol handleExpertConf (string key, map event);
void initScriptModules(string key);
-void initSummaryText(string key);
+void initSummaryText(string key);
global symbol handleBooting (string key, map event);
global map getHostOptions(boolean is_main_server);
boolean getServiceAutoStart();
@@ -677,8 +666,6 @@
// table cell description
"label" : _("Server Name"),
"widget" : `textentry,
-// "validate_type" : `function,
-// "validate_function" : validate_servername,
],
],
"DocumentRoot" : $[
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/src/wizards.ycp new/yast2-http-server-2.15.4/src/wizards.ycp
--- old/yast2-http-server-2.15.3/src/wizards.ycp 2007-02-22 16:29:41.000000000 +0100
+++ new/yast2-http-server-2.15.4/src/wizards.ycp 2007-05-29 09:08:49.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Wizards definitions
* Authors: Stanislav Visnovsky
*
- * $Id: wizards.ycp 32565 2006-08-25 08:10:40Z mzugec $
+ * $Id: wizards.ycp 38165 2007-05-29 07:08:50Z mzugec $
*/
{
@@ -20,45 +20,24 @@
include "http-server/dialogs.ycp";
include "http-server/wizard-dialog.ycp";
+define symbol MainSequence();
-/**
- * Main workflow of the http-server configuration
- * @return sequence result
- */
-symbol MainSequence() {
+symbol VirtualHostSequence(string action){
map aliases = $[
- "overview" : ``( OverviewDialog() ),
"host" : ``( HostDialog() ),
- "main-host" : ``( HostDialog() ), // different workflow
"addhost" : ``( AddHost() ),
"setvhost" : ``( SetVHostOptions() ),
"ssl" : ``( SSLDialog () ),
"dir" : ``( DirDialog () ),
- "ssl-default" : ``( SSLDialog () ),
];
+ string def = (action=="add")?"addhost":"host";
map sequence = $[
- "ws_start" : "overview",
- "overview" : $[
- `abort : `abort,
- `next : `next,
- `default : "main-host",
-// `hosts : "hosts",
- `dir : "dir",
- `ssl : "ssl-default",
- `edit : "host",
- `add : "addhost",
- ],
- "ssl-default" : $[
- `abort : `abort,
- `next : "main-host",
- `back : "main-host",
- ],
+ "ws_start" : def,
"host" : $[
`abort : `abort,
- `next : "overview",
-// `back : "hosts",
+ `next : `next, //"overview",
`ssl : "ssl",
`dir : "dir"
],
@@ -66,11 +45,10 @@
"addhost": $[
`abort : `abort,
`next : "setvhost",
-// `back : "hosts",
],
"setvhost": $[
`abort : `abort,
- `next : "overview",
+ `next : `next, //"overview",
`back : "addhost"
],
"ssl": $[
@@ -85,6 +63,51 @@
]
];
+ return Sequencer::Run(aliases, sequence);
+}
+
+/**
+ * Main workflow of the http-server configuration
+ * @return sequence result
+ */
+symbol MainSequence() {
+
+ map aliases = $[
+ "overview" : ``( OverviewDialog() ),
+ "addhost" : ``( AddHost() ),
+ "setvhost" : ``( SetVHostOptions() ),
+ "dir" : ``( DirDialog () ),
+ "add-vh" : [ ``( VirtualHostSequence("add")), true ],
+ "edit-vh" : [ ``( VirtualHostSequence("edit")), true ]
+ ];
+
+ map sequence = $[
+ "ws_start" : "overview",
+ "overview" : $[
+ `abort : `abort,
+ `next : `next,
+ `dir : "dir",
+ `edit : "edit-vh",
+ `add : "add-vh",
+ ],
+ "add-vh" : $[
+ `next : "overview" //`next
+ ],
+ "edit-vh" : $[
+ `next : "overview" //`next
+ ],
+ "setvhost": $[
+ `abort : `abort,
+ `next : "overview",
+ `back : "addhost"
+ ],
+ "dir": $[
+ `abort : `abort,
+ `next : "overview",
+ `back : "overview"
+ ]
+ ];
+
symbol ret = Sequencer::Run(aliases, sequence);
return ret;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-http-server-2.15.3/VERSION new/yast2-http-server-2.15.4/VERSION
--- old/yast2-http-server-2.15.3/VERSION 2007-05-11 14:26:44.000000000 +0200
+++ new/yast2-http-server-2.15.4/VERSION 2007-05-29 09:07:57.000000000 +0200
@@ -1 +1 @@
-2.15.3
+2.15.4
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org