Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.148.2.7 -r1.148.2.8
--- openacs-4/packages/xowiki/xowiki.info	11 Feb 2014 11:58:17 -0000	1.148.2.7
+++ openacs-4/packages/xowiki/xowiki.info	26 Mar 2014 18:17:18 -0000	1.148.2.8
@@ -10,7 +10,7 @@
     <inherit-templates-p>t</inherit-templates-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.149" url="http://openacs.org/repository/download/apm/xowiki-0.149.apm">
+    <version name="0.150" url="http://openacs.org/repository/download/apm/xowiki-0.150.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A xotcl-based enterprise wiki system with multiple object types</summary>
         <release-date>2014-02-11</release-date>
@@ -55,13 +55,13 @@
         <license>BSD-Style</license>
         <maturity>2</maturity>
 
-        <provides url="xowiki" version="0.149"/>
+        <provides url="xowiki" version="0.150"/>
 	<requires url="acs-kernel" version="5.6.0"/>
         <requires url="acs-datetime" version="4.0"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="4.7d3"/>
         <requires url="general-comments" version="4.6.1"/>
-        <requires url="xotcl-core" version="0.128"/>
+        <requires url="xotcl-core" version="0.129"/>
         <requires url="acs-subsite" version="5.2"/>
 
         <callbacks>
Index: openacs-4/packages/xowiki/tcl/form-field-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/form-field-procs.tcl,v
diff -u -r1.239.2.10 -r1.239.2.11
--- openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Mar 2014 16:56:41 -0000	1.239.2.10
+++ openacs-4/packages/xowiki/tcl/form-field-procs.tcl	26 Mar 2014 18:17:19 -0000	1.239.2.11
@@ -715,19 +715,22 @@
   ###########################################################
 
   ::Serializer exportMethods {
-    ::xotcl::Class instproc extend_slot 
+    ::xotcl::Class instproc extend_slot_default 
   }
-  Class instproc extend_slot {name value} {
-    # create a mirroring slot and add the specified value to the default
+  Class instproc extend_slot_default {name value} {
+    # Search for the slot. If the slot exists, extend it's default
+    # value with the new value
     foreach c [my info heritage] {
       if {[info command ${c}::slot::$name] ne ""} {
         set value [concat $value [${c}::slot::$name default]]
         break
       }
     }
+    # create a mirroring slot with the maybe extended default
     my slots [list Attribute create $name -default $value]
   }
 
+
   ###########################################################
   #
   # ::xowiki::formfield::submit_button
@@ -753,7 +756,7 @@
   ###########################################################
 
   Class create file -superclass FormField \
-      -extend_slot validator virus \
+      -extend_slot_default validator virus \
       -parameter {
         {size 40}
         {viruscheck true}
@@ -1227,7 +1230,7 @@
 
   Class create numeric -superclass text -parameter {
     {format %.2f}
-  } -extend_slot validator numeric 
+  } -extend_slot_default validator numeric 
   numeric instproc initialize {} {
     next
     my set widget_type numeric
@@ -1347,7 +1350,7 @@
   ###########################################################
 
   Class create party_id -superclass user_id \
-      -extend_slot validator party_id_check
+      -extend_slot_default validator party_id_check
   party_id instproc check=party_id_check {value} {
     if {$value eq ""} {return 1}
     return [::xo::dc 0or1row check_party {select 1 from parties where party_id = :value}]
@@ -1360,7 +1363,7 @@
   ###########################################################
 
   Class create url -superclass text \
-      -extend_slot validator safe_url \
+      -extend_slot_default validator safe_url \
       -parameter {
         {link_label}
       }
@@ -1463,7 +1466,7 @@
   ###########################################################
 
   Class create richtext -superclass textarea \
-      -extend_slot validator safe_html \
+      -extend_slot_default validator safe_html \
       -parameter {
         plugins 
         folder_id
@@ -2762,7 +2765,7 @@
   Class create YYYY -superclass numeric -parameter {
     {size 4}
     {maxlength 4}
-  } -extend_slot validator YYYY
+  } -extend_slot_default validator YYYY
 
   YYYY instproc check=YYYY {value} {
     if {$value ne ""} {
@@ -2804,7 +2807,7 @@
   ###########################################################
 
   Class create image_url -superclass text \
-      -extend_slot validator image_check \
+      -extend_slot_default validator image_check \
       -parameter {
         href cssclass
         {float left} width height 
@@ -2932,7 +2935,7 @@
   Class create CompoundField -superclass FormField -parameter {
     {components ""}
     {CSSclass compound-field}
-  } -extend_slot validator compound
+  } -extend_slot_default validator compound
 
   CompoundField instproc check=compound {value} {
     #my msg "check compound in [my components]"
@@ -3472,7 +3475,7 @@
 
   Class create form -superclass richtext -parameter {
     {height 200}
-  } -extend_slot validator form
+  } -extend_slot_default validator form
 
   form instproc check=form {value} {
     set form $value
@@ -3492,7 +3495,7 @@
 
   Class create form_constraints -superclass textarea -parameter {
     {rows 5}
-  } -extend_slot validator form_constraints
+  } -extend_slot_default validator form_constraints
   # the form_constraints checker is defined already on the ::xowiki::Page level
 
 
Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.472.2.12 -r1.472.2.13
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Mar 2014 17:54:34 -0000	1.472.2.12
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	26 Mar 2014 18:17:19 -0000	1.472.2.13
@@ -26,22 +26,26 @@
             -validator name \
             -spec "maxlength=400,required" \
             -required false ;#true 
-        ::xo::Attribute create title \
-            -required false ;#true
-        ::xo::Attribute create description \
-            -spec "textarea,cols=80,rows=2" 
-        ::xo::Attribute create text \
-            -spec "richtext" 
+        #::xo::Attribute create title \
+        #    -required false ;#true
+        #::xo::Attribute create description \
+        #    -spec "textarea,cols=80,rows=2" 
+        #::xo::Attribute create text \
+        #    -spec "richtext" 
         ::xo::Attribute create nls_language \
             -spec {select,options=[xowiki::locales]} \
             -default [ad_conn locale]
-        ::xo::Attribute create publish_date \
-            -spec date
+        #::xo::Attribute create publish_date \
+        #    -spec date
         ::xo::Attribute create last_modified \
             -spec date
         ::xo::Attribute create creation_user \
             -spec user_id
       } \
+      -extend_slot {title -required false} \
+      -extend_slot {description -spec "textarea,cols=80,rows=2"} \
+      -extend_slot {text -spec "richtext"} \
+      -extend_slot {publish_date -spec "date"} \
       -parameter {
         {render_adp 1}
         {do_substitutions 1}