[isis] branch spring6 updated: ISIS-3306: Schema Gen.: fixes missing namespace:prefix

[ahuber]

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

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


The following commit(s) were added to refs/heads/spring6 by this push:
     new ddc3547e27 ISIS-3306: Schema Gen.: fixes missing namespace:prefix
ddc3547e27 is described below

commit ddc3547e27923ada16d8b3993f0925cf3b3e5ae6
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Mon Dec 12 20:29:03 2022 +0100

    ISIS-3306: Schema Gen.: fixes missing namespace:prefix
---
 api/schema/src/main/resources/schema/bindings.xml         | 15 +++++++++++++++
 .../apache/causeway/commons/internal/resources/_Xml.java  | 11 ++++++-----
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/api/schema/src/main/resources/schema/bindings.xml 
b/api/schema/src/main/resources/schema/bindings.xml
index d1cbada9c7..a749474eb2 100644
--- a/api/schema/src/main/resources/schema/bindings.xml
+++ b/api/schema/src/main/resources/schema/bindings.xml
@@ -32,6 +32,9 @@
             -->
             <jaxb:package name="org.apache.causeway.schema.chg.v2"/>
         </jaxb:schemaBindings>
+        <jaxb:bindings>
+            <namespace:prefix name="chg" />
+        </jaxb:bindings>
     </jaxb:bindings>
 
     <jaxb:bindings schemaLocation="ixn/ixn-2.0.xsd">
@@ -42,6 +45,9 @@
             -->
             <jaxb:package name="org.apache.causeway.schema.ixn.v2"/>
         </jaxb:schemaBindings>
+        <jaxb:bindings>
+            <namespace:prefix name="ixn" />
+        </jaxb:bindings>
     </jaxb:bindings>
     <!-- since ixn-1.3.xsd does an xs:import of common-1.2.xsd, we need to 
specify common's package bindings -->
     <jaxb:bindings schemaLocation="common/common-2.0.xsd">
@@ -52,6 +58,9 @@
             -->
             <jaxb:package name="org.apache.causeway.schema.common.v2"/>
         </jaxb:schemaBindings>
+        <jaxb:bindings>
+            <namespace:prefix name="com" />
+        </jaxb:bindings>
     </jaxb:bindings>
     <!-- since ixn-1.3.xsd does an xs:import of cmd-1.4.xsd, we need to 
specify common's package bindings -->
     <jaxb:bindings schemaLocation="cmd/cmd-2.0.xsd">
@@ -62,6 +71,9 @@
             -->
             <jaxb:package name="org.apache.causeway.schema.cmd.v2"/>
         </jaxb:schemaBindings>
+        <jaxb:bindings>
+            <namespace:prefix name="cmd" />
+        </jaxb:bindings>
     </jaxb:bindings>
 
     <jaxb:bindings schemaLocation="metamodel/metamodel-2.0.xsd">
@@ -72,5 +84,8 @@
             -->
             <jaxb:package name="org.apache.causeway.schema.metamodel.v2"/>
         </jaxb:schemaBindings>
+        <jaxb:bindings>
+            <namespace:prefix name="mml" />
+        </jaxb:bindings>
     </jaxb:bindings>
 </jaxb:bindings>
\ No newline at end of file
diff --git 
a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
 
b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
index e62b9937c6..b4ceed18de 100644
--- 
a/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
+++ 
b/commons/src/main/java/org/apache/causeway/commons/internal/resources/_Xml.java
@@ -29,6 +29,12 @@ import java.util.stream.Collectors;
 
 import javax.xml.namespace.QName;
 
+import jakarta.xml.bind.JAXBContext;
+import jakarta.xml.bind.JAXBElement;
+import jakarta.xml.bind.JAXBException;
+import jakarta.xml.bind.Marshaller;
+import jakarta.xml.bind.annotation.XmlRootElement;
+
 import org.springframework.lang.Nullable;
 
 import org.apache.causeway.commons.functional.Try;
@@ -39,11 +45,6 @@ import 
org.apache.causeway.commons.internal.collections._Maps;
 import org.apache.causeway.commons.internal.exceptions._Exceptions;
 import org.apache.causeway.commons.internal.reflection._Annotations;
 
-import jakarta.xml.bind.JAXBContext;
-import jakarta.xml.bind.JAXBElement;
-import jakarta.xml.bind.JAXBException;
-import jakarta.xml.bind.Marshaller;
-import jakarta.xml.bind.annotation.XmlRootElement;
 import lombok.Builder;
 import lombok.NonNull;
 import lombok.SneakyThrows;