SOAP and conflict fixes. I've changed SOAP::Handler to dynamically ge…

…nerate the exception-handling methods that SOAP::Lite expects. And I changed the asset_grp_ids for the media and template workflows so that they don't conflict with a new group I added to HEAD.
nlegg · Apr 1, 2003 · 25b6738 · 25b6738
1 parent 8e4fb38
commit 25b6738
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 31 deletions.
diff --git a/lib/Bric/SOAP/Handler.pm b/lib/Bric/SOAP/Handler.pm
@@ -7,15 +7,15 @@ Bric::SOAP::Handler - Apache/mod_perl handler for SOAP interfaces
 
 =head1 VERSION
 
-$Revision: 1.11 $
+$Revision: 1.11.2.1 $
 
 =cut
 
-our $VERSION = (qw$Revision: 1.11 $ )[-1];
+our $VERSION = (qw$Revision: 1.11.2.1 $ )[-1];
 
 =head1 DATE
 
-$Date: 2003-03-07 16:34:42 $
+$Date: 2003-04-01 04:36:56 $
 
 =head1 SYNOPSIS
 
@@ -103,24 +103,21 @@ my $SERVER = SOAP::Transport::HTTP::Apache->dispatch_to(@{SOAP_CLASSES()});
 # setup serializer to pretty-print XML if debugging
 $SERVER->serializer->readable(1) if DEBUG;
 
-# setup routines to serialize Bric exceptions
-sub SOAP::Serializer::as_Bric__Util__Fault__Exception__GEN {
-    [ $_[2], $_[4], escape_html($_[1]->error_info) ];
-}
-sub SOAP::Serializer::as_Bric__Util__Fault__Exception__AP {
-    [ $_[2], $_[4], escape_html($_[1]->error_info) ];
-}
-sub SOAP::Serializer::as_Bric__Util__Fault__Exception__DP {
-    [ $_[2], $_[4], escape_html($_[1]->error_info) ];
-}
-sub SOAP::Serializer::as_Bric__Util__Fault__Exception__MNI {
-    [ $_[2], $_[4], escape_html($_[1]->error_info) ];
-}
-sub SOAP::Serializer::as_Bric__Util__Fault__Exception__DA {
-    [ $_[2], $_[4], escape_html($_[1]->error_info) ];
+BEGIN {
+    # Setup routines to serialize Exception::Class-based exceptions. It needs
+    # to look like this (no, I'm not kidding):
+    # sub SOAP::Serializer::as_Bric__Util__Fault__Exception__GEN {
+    #     [ $_[2], $_[4], escape_html($_[1]->error) ];
+    # }
+
+    foreach my $ec (keys %Exception::Class::CLASSES) {
+        $ec =~ s/::/__/g;
+        eval qq{sub SOAP::Serializer::as_$ec {
+            [ \$_[2], \$_[4], escape_html(\$_[1]->error) ];
+        }};
+    }
 }
 
-
 my $commit = 1;
 my $apreq;
 

diff --git a/sql/Pg/Bric/Biz/Workflow.val b/sql/Pg/Bric/Biz/Workflow.val
@@ -1,7 +1,7 @@
 -- Project: Bricolage
--- VERSION: $Revision: 1.1.4.1 $
+-- VERSION: $Revision: 1.1.4.2 $
 --
--- $Date: 2003-03-27 23:48:10 $
+-- $Date: 2003-04-01 04:36:56 $
 -- Target DBMS: PostgreSQL 7.1.2
 -- Author: David Wheeler <david@wheeler.net>
 --
@@ -86,7 +86,7 @@ VALUES (107, 104, 207);
 
 
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id, req_desk_grp_id, head_desk_id, type, active)
-VALUES (102, 'Media', 'Media Workflow', 50, 43, 44, 105, 3, 1);
+VALUES (102, 'Media', 'Media Workflow', 51, 43, 44, 105, 3, 1);
 
 INSERT INTO member (id, grp__id, class__id, active)
 VALUES (408, 25, 44, 1);
@@ -95,13 +95,13 @@ INSERT INTO workflow_member(id, object_id, member__id)
 VALUES (2, 102, 408);
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, active)
-VALUES (50, NULL, 40, 'Workflow Assets', 'Assets group for workflow permissions', 1, 0, 1);
+VALUES (51, NULL, 40, 'Workflow Assets', 'Assets group for workflow permissions', 1, 0, 1);
 
 INSERT INTO member (id, grp__id, class__id, active)
 VALUES (181, 35, 6, 1);
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (181, 50, 181);
+VALUES (181, 51, 181);
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, active)
 VALUES (43, NULL, 40, 'All Workflow Desks', 'All desks available to a workflow', 1, 0, 1);
@@ -159,7 +159,7 @@ VALUES (113, 104, 213);
 
 
 INSERT INTO workflow (id, name, description, asset_grp_id, all_desk_grp_id, req_desk_grp_id, head_desk_id, type, active)
-VALUES (103, 'Template', 'Template Workflow', 51, 45, 46, 106, 1, 1);
+VALUES (103, 'Template', 'Template Workflow', 52, 45, 46, 106, 1, 1);
 
 INSERT INTO member (id, grp__id, class__id, active)
 VALUES (409, 25, 44, 1);
@@ -168,13 +168,13 @@ INSERT INTO workflow_member(id, object_id, member__id)
 VALUES (3, 103, 409);
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, active)
-VALUES (51, NULL, 40, 'Workflow Assets', 'Assets group for workflow permissions', 1, 0, 1);
+VALUES (52, NULL, 40, 'Workflow Assets', 'Assets group for workflow permissions', 1, 0, 1);
 
 INSERT INTO member (id, grp__id, class__id, active)
 VALUES (182, 35, 6, 1);
 
 INSERT INTO grp_member (id, object_id, member__id)
-VALUES (182, 51, 182);
+VALUES (182, 52, 182);
 
 INSERT INTO grp (id, parent_id, class__id, name, description, secret, permanent, active)
 VALUES (45, NULL, 40, 'All Workflow Desks', 'All desks available to a workflow', 1, 0, 1);

diff --git a/sql/Pg/Bric/Util/Priv.val b/sql/Pg/Bric/Util/Priv.val
@@ -1,8 +1,8 @@
 -- Project: Bricolage Business API
 -- File:    Priv.val
--- VERSION: $Revision: 1.2.4.1 $
+-- VERSION: $Revision: 1.2.4.2 $
 --
--- $Date: 2003-03-27 23:48:11 $
+-- $Date: 2003-04-01 04:36:56 $
 -- Author:  David Wheeler <david@wheeler.net>
 
 /*
@@ -98,7 +98,7 @@ INSERT INTO grp_priv (id, grp__id, value)
 VALUES(36, 8, 3);
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(36, 50);
+VALUES(36, 51);
 
 -- Give Media Producers EDIT rights to the Art desk.
 INSERT INTO grp_priv (id, grp__id, value)
@@ -133,7 +133,7 @@ INSERT INTO grp_priv (id, grp__id, value)
 VALUES(40, 9, 3);
 
 INSERT INTO grp_priv__grp_member (grp_priv__id, grp__id)
-VALUES(40, 51);
+VALUES(40, 52);
 
 -- Give Template Developers EDIT rights to the Development desk.
 INSERT INTO grp_priv (id, grp__id, value)