Index: openacs-4/packages/xowiki/xowiki.info
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/xowiki.info,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/xowiki/xowiki.info	14 Dec 2005 16:12:58 -0000	1.1
+++ openacs-4/packages/xowiki/xowiki.info	15 Dec 2005 12:39:24 -0000	1.2
@@ -8,11 +8,11 @@
     <singleton-p>f</singleton-p>
     <auto-mount>xowiki</auto-mount>
 
-    <version name="0.14" url="http://openacs.org/repository/download/apm/xowiki-0.14.apm">
+    <version name="0.15" url="http://openacs.org/repository/download/apm/xowiki-0.15.apm">
         <owner url="mailto:neumann@wu-wien.ac.at">Gustaf Neumann</owner>
         <summary>A more generic xotcl-based wikis example with object types
 and subtypes based on the content repository (with category support)</summary>
-        <release-date>2005-12-08</release-date>
+        <release-date>2005-12-14</release-date>
         <description format="text/html">XoWiki is a wiki implementation for OpenACS in xotcl. Instead of trying to
 implement the full set of wiki markup commands of systems like MediaWiki,
 XoWiki is based on a rich text editor and focuses more on integration
@@ -23,7 +23,7 @@
 one could define book-structures (where a navigation structure could be built on the fly) or glossaries with differnt kind of word relationships (like synonyms, etc.). XoWiki supports pages in multiple languages and is localized (currently only for English and German). Currently, richtext and plaintext type entries are supported. Included support for adp-substitution in wiki pages and a file-selector. 0.13  supports page templates and uses the new generic form interface. Use of the oo layer for the content repository, reduced number of database interactions.</description>
         <maturity>0</maturity>
 
-        <provides url="xowiki" version="0.14"/>
+        <provides url="xowiki" version="0.15"/>
         <requires url="categories" version="1.0d3"/>
         <requires url="file-storage" version="5.1.0"/>
         <requires url="general-comments" version="4.6.1"/>
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.1 -r1.2
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	14 Dec 2005 16:12:59 -0000	1.1
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	15 Dec 2005 12:39:24 -0000	1.2
@@ -29,33 +29,33 @@
 }
 
 # the following block is legacy code
-::Generic::CrClass create CrWikiPage -superclass ::xowiki::Page \
-    -pretty_name "Wiki Page" -pretty_plural "Wiki Pages" \
-    -table_name "generic_cr_wiki_page" -id_column "page_id" \
-    -form ::xowiki::WikiForm -object_type "CrWikiPage"
+# ::Generic::CrClass create CrWikiPage -superclass ::xowiki::Page \
+#     -pretty_name "Wiki Page" -pretty_plural "Wiki Pages" \
+#     -table_name "generic_cr_wiki_page" -id_column "page_id" \
+#     -form ::xowiki::WikiForm -object_type "CrWikiPage"
 
-::Generic::CrClass create CrWikiPlainPage -superclass ::xowiki::PlainPage \
-    -pretty_name "Plain Wiki Page" -pretty_plural "Plain Wiki Pages" \
-    -table_name "generic_cr_plain_page" -id_column "ppage_id" \
-    -form ::xowiki::PlainWikiForm -object_type "CrWikiPlainPage"
+# ::Generic::CrClass create CrWikiPlainPage -superclass ::xowiki::PlainPage \
+#     -pretty_name "Plain Wiki Page" -pretty_plural "Plain Wiki Pages" \
+#     -table_name "generic_cr_plain_page" -id_column "ppage_id" \
+#     -form ::xowiki::PlainWikiForm -object_type "CrWikiPlainPage"
 
-::Generic::CrClass create PageTemplate -superclass ::xowiki::PageTemplate \
-    -pretty_name "Page Template" -pretty_plural "Page Templates" \
-    -table_name "generic_page_template" -id_column "page_template_id" \
-    -form ::xowiki::WikiForm  -object_type "PageTemplate"
+# ::Generic::CrClass create PageTemplate -superclass ::xowiki::PageTemplate \
+#     -pretty_name "Page Template" -pretty_plural "Page Templates" \
+#     -table_name "generic_page_template" -id_column "page_template_id" \
+#     -form ::xowiki::WikiForm  -object_type "PageTemplate"
  
-::Generic::CrClass create PageInstance -superclass ::xowiki::PageInstance \
-    -pretty_name "Page Instance" -pretty_plural "Page Instances" \
-    -table_name "generic_page_instance" -id_column "page_instance_id" \
-    -object_type "PageInstance" \
-    -cr_attributes {
-      ::Generic::Attribute new -attribute_name page_template -datatype integer \
-	  -pretty_name "Page Template"
-      ::Generic::Attribute new -attribute_name instance_attributes -datatype text \
-	  -pretty_name "Instance Attributes" 
-    } \
-    -form ::xowiki::PageInstanceForm \
-    -edit_form ::xowiki::PageInstanceEditForm
+# ::Generic::CrClass create PageInstance -superclass ::xowiki::PageInstance \
+#     -pretty_name "Page Instance" -pretty_plural "Page Instances" \
+#     -table_name "generic_page_instance" -id_column "page_instance_id" \
+#     -object_type "PageInstance" \
+#     -cr_attributes {
+#       ::Generic::Attribute new -attribute_name page_template -datatype integer \
+# 	  -pretty_name "Page Template"
+#       ::Generic::Attribute new -attribute_name instance_attributes -datatype text \
+# 	  -pretty_name "Instance Attributes" 
+#     } \
+#     -form ::xowiki::PageInstanceForm \
+#     -edit_form ::xowiki::PageInstanceEditForm
  
 
 if {![db_0or1row check-xowiki-table \