Permalink
Browse files

updated schema, copyrights

  • Loading branch information...
mblakele committed Jan 22, 2012
1 parent 1df6835 commit 45e92142ad1fd39f9e5bd61923e782e90938b2e9
Showing with 46 additions and 20 deletions.
  1. +1 −1 LICENSE.txt
  2. +1 −1 README.md
  3. +1 −1 src/lib-xqut.xqy
  4. +1 −1 src/xqut.xqy
  5. +38 −14 src/xqut.xsd
  6. +1 −1 test/lib.xqy
  7. +3 −1 test/test.xml
View
@@ -1,4 +1,4 @@
-Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
@@ -155,7 +155,7 @@ declarations. Patches are welcome.
## License Information
-Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
View
@@ -1,7 +1,7 @@
xquery version "1.0-ml";
(:
- : Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+ : Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
View
@@ -1,7 +1,7 @@
xquery version "1.0-ml";
(:
- : Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+ : Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- : Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+ : Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
@@ -37,7 +37,9 @@
<xs:element name="environment">
<xs:complexType>
<xs:sequence>
- <xs:element ref="t:import"/>
+ <xs:element maxOccurs="unbounded" ref="t:import"/>
+ <xs:element maxOccurs="unbounded" ref="t:namespace"/>
+ <xs:element maxOccurs="unbounded" ref="t:variable"/>
</xs:sequence>
<xs:attribute name="database-name" use="required" type="xs:NCName"/>
<xs:attribute name="root" use="required"/>
@@ -52,7 +54,27 @@
</xs:complexType>
</xs:element>
+ <xs:element name="namespace">
+ <xs:complexType>
+ <xs:attribute name="ns" use="required" type="xs:NCName"/>
+ <xs:attribute name="prefix" use="required" type="xs:NCName"/>
+ </xs:complexType>
+ </xs:element>
+
+ <xs:element name="variable">
+ <xs:complexType>
+ <xs:simpleContent>
+ <xs:extension base="xs:anyURI">
+ <xs:attribute name="symbol" use="required" type="xs:NCName"/>
+ </xs:extension>
+ </xs:simpleContent>
+ </xs:complexType>
+ </xs:element>
+
<xs:element name="setup" type="xs:string"/>
+
+ <xs:element name="teardown" type="xs:string"/>
+
<xs:element name="unit">
<xs:complexType mixed="true">
<xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -64,11 +86,10 @@
</xs:complexType>
</xs:element>
- <xs:element name="expr" type="xs:string"/>
-
- <xs:element name="result">
+ <xs:element name="expr">
<xs:annotation>
- <xs:documentation>allow anything</xs:documentation></xs:annotation>
+ <xs:documentation>allow anything</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
<xs:complexContent>
<xs:restriction base="xs:anyType">
@@ -80,15 +101,18 @@
</xs:complexType>
</xs:element>
- <xs:element name="teardown" type="xs:string"/>
- <xs:element name="unit">
+ <xs:element name="result">
+ <xs:annotation>
+ <xs:documentation>allow anything</xs:documentation>
+ </xs:annotation>
<xs:complexType mixed="true">
- <xs:choice minOccurs="0" maxOccurs="unbounded">
- <xs:element ref="t:expr"/>
- <xs:element ref="t:result"/>
- </xs:choice>
- <xs:attribute name="note" type="xs:string"/>
- <xs:attribute name="result" type="xs:string"/>
+ <xs:complexContent>
+ <xs:restriction base="xs:anyType">
+ <xs:sequence>
+ <xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
+ </xs:sequence>
+ </xs:restriction>
+ </xs:complexContent>
</xs:complexType>
</xs:element>
View
@@ -1,7 +1,7 @@
xquery version "1.0-ml";
(:
- : Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+ : Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
View
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- : Copyright (c) 2011 Michael Blakeley. All Rights Reserved.
+ : Copyright (c) 2011-2012 Michael Blakeley. All Rights Reserved.
:
: Licensed under the Apache License, Version 2.0 (the "License");
: you may not use this file except in compliance with the License.
@@ -33,6 +33,8 @@
<setup>current-dateTime()</setup>
+ <setup>$TEST</setup>
+
<unit result="1" note="parse test">1</unit>
<unit result="-1" note="this test should fail">xdmp:random(10)</unit>

0 comments on commit 45e9214

Please sign in to comment.