ruote 0.9.19 → 0.9.20

data/lib/openwfe/util/observable.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 module OpenWFE
 
@@ -58,7 +44,8 @@ module OpenWFE
     #
     def add_observer (channel, observer=nil, &callback)
 
-      observer = callback unless observer
+      #observer = callback unless observer
+      observer ||= callback
       (@observers[channel] ||= []) << observer
       observer
     end
@@ -71,15 +58,9 @@ module OpenWFE
     #
     def remove_observer (observer, channel=nil)
 
-      channels = if channel
-        [ channel ]
-      else
-        @observers.keys
-      end
+      channels = channel ? [ channel ] : @observers.keys
 
-      channels.each do |c|
-        do_remove_observer observer, c
-      end
+      channels.each { |c| do_remove_observer(observer, c) }
     end
 
     protected
@@ -127,7 +108,7 @@ module OpenWFE
 
         return false unless observers
 
-        observers.each { |obs| obs.call channel, *args }
+        observers.each { |obs| obs.call(channel, *args) }
 
         (observers.size > 0)
           #

data/lib/openwfe/util/ometa.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2006-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
-#
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
-#
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Copyright (c) 2006-2009, John Mettraux, jmettraux@gmail.com
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+#
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 module OpenWFE
 

data/lib/openwfe/util/treechecker.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'openwfe/service'
 #require 'rufus/treechecker'

data/lib/openwfe/util/workqueue.rb

@@ -1,41 +1,27 @@
-#
 #--
-# Copyright (c) 2007-2008, John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2007-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
-# John Mettraux at openwfe.org
-#
 
 require 'thread'
 require 'openwfe/utils'
@@ -55,24 +41,35 @@ module OpenWFE
       super
 
       @queue = Queue.new
-
       @stopped = false
 
-      thread_name = "#{service_name} (engine #{get_engine.object_id})"
+      #thread_name = "#{service_name} (engine #{get_engine.object_id})"
+      #OpenWFE::call_in_thread(thread_name, self) do
+      #  loop do
+      #    work = @queue.pop
+      #    break if work == :stop
+      #    target, method_name, args = work
+      #    target.send(method_name, *args)
+      #  end
+      #end
 
-      OpenWFE::call_in_thread thread_name, self do
+      # the workqueue warns and immediately resumes in case of error.
 
+      t = Thread.new do
         loop do
-
-          work = @queue.pop
-
-          break if work == :stop
-
-          target, method_name, args = work
-
-          target.send method_name, *args
+          begin
+            work = @queue.pop
+            break if work == :stop
+            target, method_name, args = work
+            target.send(method_name, *args)
+          rescue Exception => e
+            lwarn {
+              "#{caller_name} caught an exception\n#{OpenWFE.exception_to_s(e)}"
+            }
+          end
         end
       end
+      t[:name] = "#{service_name} (engine #{get_engine.object_id})"
     end
 
     #
@@ -98,7 +95,7 @@ module OpenWFE
     def stop
 
       @stopped = true
-      @queue.push :stop
+      @queue.push(:stop)
     end
 
     #
@@ -106,9 +103,13 @@ module OpenWFE
     #
     def push (target, method_name, *args)
 
+      #fei = args.find { |e| e.respond_to?(:fei) }
+      #fei = fei.fei.to_s if fei
+      #p [ :push, method_name, args.find { |e| e.is_a?(Symbol) }, fei ]
+
       if @stopped
 
-        target.send method_name, *args
+        target.send(method_name, *args)
           #
           # degraded mode : as if there were no workqueue
       else

data/lib/openwfe/util/xml.rb

@@ -1,39 +1,27 @@
-#
 #--
-# Copyright (c) 2008 John Mettraux, OpenWFE.org
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
+# Copyright (c) 2008-2009, John Mettraux, jmettraux@gmail.com
 #
-# . Redistributions of source code must retain the above copyright notice, this
-#   list of conditions and the following disclaimer.
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
 #
-# . Redistributions in binary form must reproduce the above copyright notice,
-#   this list of conditions and the following disclaimer in the documentation
-#   and/or other materials provided with the distribution.
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
 #
-# . Neither the name of the "OpenWFE" nor the names of its contributors may be
-#   used to endorse or promote products derived from this software without
-#   specific prior written permission.
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
 #
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
+# Made in Japan.
 #++
-#
 
-#
-# "made in Japan"
-#
 
 require 'openwfe/rexml'
 require 'builder'
@@ -70,194 +58,60 @@ end
 
 module OpenWFE
 
-  #
-  # Simple methods for converting launchitems and workitems from and to
-  # XML.
-  #
-  # There are also the from_xml(xml) and the to_xml(object) methods
-  # that are interesting (though limited).
-  #
   module Xml
 
-    #--
-    # launchitems
-    #++
-
     #
-    # Turns a launchitem into an XML String
+    # This method is used by all the to_xml methods, it ensures a builder
+    # is available via the :builder key in the options hash.
     #
-    def self.launchitem_to_xml (li, indent=0)
-
-      b = Builder::XmlMarkup.new :indent => indent
-
-      b.instruct!
-
-      b.launchitem do
-        b.workflow_definition_url li.workflow_definition_url
-        b.attributes do
-          hash_to_xml b, li.attributes
-        end
-      end
-
-      b.target!
-    end
-
+    # Usage example :
     #
-    # Given some XML (string or rexml doc/elt), extracts the LaunchItem
-    # instance.
+    #    builder(options) do |xml|
+    #      xml.hash do
+    #        h.each do |k, v|
+    #          xml.entry do
+    #            object_to_xml k, options
+    #            object_to_xml v, options
+    #          end
+    #        end
+    #      end
+    #    end
     #
-    def self.launchitem_from_xml (xml)
-
-      root = to_element xml, 'launchitem'
-
-      li = LaunchItem.new
-
-      li.wfdurl = text root, 'workflow_definition_url'
-
-      li.attributes = object_from_xml(
-        root.owfe_first_elt_child('attributes').owfe_first_elt_child)
-
-      li
-    end
-
-    #--
-    # flow expression id
-    #++
-
-    def self.fei_to_xml (fei, indent=0)
-
-      b = Builder::XmlMarkup.new :indent => indent
-
-      b.instruct!
-
-      _fei_to_xml b, fei
-
-      b.target!
-    end
-
-    def self.fei_from_xml (xml)
-
-      xml = to_element xml, 'flow_expression_id'
-
-      fei = FlowExpressionId.new
-
-      FlowExpressionId::FIELDS.each do |f|
-        fei.send "#{f}=", text(xml, f.to_s)
+    def self.builder (options={}, &block)
+      if b = options[:builder]
+        block.call(b)
+      else
+        b = Builder::XmlMarkup.new(:indent => (options[:indent] || 0))
+        options[:builder] = b
+        b.instruct! unless options[:instruct] == false
+        block.call(b)
+        b.target!
       end
-
-      fei
     end
 
-    #--
-    # workitems
-    #++
-
-    #
-    # Turns an [InFlow]WorkItem into some XML.
-    #
-    def self.workitem_to_xml (wi, indent=0)
-
-      b = Builder::XmlMarkup.new :indent => indent
-
-      b.instruct!
-
-      _workitem_to_xml b, wi
-
-      b.target!
-    end
-
-    #
-    # Pipes a workitem into a XML builder
-    #
-    def self._workitem_to_xml (builder, wi)
-
-      atts = {}
-      atts['href'] = wi.uri if wi.uri
-
-      builder.workitem(atts) do
-
-        _fei_to_xml builder, wi.fei # flow expression id
-
-        builder.last_modified to_httpdate(wi.last_modified)
-
-        builder.participant_name wi.participant_name
-
-        builder.dispatch_time to_httpdate(wi.dispatch_time)
-        #builder.filter ...
-        builder.store wi.store
-
-        builder.attributes do
-          hash_to_xml builder, wi.attributes
+    def self.object_to_xml (o, options={})
+
+      builder(options) do |xml|
+        case o
+          when true then xml.true
+          when false then xml.false
+          when nil then xml.null
+          when Numeric then xml.number(o.to_s)
+          when Hash then hash_to_xml(o, options)
+          when Array then array_to_xml(o, options)
+          when String then xml.string(o.to_s)
+          when Symbol then xml.symbol(o.to_s)
+          else xml.object(o.to_s)
         end
       end
     end
 
     #
-    # Extracts an [InFlow]WorkItem instance from some XML.
-    #
-    def self.workitem_from_xml (xml)
-
-      root = to_element xml, 'workitem'
-
-      wi = InFlowWorkItem.new
-
-      wi.uri = root.attribute('href')
-      wi.uri = wi.uri.value if wi.uri
-
-      wi.fei = fei_from_xml root.elements['flow_expression_id']
-
-      wi.last_modified = from_httpdate(text(root, 'last_modified'))
-      wi.participant_name = text root, 'participant_name'
-      wi.dispatch_time = from_httpdate(text(root, 'dispatch_time'))
-
-      wi.attributes = object_from_xml(
-        root.owfe_first_elt_child('attributes').owfe_first_elt_child)
-
-      wi
-    end
-
-    #
-    # Extracts a list of workitems from some XML.
-    #
-    def self.workitems_from_xml (xml)
-
-      root = to_element xml, 'workitems'
-
-      root.owfe_elt_children.collect do |elt|
-        workitem_from_xml elt
-      end
-    end
-
-    #--
-    # cancelitems
-    #++
-
-    def self.cancelitem_to_xml (ci)
-
-      nil # TODO : implement me
-    end
-
-    def self.cancelitem_from_xml (xml)
-
-      nil # TODO : implement me
-    end
-
-    #
-    # An 'internal' method, turning an object into some XML.
+    # an alias
     #
-    def self.object_to_xml (xml, o)
-
-      return xml.true if o == true
-      return xml.false if o == false
-      return xml.null if o == nil
-      return xml.number(o.to_s) if o.is_a?(Numeric)
-
-      return hash_to_xml(xml, o) if o.is_a?(Hash)
-      return array_to_xml(xml, o) if o.is_a?(Array)
-
-      return xml.string(o.to_s) if o.is_a?(String)
+    def self.to_xml (o, options={})
 
-      xml.object o.to_s
+      object_to_xml(o, options)
     end
 
     #
@@ -285,17 +139,13 @@ module OpenWFE
     end
 
     #
-    # from_xml, the other way
+    # Like to_xml(o) but instead of returning a String, returns a REXML
+    # Element
     #
-    def self.to_xml (o, indent=0, instruct = false)
+    def self.to_rexml (o)
 
-      b = Builder::XmlMarkup.new :indent => indent
-
-      b.instruct! if instruct
-
-      object_to_xml b, o
-
-      b.target!
+      d = REXML::Document.new(to_xml(o))
+      d.root
     end
 
     private
@@ -318,18 +168,6 @@ module OpenWFE
       # OUT
       #++
 
-      def self._fei_to_xml (xml, fei)
-
-        xml.flow_expression_id do
-          FlowExpressionId::FIELDS.each do |f|
-            xml.tag! f.to_s, fei.send(f)
-          end
-
-          xml.fei_short fei.to_s
-            # a short, 1 string version of the fei
-        end
-      end
-
       def self.to_element (xml, root_name=nil)
 
         xml = if xml.is_a?(REXML::Element)
@@ -340,28 +178,35 @@ module OpenWFE
           REXML::Document.new(xml).root
         end
 
-        raise "not the XML of a #{root_name} ('#{xml.name}')" \
-          if root_name and (xml.name != root_name)
+        #raise "not the XML of a #{root_name} ('#{xml.name}')" \
+        #  if root_name and (xml.name != root_name)
+        return nil if root_name and (xml.name != root_name)
 
         xml
       end
 
-      def self.hash_to_xml (xml, h)
+      def self.hash_to_xml (h, options={})
 
-        xml.hash do
-          h.each do |k, v|
-            xml.entry do
-              object_to_xml xml, k
-              object_to_xml xml, v
+        tagname = options.delete(:tag) || 'hash'
+
+        builder(options) do |xml|
+          xml.tag!(tagname) do
+            h.each do |k, v|
+              xml.entry do
+                object_to_xml(k, options)
+                object_to_xml(v, options)
+              end
             end
           end
         end
       end
 
-      def self.array_to_xml (xml, a)
+      def self.array_to_xml (a, options={})
 
-        xml.array do
-          a.each { |o| object_to_xml xml, o }
+        builder(options) do |xml|
+          xml.array do
+            a.each { |o| object_to_xml(o, options) }
+          end
         end
       end
 
@@ -375,7 +220,8 @@ module OpenWFE
       #
       def self.text (parent, elt_name)
 
-        parent.elements[elt_name].text
+        elt = parent.elements[elt_name]
+        elt ? elt.text : nil
       end
 
       def self.object_from_xml (elt)