Integrating vendor r1699 and r1705

both are an addendum to vendor r1628 and make the update script as well
as the main patch work in postgresql



git-svn-id: https://svn.libreccm.org/ccm/trunk@48 8810af33-2d31-482b-a856-94f89814c4df

ccm-forum/application.xml

@@ -6,14 +6,17 @@
   release="1">
   <ccm:dependencies>
 
-    <ccm:requires name="ccm-core" version="6.5.3"/>    
+    <ccm:requires name="ccm-core" version="6.5.3" relation="ge"/>    
-    <ccm:requires name="ccm-cms" version="6.5.3"/>
+    <ccm:requires name="ccm-cms"  version="6.5.3" relation="ge"/>
   </ccm:dependencies>
   <ccm:contacts>
     <ccm:contact uri="http://www.redhat.com/software/rhea" type="website"/>
     <ccm:contact uri="mailto:rhea@redhat.com" type="support"/>
   </ccm:contacts>
   <ccm:description>
+    A threadded forum application for online discussions using the Red Hat 
+    Web Application Framework.
+
     The Red Hat Web Application Framework is a platform for writing
     database-backed web applications in Java.
   </ccm:description>

ccm-forum/pdl/com/arsdigita/forum/Forum.pdl

@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Forum.pdl 542 2005-06-03 15:17:05Z sskracic $
+// $Id: Forum.pdl 1628 2007-09-17 08:10:40Z chrisg23 $
 // $DateTime: 2004/08/17 23:26:27 $
 model com.arsdigita.forum;
 

ccm-forum/pdl/com/arsdigita/forum/Post.pdl

@@ -15,7 +15,7 @@
 // License along with this library; if not, write to the Free Software
 // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 //
-// $Id: Post.pdl 287 2005-02-22 00:29:02Z sskracic $
+// $Id: Post.pdl 1628 2007-09-17 08:10:40Z chrisg23 $
 // $DateTime: 2004/08/17 23:26:27 $
 model com.arsdigita.forum;
 

ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.2-1.4.3.sql

@@ -1 +1 @@
-@@ ../oracle-se/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
+@@ oracle-se/1.4.2-1.4.3/add-is_noticeboard.sql

ccm-forum/sql/ccm-forum/upgrade/oracle-se-1.4.3-1.4.4.sql

@@ -1 +1 @@
-@@ ../oracle-se/upgrade/1.4.3-1.4.4/add-expiry.sql
+@@ oracle-se/1.4.3-1.4.4/add-expiry.sql

ccm-forum/sql/ccm-forum/upgrade/oracle-se-6.5.0-6.5.1.sql

@@ -1,8 +1,30 @@
-@@ ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
+--
-@@ ../default/upgrade/6.5.0-6.5.1/add_groups.sql
+-- Copyright (C) chris.gilbert@westsussex.gov.uk All Rights Reserved.
-@@ ../default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql
+-- Copyright (C) pb@zes.uni-bremen.de            All Rights Reserved.
-@@ ../default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
+--
-@@ ../default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql
+-- This library is free software; you can redistribute it and/or
-@@ ../default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
+-- modify it under the terms of the GNU Lesser General Public License
-@@ ../default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql
+-- as published by the Free Software Foundation; either version 2.1 of
-@@ ../default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql
+-- the License, or (at your option) any later version.
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+
+PROMPT APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (Oracle)
+ 
+
+@@ ./oracle-se/6.5.0-6.5.1/add_privileges.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_groups.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_thread_subscriber.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_file_attachments.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_forum_introduction.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_image_uploads.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_forum_no_category_posts.sql
+@@ ./oracle-se/6.5.0-6.5.1/add_anonymous_option.sql

ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_file_attachments.sql

@@ -1,7 +1,7 @@
 create table forum_post_files  
-    (post_id  NUMBER,
+   (post_id  NUMBER,
-	 file_id  NUMBER not null,
+    file_id  NUMBER not null,
-	 file_order NUMBER);
+    file_order NUMBER);
 
 
 

ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_groups.sql

@@ -1,8 +1,8 @@
 alter table forum_forums
-add (admin_group_id NUMBER,
+add (admin_group_id   NUMBER,
-         create_group_id  NUMBER,
+     create_group_id  NUMBER,
-         respond_group_id  NUMBER,
+     respond_group_id NUMBER,
-         read_group_id  NUMBER);
+     read_group_id    NUMBER);
 
 
 alter table forum_forums add

ccm-forum/sql/ccm-forum/upgrade/oracle-se/6.5.0-6.5.1/add_image_uploads.sql

@@ -1,7 +1,7 @@
 create table forum_post_images  
-    (post_id  NUMBER,
+    (post_id     NUMBER,
-	 image_id  NUMBER not null,
+     image_id    NUMBER not null,
-	 image_order NUMBER);
+     image_order NUMBER);
 
 
 

ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.2-1.4.3.sql

@@ -1 +1 @@
-\i ../postgres/upgrade/1.4.2-1.4.3/add-is_noticeboard.sql
+\i postgres/1.4.2-1.4.3/add-is_noticeboard.sql

ccm-forum/sql/ccm-forum/upgrade/postgres-1.4.3-1.4.4.sql

@@ -1 +1 @@
-\i ../postgres/upgrade/1.4.3-1.4.4/add-expiry.sql
+\i postgres/1.4.3-1.4.4/add-expiry.sql

ccm-forum/sql/ccm-forum/upgrade/postgres-6.5.0-6.5.1.sql

@@ -1,10 +1,36 @@
-\i ../default/upgrade/6.5.0-6.5.1/add_thread_subscriber.sql
+--
-\i ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
+-- Copyright (C) chris.gilbert@westsussex.gov.uk All Rights Reserved.
-\i ../default/upgrade/6.5.0-6.5.1/add_groups.sql
+-- Copyright (C) pb@zes.uni-bremen.de            All Rights Reserved.
-\i ../default/upgrade/6.5.0-6.5.1/add_privileges.sql
+--
-\i ../default/upgrade/6.5.0-6.5.1/add_file_attachments.sql
+-- This library is free software; you can redistribute it and/or
-\i ../default/upgrade/6.5.0-6.5.1/add_forum_introduction.sql
+-- modify it under the terms of the GNU Lesser General Public License
-\i ../default/upgrade/6.5.0-6.5.1/add_image_uploads.sql
+-- as published by the Free Software Foundation; either version 2.1 of
-\i ../default/upgrade/6.5.0-6.5.1/add_forum_no_category_posts.sql
+-- the License, or (at your option) any later version.
-\i ../default/upgrade/6.5.0-6.5.1/add_anonymous_option.sql
+--
+-- This library is distributed in the hope that it will be useful,
+-- but WITHOUT ANY WARRANTY; without even the implied warranty of
+-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-- Lesser General Public License for more details.
+--
+-- You should have received a copy of the GNU Lesser General Public
+-- License along with this library; if not, write to the Free Software
+-- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+--
+
+\echo APLAWS ccm-forum 6.5.0 -> 6.5.1 Upgrade Script (PostgreSQL)
+ 
+begin;
+
+\i ./postgres/6.5.0-6.5.1/add_privileges.sql
+\i ./postgres/6.5.0-6.5.1/add_groups.sql
+\i ./postgres/6.5.0-6.5.1/add_thread_subscriber.sql
+\i ./postgres/6.5.0-6.5.1/add_file_attachments.sql
+\i ./postgres/6.5.0-6.5.1/add_forum_introduction.sql
+\i ./postgres/6.5.0-6.5.1/add_image_uploads.sql
+\i ./postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql
+\i ./postgres/6.5.0-6.5.1/add_anonymous_option.sql
+
+commit;
+
+
 

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_anonymous_option.sql

@@ -0,0 +1,3 @@
+alter table forum_forums add anonymous_posts_allowed BOOLEAN NOT NULL;
+
+update forum_forums set anonymous_posts_allowed = FALSE;

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_file_attachments.sql

@@ -0,0 +1,24 @@
+create table forum_post_files  
+   (file_id    INTEGER not null,
+    file_order INTEGER,
+    post_id    INTEGER);
+
+alter table forum_post_files add 
+    constraint FORU_POS_FILES_FILE_ID_P_IO1IR  primary key (file_id);
+
+alter table forum_post_files add 
+    constraint FORU_POS_FILES_FILE_ID_F_XBKED  foreign key (file_id)
+      references cms_files(file_id);
+
+alter table forum_post_files add 
+    constraint FORU_POS_FILES_POST_ID_F_K0XJQ  foreign key (post_id)
+      references forum_posts(post_id);
+
+
+      
+alter table forum_forums add file_attachments_allowed BOOLEAN NOT NULL;
+
+update forum_forums set file_attachments_allowed = TRUE;
+
+
+

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_introduction.sql

@@ -0,0 +1,2 @@
+ALTER TABLE FORUM_FORUMS ADD  
+  INTRODUCTION VARCHAR(4000) ;

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_forum_no_category_posts.sql

@@ -0,0 +1,3 @@
+alter table forum_forums add no_category_posts_allowed BOOLEAN NOT NULL;
+
+update forum_forums set no_category_posts_allowed = TRUE;

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_groups.sql

@@ -0,0 +1,24 @@
+alter table forum_forums add 
+    admin_group_id   INTEGER;
+alter table forum_forums add
+    constraint foru_foru_admi_grou_id_f_k0nw6 foreign key (admin_group_id)
+      references groups(group_id);
+
+alter table forum_forums add 
+    create_group_id  INTEGER;
+alter table forum_forums add
+    constraint foru_foru_crea_grou_id_f_f7x57 foreign key (create_group_id)
+      references groups(group_id);
+
+alter table forum_forums add 
+    respond_group_id INTEGER;
+alter table forum_forums add
+    constraint foru_foru_respo_gro_id_f_rnofz foreign key (respond_group_id)
+      references groups(group_id);
+
+alter table forum_forums add 
+    read_group_id    INTEGER;
+alter table forum_forums add
+    constraint foru_forum_rea_grou_id_f_itati foreign key (read_group_id)
+      references groups(group_id);
+

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_image_uploads.sql

@@ -0,0 +1,23 @@
+create table forum_post_images  
+    (post_id     INTEGER,
+     image_id    INTEGER not null,
+     image_order INTEGER);
+
+alter table forum_post_images add 
+    constraint FORU_POS_IMAGE_IMAG_ID_P_EJ2MM  PRIMARY key (image_id);
+
+alter table forum_post_images add 
+    constraint FORU_POS_IMAGE_IMAG_ID_F_WYRXA  foreign key (image_id)
+      references cms_images(image_id);
+
+alter table forum_post_images add 
+    constraint FORU_POS_IMAGE_POST_ID_F_1HH02  foreign key (post_id)
+      references forum_posts(post_id);
+
+
+alter table forum_forums add image_uploads_allowed BOOLEAN NOT NULL;
+
+update forum_forums set image_uploads_allowed = FALSE;
+
+
+

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_privileges.sql

@@ -0,0 +1,18 @@
+insert into acs_privileges (privilege)
+values ('forum_read');
+
+insert into acs_privileges (privilege)
+values ('forum_create_thread');
+
+insert into acs_privileges (privilege)
+values ('forum_respond');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_moderation', 'forum_create_thread');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_create_thread', 'forum_respond');
+
+insert into acs_privilege_hierarchy (privilege, child_privilege)
+values ('forum_respond', 'forum_read');
+

ccm-forum/sql/ccm-forum/upgrade/postgres/6.5.0-6.5.1/add_thread_subscriber.sql

@@ -0,0 +1,5 @@
+alter table forum_forums add subscribe_thread_starter BOOLEAN NOT NULL;
+
+update forum_forums set subscribe_thread_starter = FALSE;
+
+