Changeset 3379 for cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.access.data/module.xml

Timestamp:

08/14/13 15:02:02 (11 years ago)

Author:

mwindhouwer

Message:

M urn.org.basex.rest/rest/query.dpml

• can now also handle variables with XML values
• looks in the BaseX result to see if there was an error message, if so turn that info an exception

M data*

• use the sc prefix for the SCHEMAcat namespace everywhere

M urn.org.isocat.schemacat.access.data/test/testlist.xml

• added tests for user data management

M urn.org.isocat.schemacat.access.data/access/user.dpml

• EXISTS and SOURCE work with id or principal
• NEW works
• TODO: SINK

M urn.org.isocat.schemacat.access.data/debug

• will contain debug output for test runs

File:

• cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.access.data/module.xml (modified) (3 diffs)

cats/SCHEMAcat/trunk/urn.org.isocat.schemacat.access.data/module.xml

@@ -27 +27 @@
                   <active>
                      <identifier>active:org.isocat.schemacat.access.data.user</identifier>
-                     <argument name="principal"/>
-                     <argument name="user-id" min="0" max="1" />
-                     <argument name="display-name" min="0" max="1" />
-                     <argument name="email" min="0" />
+                     <argument name="principal" min="0" max="1"/>
+                     <argument name="id" min="0" max="1"/>
+                     <argument name="display-name" min="0" max="1"/>
+                     <argument name="email" min="0"/>
                      <!-- AAM: trying to pass an arbritary number of roles (max 2 here). Not working1 -> cannot read the second role.
                      Ideally this would be used for 'roles' and 'emails'-->
@@ -36 +36 @@
                   </active>
                </grammar>
-               <verbs>EXISTS,NEW,SOURCE</verbs>
+               <verbs>EXISTS,NEW,SOURCE,SINK</verbs>
                <request>
                   <identifier>active:sloot.dpml</identifier>
@@ -94 +94 @@
          <regex>res:/test/.*</regex>
       </fileset>
-      <endpoint>
-         <!-- stop any configuration from module under test from polluting address space -->
+      <fileset>
+         <regex>res:/debug/.*</regex>
+         <mutable/>
+      </fileset>
+      <mapper>
+         <config>
+            <endpoint>
+               <grammar>
+                  <simple>res:/etc/BaseXConfig.xml</simple>
+               </grammar>
+               <request>
+                  <identifier>active:org.isocat.schemacat.admin.config</identifier>
+               </request>
+            </endpoint>
+         </config>
+         <space>
+            <import>
+               <uri>urn:org:isocat:schemacat:admin</uri>
+            </import>
+         </space>
+      </mapper>
+      <!--<endpoint>
+         <!-\- stop any configuration from module under test from polluting address space -\->
          <prototype>Limiter</prototype>
          <grammar>res:/etc/
             <regex type="anything"/>
          </grammar>
-      </endpoint>
+      </endpoint>-->
       <import>
          <!-- import the main space which we are testing -->
          <uri>urn:org:isocat:schemacat:access:data</uri>
+      </import>
+      <import>
+         <uri>urn:org:basex:rest</uri>
       </import>
       <import>