svn commit: r1749415 [1/5] - in /ofbiz/site/dtds: compound-widgets.xsd simple-methods-ns.xsd site-conf-ns.xsd widget-form-ns.xsd widget-menu-ns.xsd widget-screen-ns.xsd widget-tree-ns.xsd

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r1749415 [1/5] - in /ofbiz/site/dtds: compound-widgets.xsd simple-methods-ns.xsd site-conf-ns.xsd widget-form-ns.xsd widget-menu-ns.xsd widget-screen-ns.xsd widget-tree-ns.xsd

jleroux@apache.org
Author: jleroux
Date: Tue Jun 21 04:47:51 2016
New Revision: 1749415

URL: http://svn.apache.org/viewvc?rev=1749415&view=rev
Log:
I forgot to commit/refresh the files for "Autocompletion for Compound Widget" - https://issues.apache.org/jira/browse/OFBIZ-7061

Here they are

Added:
    ofbiz/site/dtds/simple-methods-ns.xsd   (with props)
    ofbiz/site/dtds/site-conf-ns.xsd   (with props)
    ofbiz/site/dtds/widget-form-ns.xsd   (with props)
    ofbiz/site/dtds/widget-menu-ns.xsd   (with props)
    ofbiz/site/dtds/widget-screen-ns.xsd   (with props)
    ofbiz/site/dtds/widget-tree-ns.xsd   (with props)
Modified:
    ofbiz/site/dtds/compound-widgets.xsd

Modified: ofbiz/site/dtds/compound-widgets.xsd
URL: http://svn.apache.org/viewvc/ofbiz/site/dtds/compound-widgets.xsd?rev=1749415&r1=1749414&r2=1749415&view=diff
==============================================================================
--- ofbiz/site/dtds/compound-widgets.xsd (original)
+++ ofbiz/site/dtds/compound-widgets.xsd Tue Jun 21 04:47:51 2016
@@ -1,14 +1,29 @@
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           elementFormDefault="qualified">
+<xs:schema
+    xmlns:sc="http://ofbiz.apache.org/Site-Conf"
+    xmlns:sm="http://ofbiz.apache.org/Simple-Method"
+    xmlns:wf="http://ofbiz.apache.org/Widget-Form"
+    xmlns:wt="http://ofbiz.apache.org/Widget-Tree"
+    xmlns:wm="http://ofbiz.apache.org/Widget-Menu"
+    xmlns:ws="http://ofbiz.apache.org/Widget-Screen"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="qualified">
+    
+    <xs:import schemaLocation="../../webapp/dtd/site-conf-ns.xsd" namespace="http://ofbiz.apache.org/Site-Conf"/>
+    <xs:import schemaLocation="widget-menu-ns.xsd" namespace="http://ofbiz.apache.org/Widget-Menu"/>
+    <xs:import schemaLocation="widget-screen-ns.xsd" namespace="http://ofbiz.apache.org/Widget-Screen"/>
+    <xs:import schemaLocation="widget-form-ns.xsd" namespace="http://ofbiz.apache.org/Widget-Form"/>
+    <xs:import schemaLocation="widget-tree-ns.xsd" namespace="http://ofbiz.apache.org/Widget-Tree"/>
+    <xs:import schemaLocation="../../minilang/dtd/simple-methods-ns.xsd" namespace="http://ofbiz.apache.org/Simple-Method"/>
+    
     <xs:element name="compound-widgets">
         <xs:complexType>
             <xs:all minOccurs="0" maxOccurs="1">
-                <xs:element name="site-conf"/>
-                <xs:element name="menus" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="screens"/>
-                <xs:element name="trees" minOccurs="0" maxOccurs="1"/>
-                <xs:element name="forms"/>
-                <xs:element name="simple-methods"/>
+                <xs:element ref="sc:site-conf"/>
+                <xs:element ref="wm:menus" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="ws:screens"/>
+                <xs:element ref="wt:trees" minOccurs="0" maxOccurs="1"/>
+                <xs:element ref="wf:forms"/>
+                <xs:element ref="sm:simple-methods"/>
             </xs:all>
         </xs:complexType>
     </xs:element>