You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2020/03/28 11:43:07 UTC
[isis] branch master updated: ISIS-2334: Schema Update: Add
optional Facet#facetType (v2.1)
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
The following commit(s) were added to refs/heads/master by this push:
new 85a81b8 ISIS-2334: Schema Update: Add optional Facet#facetType (v2.1)
85a81b8 is described below
commit 85a81b823ce876a33d1b23cd846f3b5fd839124d
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sat Mar 28 12:42:55 2020 +0100
ISIS-2334: Schema Update: Add optional Facet#facetType (v2.1)
---
api/schema/pom.xml | 2 +-
api/schema/src/main/resources/org/apache/isis/schema/bindings.xml | 2 +-
.../isis/schema/metamodel/{metamodel-2.0.xsd => metamodel-2.1.xsd} | 1 +
.../isis/core/metamodel/services/metamodel/MetaModelExporter.java | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index 6a6bf7b..4f91b46 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -121,7 +121,7 @@
<schemaInclude>cmd/cmd-2.0.xsd</schemaInclude>
<schemaInclude>ixn/ixn-2.0.xsd</schemaInclude>
<schemaInclude>chg/chg-2.0.xsd</schemaInclude>
- <schemaInclude>metamodel/metamodel-2.0.xsd</schemaInclude>
+ <schemaInclude>metamodel/metamodel-2.1.xsd</schemaInclude>
</schemaIncludes>
<bindingDirectory>src/main/resources/org/apache/isis/schema</bindingDirectory>
<bindingIncludes>
diff --git a/api/schema/src/main/resources/org/apache/isis/schema/bindings.xml b/api/schema/src/main/resources/org/apache/isis/schema/bindings.xml
index 02fed67..32f47e9 100644
--- a/api/schema/src/main/resources/org/apache/isis/schema/bindings.xml
+++ b/api/schema/src/main/resources/org/apache/isis/schema/bindings.xml
@@ -76,7 +76,7 @@
</jaxb:bindings>
</jaxb:bindings>
- <jaxb:bindings schemaLocation="metamodel/metamodel-2.0.xsd">
+ <jaxb:bindings schemaLocation="metamodel/metamodel-2.1.xsd">
<jaxb:schemaBindings>
<!--
we don't include the minor version, because the
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.1.xsd
similarity index 99%
rename from api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.0.xsd
rename to api/schema/src/main/resources/org/apache/isis/schema/metamodel/metamodel-2.1.xsd
index cdc76ab..ec8bb50 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.1.xsd
@@ -278,6 +278,7 @@
</xs:sequence>
<xs:attribute name="id" type="xs:string"/>
<xs:attribute name="fqcn" type="xs:string"/>
+ <xs:attribute name="type" type="xs:string" use="optional"/>
</xs:complexType>
<xs:complexType name="facetAttr">
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
index 07ac89e..1b8cc13 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/services/metamodel/MetaModelExporter.java
@@ -386,7 +386,7 @@ class MetaModelExporter {
final org.apache.isis.schema.metamodel.v2.Facet facetType = new org.apache.isis.schema.metamodel.v2.Facet();
facetType.setId(facet.facetType().getCanonicalName());
facetType.setFqcn(facet.getClass().getCanonicalName());
-
+ facetType.setType(facet.facetType().getCanonicalName());
addFacetAttributes(facet, facetType, config);
return facetType;