This is an automated email from the ASF dual-hosted git repository.

ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 874ec77291b5a9194413c8c6764a0757362ae59a
Author: Andi Huber <[email protected]>
AuthorDate: Thu Sep 8 09:34:02 2022 +0200

    ISIS-3206: [Metamodel] schema update: makes FacetAttr inherit from
    mmElement
---
 .../apache/isis/schema/metamodel/metamodel-2.0.xsd | 51 ++++++++++++----------
 1 file changed, 29 insertions(+), 22 deletions(-)

diff --git 
a/api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.0.xsd
 
b/api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.0.xsd
index 816d0d5a50..9aa2afd29a 100644
--- 
a/api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.0.xsd
+++ 
b/api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.0.xsd
@@ -311,31 +311,38 @@
                                <xs:attribute name="fqcn" type="xs:string" />
                        </xs:extension>
                </xs:complexContent>
+       </xs:complexType>
 
+       <xs:complexType name="facetAttr">
+               <xs:annotation>
+                       <xs:documentation>
+                               Describes an attribute of a facet of the 
metamodel, as a
+                               simple key/value pair of strings (the key is 
modelled as
+                               an attribute of the value).
+                       </xs:documentation>
+               </xs:annotation>
+               <xs:complexContent>
+                       <xs:extension base="metamodelElement">
+                               <xs:attribute name="name" type="xs:string">
+                                       <xs:annotation>
+                                               <xs:documentation>
+                                                       The name of the 
attribute, unique across all
+                                                       facet attributes of a 
facet.
+                                               </xs:documentation>
+                                       </xs:annotation>
+                               </xs:attribute>
+                               <xs:attribute name="value" type="xs:string">
+                                       <xs:annotation>
+                                               <xs:documentation>
+                                                       The value of the 
attribute.
+                                               </xs:documentation>
+                                       </xs:annotation>
+                               </xs:attribute>
+                       </xs:extension>
+               </xs:complexContent>
        </xs:complexType>
 
-    <xs:complexType name="facetAttr">
-        <xs:annotation>
-            <xs:documentation>Describes an attribute of a facet of the 
metamodel, as a simple key/value pair of strings (the key is modelled as an 
attribute of the value).
-            </xs:documentation>
-        </xs:annotation>
-        <xs:simpleContent>
-            <xs:extension base="xs:string">
-                <xs:annotation>
-                    <xs:documentation>The value of the attribute, unique 
across all facet attributes of a facet.
-                    </xs:documentation>
-                </xs:annotation>
-                <xs:attribute name="name" type="xs:string">
-                    <xs:annotation>
-                        <xs:documentation>The name of the attribute, unique 
across all facet attributes of a facet.
-                        </xs:documentation>
-                    </xs:annotation>
-                </xs:attribute>
-            </xs:extension>
-        </xs:simpleContent>
-    </xs:complexType>
-    
-    <xs:complexType name="annotation">
+       <xs:complexType name="annotation">
         <xs:annotation>
             <xs:documentation>Not part of the metamodel. Enables export tools 
to add arbitrary meta data.
             </xs:documentation>

Reply via email to