riddl 0.99.109 → 0.99.111

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2da031ad0aa59f0bec0e69bbe8e50dfccce913a6
-  data.tar.gz: 71239caa3baf80a4f45c4fa7acbb84238ad198b6
+  metadata.gz: cd715a102e43838a13d1a8afe207ffb2283f1669
+  data.tar.gz: 6dfe6e5dfb436212f8f46a20e53237e770dcb792
 SHA512:
-  metadata.gz: 591d8d2106d582a18d139c6fd1faf974814d66008c1c763a58e70236e5ec47630238ce18bc88a441a7db7191016dc7c3fda9b78149e01eaed0b7618518a3e301
-  data.tar.gz: b5dbd477183569ecf0e28410307b51f834bcc2cf8fc0dc8cc440a99ade9e4417c33393e7350bce75b2e9517c196b9a84f668cfd52b30cb9d275b1decd38bc47d
+  metadata.gz: 7f7a0a7295fed1bac22002b7495e97d628eaffa6c0a135882b1f7c920d2b63e01d30a2c198ab814351f6f5c52ba7264e0938878a2ca2a5892e6bc76df3b6d4fa
+  data.tar.gz: ddf4344367c7838d51ceed0833016fd94641183d1a45979e52c09fd0342655f935a6b799c3bca476bb49aae36dc74a98531d44f349d6c5c69ac76c3595430af8

data/lib/riddl/client.rb

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'net/https'
-require 'socket'
 require 'eventmachine'
 require 'em-websocket-client'
 require 'blather/client/client'
@@ -322,20 +321,30 @@ unless Module.constants.include?('CLIENT_INCLUDED')
               http.set_debug_output @options[:debug]
             end  
             http.start do
-              http.request(req) do |resp|
-                res = resp
-                bs = Parameter::Tempfile.new("RiddlBody")
-                res.read_body(bs)
-                bs.rewind
-                response = Riddl::Protocols::HTTP::Parser.new(
-                  "",
-                  bs,
-                  res['CONTENT-TYPE'],
-                  res['CONTENT-LENGTH'],
-                  res['CONTENT-DISPOSITION'],
-                  res['CONTENT-ID'],
-                  res['RIDDL-TYPE']
-                ).params
+              retrycount = 0
+              begin
+                http.request(req) do |resp|
+                  res = resp
+                  bs = Parameter::Tempfile.new("RiddlBody")
+                  res.read_body(bs)
+                  bs.rewind
+                  response = Riddl::Protocols::HTTP::Parser.new(
+                    "",
+                    bs,
+                    res['CONTENT-TYPE'],
+                    res['CONTENT-LENGTH'],
+                    res['CONTENT-DISPOSITION'],
+                    res['CONTENT-ID'],
+                    res['RIDDL-TYPE']
+                  ).params
+                end
+              rescue => e
+                retrycount += 1
+                if retrycount < 4
+                  retry
+                else
+                  raise Riddl::ConnectionError, "#{url.host}:#{url.port}/#{url.path} not reachable - #{e.message}."
+                end
               end
             end
             response_headers = {}

data/lib/riddl/ns/common-patterns/riddl-description/resource-show.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <message name="riddl-description-response">
+    <parameter name="riddl-description" mimetype="text/xml"/>
+  </message>
+  <message name="riddl-resource-description-request">
+    <parameter name="riddl-resource-description" type="string"/>
+  </message>
+  <resource>
+    <get in="riddl-resource-description-request" out="riddl-description-response"/>
+  </resource>
+</description>

data/lib/riddl/ns/declaration/1.0/declaration.rng

@@ -53,6 +53,11 @@
     <attribute name="name">
       <ref name="riddl-datatype-name"/>
     </attribute>
+    <optional>
+      <attribute name="everywhere">
+        <data type="boolean"/>
+      </attribute>  
+    </optional>  
     <zeroOrMore>
       <element name="apply-to">
         <ref name="riddl-datatype-pathtemplate"/>

data/lib/riddl/server.rb

@@ -253,8 +253,13 @@ module Riddl
           @riddl_status = 501 # not implemented?!
         end  
       else
-        if get 'riddl-description-request'
-          run Riddl::Utils::Description::XML, @riddl_description_string 
+        if !@riddl_message.nil? && @riddl_message.in.name == 'riddl-description-request' && @riddl_method == 'get' &&  '/' + @riddl_info[:s].join('/') == '/'
+          run Riddl::Utils::Description::RDR, @riddl_description_string 
+        elsif !@riddl_message.nil? && @riddl_message.in.name == 'riddl-resource-description-request' && @riddl_method == 'get'
+          @riddl_path = File.dirname('/' + @riddl_info[:s].join('/')).gsub(/\/+/,'/')
+          on resource File.basename('/' + @riddl_info[:s].join('/')).gsub(/\/+/,'/') do
+            run Riddl::Utils::Description::RDR, @riddl.resource_description(@riddl_matching_path[0])
+          end  
         else
           if @riddl.description?
             instance_exec(@riddl_info, &@riddl_interfaces[nil])  
@@ -459,7 +464,6 @@ module Riddl
 
       @riddl_path << (@riddl_path == '/' ? resource : '/' + resource)
 
-
       ### only descend when there is a possibility that it holds the right path
       rp = @riddl_path.sub(/\//,'').split('/')
 

data/lib/riddl/utils/description.rb

@@ -4,7 +4,7 @@ module Riddl
   module Utils
     module Description
 
-      class XML < Riddl::Implementation
+      class RDR < Riddl::Implementation
         def response
           return Riddl::Parameter::Complex.new("riddl-description","text/xml",@a[0])
         end

data/lib/riddl/wrapper.rb

@@ -56,6 +56,7 @@ module Riddl
     DESCRIPTION_FILE = "#{File.dirname(__FILE__)}/ns/description/#{VERSION_MAJOR}.#{VERSION_MINOR}/description.rng"
     DECLARATION_FILE = "#{File.dirname(__FILE__)}/ns/declaration/#{VERSION_MAJOR}.#{VERSION_MINOR}/declaration.rng"
     RIDDL_DESCRIPTION_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/show.xml"
+    RIDDL_DESCRIPTION_RESOURCE_SHOW = "#{File.dirname(__FILE__)}/ns/common-patterns/riddl-description/resource-show.xml"
     COMMON = "datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"#{DESCRIPTION}\" xmlns:xi=\"http://www.w3.org/2001/XInclude\""
     CHECK = "<element name=\"check\" datatypeLibrary=\"http://www.w3.org/2001/XMLSchema-datatypes\" xmlns=\"http://relaxng.org/ns/structure/1.0\"><data/></element>"
     #}}}
@@ -99,13 +100,21 @@ module Riddl
       @doc.register_namespace 'dec', DECLARATION
       if @is_description && get_description
         rds = XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW)
+        rrds = XML::Smart::open_unprotected(RIDDL_DESCRIPTION_RESOUCE_SHOW)
         @doc.root.prepend rds.find('/xmlns:description/xmlns:message')
-        r = @doc.find("/des:description/des:resource")
-        r.first.prepend rds.find('/xmlns:description/xmlns:resource/*') unless r.empty?
+        @doc.root.prepend rrds.find('/xmlns:description/xmlns:message')
+        @doc.find("/des:description/des:resource").each do |r|
+          r.first.prepend rds.find('/xmlns:description/xmlns:resource/*')
+        end  
+        @doc.find("/des:description//des:resource").each do |r|
+          r.first.prepend rrds.find('/xmlns:description/xmlns:resource/*')
+        end  
       end
       if @is_declaration  && get_description
         @doc.root.prepend("dec:interface",:name=>"riddldescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_SHOW).root
-        @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name =>"riddldescription")
+        @doc.root.prepend("dec:interface",:name=>"riddlresourcedescription").add XML::Smart::open_unprotected(RIDDL_DESCRIPTION_RESOURCE_SHOW).root
+        @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name => "riddldescription")
+        @doc.root.find("dec:facade").first.append('dec:tile').append("layer",:name => "riddlresourcedescription",:everywhere => 'true')
       end  
 
       @declaration = @description = nil
@@ -114,7 +123,7 @@ module Riddl
 
     def declaration
       #{{{
-      if @is_declaration
+      if @declaration.nil? && @is_declaration
         @declaration = Riddl::Wrapper::Declaration.new(@doc)
       end
       @declaration
@@ -123,7 +132,7 @@ module Riddl
       
     def description
       #{{{
-      if @is_description
+      if @description.nil? && @is_description
         @description = Riddl::Wrapper::Description.new(@doc)
       end
       @description
@@ -138,6 +147,12 @@ module Riddl
       nil
     end #}}}
 
+    def resource_description(path)
+      req = @description.get_resource(path).description_xml if @is_description
+      req = @declaration.get_resource(path).description_xml if @is_declaration
+      req.to_s
+    end
+
     def io_messages(path,operation,params,headers)
       #{{{
       description

data/lib/riddl/wrapper/declaration.rb

@@ -74,19 +74,30 @@ module Riddl
             apply_to = layer.find("dec:apply-to")
             block = layer.find("dec:block")
 
+            everywhere = layer.attributes['everywhere'] == 'true'
             lname = layer.attributes['name']
             lpath, des = @interfaces[lname]
             desres = des.find("des:resource").first
-            if apply_to.empty?
-              int = Interface.new(lname,"/",lpath,"/",des)
-              rec = desres.attributes['recursive']
-              til.add_description(des,desres,"/",index,int,block,rec)
+            if everywhere
+              @tiles.map do |til| # extract all currently existing paths for all tiles
+                rpaths(til.resource,'').map{|a,b| a}
+              end.flatten.uniq.each do |path| # apply current to all paths
+                int = Interface.new(lname,path,lpath,"/",des)
+                rec = desres.attributes['recursive']
+                til.add_description(des,desres,path,index,int,block,rec)
+              end
             else
-              apply_to.each do |at|
-                int = Interface.new(lname,at.to_s,lpath,"/",des)
-                til.add_description(des,desres,at.to_s,index,int,block)
+              if apply_to.empty?
+                int = Interface.new(lname,"/",lpath,"/",des)
+                rec = desres.attributes['recursive']
+                til.add_description(des,desres,"/",index,int,block,rec)
+              else
+                apply_to.each do |at|
+                  int = Interface.new(lname,at.to_s,lpath,"/",des)
+                  til.add_description(des,desres,at.to_s,index,int,block)
+                end
               end
-            end
+            end  
           end
           til.compose!
         end

data/lib/riddl/wrapper/declaration/facade.rb

@@ -19,6 +19,7 @@ module Riddl
             t = mess.content.dup
             name = mess.name
             name += '_' while names.include?(name)
+            names << name
             t.root.attributes['name'] = name
             messages_result << t.root.dump + "\n"
           end

data/lib/riddl/wrapper/description/resource.rb

@@ -224,6 +224,46 @@ module Riddl
         end
         private :add_to_path_and_split
 
+        def description_xml
+          collect = ''
+          messages = {}
+          messages_result = ''
+
+          if @composition.any?
+            @composition.each do |k,v|
+              v.each do |e|
+                collect << if e.result.class==Riddl::Wrapper::Description::RequestInOut
+                  messages[e.result.in.hash] = e.result.in
+                  messages[e.result.out.hash] = e.result.out if e.result.out
+                  "    <#{k} in=\"#{e.result.in.name}\"#{e.result.out.nil? ? '' : " out=\"#{e.result.out.name}\""}/>\n"
+                elsif e.result.class==Riddl::Wrapper::Description::RequestTransformation
+                  '    '
+                elsif e.result.class==Riddl::Wrapper::Description::RequestStarOut
+                  messages[e.result.out.hash] = e.result.out if e.result.out
+                  "    <#{k} in=\"*\" out=\"#{e.result.out.name}\"/>\n"
+                elsif e.result.class==Riddl::Wrapper::Description::RequestPass
+                  '   '
+                elsif e.result.class==Riddl::Wrapper::Description::WebSocket
+                  "   <websocket/>\n"
+                else
+                  ''
+                end
+              end
+            end
+          end  
+
+          names = []
+          messages.each do |hash,mess|
+            t = mess.content.dup
+            name = mess.name
+            name += '_' while names.include?(name)
+            names << name
+            t.root.attributes['name'] = name
+            messages_result << t.root.dump + "\n"
+          end
+          XML::Smart.string("<description #{Riddl::Wrapper::COMMON}>\n\n" + messages_result.gsub(/^/,'  ') + "\n  <resource>\n" + collect + "  </resource>\n</description>").to_s
+        end
+
         # add requests helper methods
         #{{{
         def add_request_in_out(index,interface,des,method,min,mout)

data/ns/common-patterns/riddl-description/resource-show.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<description xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <message name="riddl-description-response">
+    <parameter name="riddl-description" mimetype="text/xml"/>
+  </message>
+  <message name="riddl-resource-description-request">
+    <parameter name="riddl-resource-description" type="string"/>
+  </message>
+  <resource>
+    <get in="riddl-resource-description-request" out="riddl-description-response"/>
+  </resource>
+</description>

data/ns/declaration/1.0/declaration.rng

@@ -53,6 +53,11 @@
     <attribute name="name">
       <ref name="riddl-datatype-name"/>
     </attribute>
+    <optional>
+      <attribute name="everywhere">
+        <data type="boolean"/>
+      </attribute>  
+    </optional>  
     <zeroOrMore>
       <element name="apply-to">
         <ref name="riddl-datatype-pathtemplate"/>

data/riddl.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "riddl"
-  s.version          = "0.99.109"
+  s.version          = "0.99.111"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3"
   s.summary          = "restful interface description and declaration language: tools and client/server libs"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: riddl
 version: !ruby/object:Gem::Version
-  version: 0.99.109
+  version: 0.99.111
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: tools
 cert_chain: []
-date: 2013-07-03 00:00:00.000000000 Z
+date: 2013-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-smart
@@ -149,8 +149,8 @@ files:
 - lib/riddl/ns/common/relaxng.rng
 - lib/riddl/ns/common/datatypes-1_0.rng
 - lib/riddl/ns/description/1.0/description.rng
-- lib/riddl/ns/common-patterns/riddl-description/properties.xml
 - lib/riddl/ns/common-patterns/riddl-description/show.xml
+- lib/riddl/ns/common-patterns/riddl-description/resource-show.xml
 - lib/riddl/ns/common-patterns/properties/1.0/properties.xml
 - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.xsl
 - lib/riddl/ns/common-patterns/properties/1.0/properties.schema.schema
@@ -169,8 +169,8 @@ files:
 - ns/common/relaxng.rng
 - ns/common/datatypes-1_0.rng
 - ns/description/1.0/description.rng
-- ns/common-patterns/riddl-description/properties.xml
 - ns/common-patterns/riddl-description/show.xml
+- ns/common-patterns/riddl-description/resource-show.xml
 - ns/common-patterns/properties/1.0/properties.xml
 - ns/common-patterns/properties/1.0/properties.schema.xsl
 - ns/common-patterns/properties/1.0/properties.schema.schema

data/lib/riddl/ns/common-patterns/riddl-description/properties.xml

@@ -1,150 +0,0 @@
-<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <message name="value">
-    <choice>
-      <parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-        <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-          <start>
-            <choice>
-              <element name="value">
-                <ref name="value"/>
-              </element>
-              <element name="not-existing">
-                <empty/>
-              </element>  
-            </choice>
-          </start>
-
-          <define name="value">
-            <zeroOrMore>
-              <choice>
-                <text/>
-                <ref name="any"/>
-              </choice>
-            </zeroOrMore>
-          </define>
-          
-          <define name="any">
-            <element>
-              <anyName/>
-              <zeroOrMore>
-                <attribute>
-                  <anyName/>
-                </attribute>
-              </zeroOrMore>
-              <ref name="value"/>
-            </element>
-          </define>
-
-        </grammar>
-      </parameter>
-      <parameter name="value" type="string"/>
-
-      <parameter name="content" mimetype="text/xml"/>
-      <parameter name="content" mimetype="text/plain"/>
-    </choice>
-  </message>
-
-  <message name="resource-document">
-    <parameter name="document" mimetype="text/xml"/>
-  </message>
-  <message name="resource-document-schema">
-    <parameter name="document-schema" mimetype="text/xml"/>
-  </message>
-
-  <message name="properties">
-    <oneOrMore>
-      <parameter name="name" type="string"/>
-      <choice>
-        <parameter name="value" type="string"/>
-        <parameter name="value" mimetype="text/plain"/>
-        <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-        <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-      </choice>
-    </oneOrMore>
-  </message>
-
-  <message name="propertylist">
-    <parameter name="properties" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-      <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-        <start>
-          <element name="properties">
-            <zeroOrMore>
-              <ref name="property"/>
-            </zeroOrMore>  
-          </element>
-        </start>
-
-        <define name="property">
-          <element>
-            <anyName/>
-            <data type="string"/>
-          </element>
-        </define>  
-
-      </grammar>
-    </parameter>
-  </message>
-  <message name="addcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/xml"/>
-    </choice>  
-  </message>
-  <message name="updcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>  
-  </message>
-  <message name="property">
-    <parameter name="name" type="string">
-      <param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
-    </parameter>
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>
-  </message>
-  <message name="query">
-    <parameter name="query" type="string"/>
-  </message>
-
-  <resource pattern="http://riddl.org/ns/common-patterns/properties/1.0">
-    <get in="*" out="resource-document"/>
-    <get in="query" out="value"/>
-    <resource relative="schema">
-      <get in="*" out="resource-document-schema"/>
-      <resource relative="rng">
-        <get in="*" out="resource-document-schema"/>
-      </resource>  
-      <resource relative="xsd">
-        <get in="*" out="resource-document-schema"/>
-      </resource>
-    </resource>
-    <resource relative="values">
-      <get in="*" out="propertylist"/>
-      <post in="property"/>
-      <put in="properties"/>
-      <resource>
-        <get in="*" out="value"/>
-        <delete in="*"/>
-        <post in="addcontent"/>
-        <put in="updcontent"/>
-        <resource>
-          <get in="*" out="value"/>
-          <put in="updcontent"/>
-          <delete in="*"/>
-          <resource recursive='true'>
-            <get in="*" out="value"/>
-          </resource>
-        </resource>
-      </resource>
-    </resource>
-  </resource>  
-
-</description>

data/ns/common-patterns/riddl-description/properties.xml

@@ -1,150 +0,0 @@
-<description datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" xmlns="http://riddl.org/ns/description/1.0" xmlns:xi="http://www.w3.org/2001/XInclude">
-
-  <message name="value">
-    <choice>
-      <parameter name="value" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-        <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-          <start>
-            <choice>
-              <element name="value">
-                <ref name="value"/>
-              </element>
-              <element name="not-existing">
-                <empty/>
-              </element>  
-            </choice>
-          </start>
-
-          <define name="value">
-            <zeroOrMore>
-              <choice>
-                <text/>
-                <ref name="any"/>
-              </choice>
-            </zeroOrMore>
-          </define>
-          
-          <define name="any">
-            <element>
-              <anyName/>
-              <zeroOrMore>
-                <attribute>
-                  <anyName/>
-                </attribute>
-              </zeroOrMore>
-              <ref name="value"/>
-            </element>
-          </define>
-
-        </grammar>
-      </parameter>
-      <parameter name="value" type="string"/>
-
-      <parameter name="content" mimetype="text/xml"/>
-      <parameter name="content" mimetype="text/plain"/>
-    </choice>
-  </message>
-
-  <message name="resource-document">
-    <parameter name="document" mimetype="text/xml"/>
-  </message>
-  <message name="resource-document-schema">
-    <parameter name="document-schema" mimetype="text/xml"/>
-  </message>
-
-  <message name="properties">
-    <oneOrMore>
-      <parameter name="name" type="string"/>
-      <choice>
-        <parameter name="value" type="string"/>
-        <parameter name="value" mimetype="text/plain"/>
-        <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-        <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-      </choice>
-    </oneOrMore>
-  </message>
-
-  <message name="propertylist">
-    <parameter name="properties" mimetype="text/xml" handler="http://riddl.org/ns/handlers/relaxng">
-      <grammar xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes" ns="http://riddl.org/ns/common-patterns/properties/1.0">
-        <start>
-          <element name="properties">
-            <zeroOrMore>
-              <ref name="property"/>
-            </zeroOrMore>  
-          </element>
-        </start>
-
-        <define name="property">
-          <element>
-            <anyName/>
-            <data type="string"/>
-          </element>
-        </define>  
-
-      </grammar>
-    </parameter>
-  </message>
-  <message name="addcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/xml"/>
-    </choice>  
-  </message>
-  <message name="updcontent">
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>  
-  </message>
-  <message name="property">
-    <parameter name="name" type="string">
-      <param name="pattern">[a-zA-Z_][a-zA-Z0-9_]*</param>
-    </parameter>
-    <choice>
-      <parameter name="value" type="string"/>
-      <parameter name="value" mimetype="text/plain"/>
-      <parameter name="content" mimetype="text/xml"/> <!-- add everything inside the root tag -->
-      <parameter name="content" type="string"/> <!-- add everything inside the root tag -->
-    </choice>
-  </message>
-  <message name="query">
-    <parameter name="query" type="string"/>
-  </message>
-
-  <resource pattern="http://riddl.org/ns/common-patterns/properties/1.0">
-    <get in="*" out="resource-document"/>
-    <get in="query" out="value"/>
-    <resource relative="schema">
-      <get in="*" out="resource-document-schema"/>
-      <resource relative="rng">
-        <get in="*" out="resource-document-schema"/>
-      </resource>  
-      <resource relative="xsd">
-        <get in="*" out="resource-document-schema"/>
-      </resource>
-    </resource>
-    <resource relative="values">
-      <get in="*" out="propertylist"/>
-      <post in="property"/>
-      <put in="properties"/>
-      <resource>
-        <get in="*" out="value"/>
-        <delete in="*"/>
-        <post in="addcontent"/>
-        <put in="updcontent"/>
-        <resource>
-          <get in="*" out="value"/>
-          <put in="updcontent"/>
-          <delete in="*"/>
-          <resource recursive='true'>
-            <get in="*" out="value"/>
-          </resource>
-        </resource>
-      </resource>
-    </resource>
-  </resource>  
-
-</description>