Index: openacs-4/packages/xowf/xowf.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/xowf.info,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/xowf/xowf.info	28 Aug 2014 08:24:56 -0000	1.1
+++ openacs-4/packages/xowf/xowf.info	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -9,17 +9,20 @@
     <implements-subsite-p>f</implements-subsite-p>
     <inherit-templates-p>t</inherit-templates-p>
     
-    <version name="0.38" url="http://openacs.org/repository/download/apm/xowf-0.38.apm">
+    <version name="0.40" url="http://openacs.org/repository/download/apm/xowf-0.40.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>XoWiki Content Flow - an XoWiki based workflow system implementing state-based behavior of wiki pages and forms</summary>
-        <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <release-date>2014-02-14</release-date>
+        <vendor url="http://wu.ac.at">WU Vienna</vendor>
         <maturity>2</maturity>
 
-        <provides url="xowf" version="0.38"/>
+        <provides url="xowf" version="0.40"/>
         <requires url="xowiki" version="0.150"/>
 
         <callbacks>
+            <callback type="after-instantiate"  proc="::xowf::after-instantiate"/>
+            <callback type="before-uninstall"  proc="::xowiki::before-uninstall"/>
+            <callback type="before-uninstantiate"  proc="::xowiki::before-uninstantiate"/>
         </callbacks>
         <parameters>
             <parameter scope="instance" datatype="string"  min_n_values="1"  max_n_values="1"  name="parameter_page"  description="::xowiki::FormPage to search for parameters. The page name has to contain a language prefix and can refer to a different xowiki instance.
Index: openacs-4/packages/xowf/tcl/xowf-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/tcl/xowf-procs.tcl,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/xowf/tcl/xowf-procs.tcl	28 Aug 2014 08:24:56 -0000	1.1
+++ openacs-4/packages/xowf/tcl/xowf-procs.tcl	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -954,7 +954,7 @@
     # we make sure that we only check the redirect on views
     # without content.
 
-    #my msg "view [self args]"
+    #my msg "view [self args] [my is_wf_instance]"
 
     if {[my is_wf_instance] && $content eq ""} {
       set ctx [::xowf::Context require [self]]
@@ -1320,7 +1320,8 @@
       # We have a workflow page. Get the initial state of the workflow
       # instance from the workflow.
       #
-      my instvar instance_attributes
+      #my instvar instance_attributes
+      set instance_attributes ""
       set ctx [::xowf::Context require [self]]
       foreach p [$ctx defined ::xowiki::formfield::FormField] {
         set name [$p name]
@@ -1342,7 +1343,7 @@
       ## save instance attributes
       #set instance_attributes [array get __ia]
       #my msg "[self] [my name] setting default parameter"
-      #my msg ia=$instance_attributes,props=[$ctx defined Property]
+      #my log ia=$instance_attributes,props=[$ctx defined Property]
 
       my state [$ctx get_current_state]
       #my msg "setting initial state to '[my state]'"
Index: openacs-4/packages/xowf/www/index.vuh
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/index.vuh,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/xowf/www/index.vuh	28 Aug 2014 08:24:56 -0000	1.1
+++ openacs-4/packages/xowf/www/index.vuh	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -12,9 +12,8 @@
   {-m view}
   {-folder_id:integer 0}
 }
-# body=[ns_conn content]
-::$package_id log "--starting... [ns_conn url] [ns_conn query] \n\
-	form vars = [ns_set array [ns_getform]]"
+::$package_id log "--starting... [ns_conn url] [ns_conn query]"
+#	"form vars = [ns_set array [ns_getform]]"
 ::$package_id reply_to_user [::$package_id invoke -method $m]
 ::$package_id log "--i ::$package_id DONE"
 ad_script_abort
Index: openacs-4/packages/xowf/www/prototypes/Parameter.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Parameter.form.page,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowf/www/prototypes/Parameter.form.page	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -0,0 +1,34 @@
+# -*- tcl-*-
+::xowiki::Form new \
+    -set name en:Parameter.form \
+    -title "XoWiki Parameter Form" \
+    -set anon_instances t \
+    -set text {} \
+    -set form {{<form>
+@MenuBar@ 
+@top_includelet@
+@production_mode@
+@with_delicious@ @with_digg@ @with_general_comments@ 
+@with_notifications@ @with_tags@ @with_user_tracking@ 
+@ExtraMenuEntries@ @security_policy@
+@_description@ @_nls_language@
+</form>} text/html} \
+    -set form_constraints {
+MenuBar:boolean,horizontal=true
+top_includelet:text,default=none
+{_title:text,default=Parameter Page}
+_creator:hidden
+production_mode:boolean,horizontal=true,default=t
+with_delicious:boolean,horizontal=true,default=f
+with_digg:boolean,horizontal=true,default=f
+{with_general_comments:boolean,horizontal=true,default=f,label=User Comments}
+with_notifications:boolean,horizontal=true,default=f
+with_tags:boolean,horizontal=true,default=f
+with_user_tracking:boolean,horizontal=true
+_page_order:omit _description:omit
+{ExtraMenuEntries:textarea,cols=80,rows=4,default={form_link -name New.Extra.Workflow -label "New Workflow" -form en:workflow.form}}
+security_policy:default=::xowiki::policy1
+}
+
+
+
Index: openacs-4/packages/xowf/www/prototypes/Workflow.form.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/Workflow.form.page,v
diff -u -N
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ openacs-4/packages/xowf/www/prototypes/Workflow.form.page	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -0,0 +1,19 @@
+# -*- tcl-*-
+::xowiki::Form new \
+    -set name en:Workflow.form \
+    -title "Workflow Form" \
+    -set anon_instances f \
+    -set text {@_text@ @workflow_definition@ Form Constraints: @form_constraints@} \
+    -set form {{<form>@workflow_definition@ @_text@ @form_constraints@ @_nls_language@</form>} text/html} \
+    -set form_constraints {
+{_name:help_text=Name of the workflow (ends typically with .wf)}
+workflow_definition:workflow_definition
+form_constraints:form_constraints
+{_title:label=Workflow Title}
+{_description:omit}
+{_page_order:omit}
+{_text:label=Description}
+}
+
+
+
Index: openacs-4/packages/xowf/www/prototypes/index.page
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowf/www/prototypes/index.page,v
diff -u -N -r1.1 -r1.1.2.1
--- openacs-4/packages/xowf/www/prototypes/index.page	28 Aug 2014 08:24:57 -0000	1.1
+++ openacs-4/packages/xowf/www/prototypes/index.page	1 Sep 2014 11:01:22 -0000	1.1.2.1
@@ -1,16 +1,20 @@
 ::xowiki::Page new -title "Index Page" -text {
 
 <p>
-This is the default start page of XoWiki. You can edit this page and save it to provide a personalized look of the XoWiki instance. You can as well provide a different index page through configuration. 
+This is the default start page of XoWf. You can edit this page and save it to provide a 
+personalized look of the XoWiki instance. You can as well provide a different index page through configuration. 
 You can also view the contents of the Wiki in a <a href='./weblog'>weblog</a> style. 
-For more details, consult the [[http://media.wu-wien.ac.at/download/xowiki-doc/|XoWiki documentation]]. 
+For more details, consult the [[http://alice.wu.ac.at:8000/xowf-intro/prepare|XoWf Tutorial]]. 
 </p>
+
 <p>
-A user can define <a href='/notifications/manage'>notifications</a>
-for the whole XoWiki instance (by clicking on the notifications button
-in the menu bar or for categories (by clicking on the letter symbol
-next to the category entries at the bottom of the page)
+Workflows defined in this Package:
 </p>
+
+ {{form-usages -form en:workflow.form -parent_id * -csv false -with_form_link false}}
+
+<p>Activity Overview:</p>
+
 >>left-col<<
 {{recent -max_entries 25}}
 >><<