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 2022/12/12 18:43:01 UTC

[isis] 02/02: ISIS-3306: [Schema] Generation fixes

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

commit e605244f560345368c231b4338bab0daa6a1a4c4
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Dec 12 19:42:51 2022 +0100

    ISIS-3306: [Schema] Generation fixes
---
 .../supplemental-ui/schema/common/common-2.0.xsd   |   2 +-
 antora/supplemental-ui/schema/common/common.xsd    |   2 +-
 api/schema/pom.xml                                 | 160 ++++++++++++++-------
 api/schema/src/main/java/module-info.java          |   2 +-
 .../schema/bindings.xjb => schema/bindings.xml}    |  10 +-
 .../apache/causeway => }/schema/chg/chg-2.0.xsd    |   4 +-
 .../apache/causeway => }/schema/cmd/cmd-2.0.xsd    |  16 +--
 .../causeway => }/schema/common/common-2.0.xsd     |  30 ++--
 .../apache/causeway => }/schema/ixn/ixn-2.0.xsd    |  16 +--
 .../schema/metamodel/metamodel-2.0.xsd             |  28 ++--
 10 files changed, 165 insertions(+), 105 deletions(-)

diff --git a/antora/supplemental-ui/schema/common/common-2.0.xsd b/antora/supplemental-ui/schema/common/common-2.0.xsd
index b8a7e867b6..6ae35d7f7e 100644
--- a/antora/supplemental-ui/schema/common/common-2.0.xsd
+++ b/antora/supplemental-ui/schema/common/common-2.0.xsd
@@ -25,7 +25,7 @@
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
            xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
            jaxb:extensionBindingPrefixes="xjc"
-           jaxb:version="1.0">
+           jaxb:version="2.1">
            
 	<xs:annotation>
 	   <xs:appinfo>
diff --git a/antora/supplemental-ui/schema/common/common.xsd b/antora/supplemental-ui/schema/common/common.xsd
index b8a7e867b6..6ae35d7f7e 100644
--- a/antora/supplemental-ui/schema/common/common.xsd
+++ b/antora/supplemental-ui/schema/common/common.xsd
@@ -25,7 +25,7 @@
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
            xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
            jaxb:extensionBindingPrefixes="xjc"
-           jaxb:version="1.0">
+           jaxb:version="2.1">
            
 	<xs:annotation>
 	   <xs:appinfo>
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index d411808425..af3b4117ed 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -57,37 +57,8 @@
 			</activation>
 
 			<build>
-
 				<plugins>
-					<plugin>
-					    <groupId>org.codehaus.mojo</groupId>
-					    <artifactId>jaxb2-maven-plugin</artifactId>
-					    <version>3.1.0</version>
-					    <executions>
-					        <execution>
-					            <id>xjc</id>
-					            <goals>
-					                <goal>xjc</goal>
-					            </goals>
-					        </execution>
-					    </executions>
-					    <configuration>
-					        <xjbSources>
-					            <xjbSource>src/main/resources/org/apache/causeway/schema/bindings.xjb</xjbSource>
-					        </xjbSources>
-					        <sources>
-								<source>src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd</source>
-								<source>src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd</source>
-								<source>src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd</source>
-								<source>src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd</source>
-								<source>src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd</source>
-					        </sources>
-					        <outputDirectory>${basedir}/target/generated-sources/xjc</outputDirectory>
-					        <clearOutputDir>false</clearOutputDir>
-					    </configuration>
-					</plugin>
-					
-					<!-- 
+
 					<plugin>
 						<groupId>org.jvnet.jaxb2.maven2</groupId>
 						<artifactId>maven-jaxb2-plugin</artifactId>
@@ -100,17 +71,13 @@
 									<goal>generate</goal>
 								</goals>
 								<configuration>
-									<schemaDirectory>src/main/resources/org/apache/causeway/schema</schemaDirectory>
+									<schemaDirectory>src/main/resources/schema</schemaDirectory>
 									<schemaIncludes>
-										<schemaInclude>common/common-2.0.xsd</schemaInclude>
-										<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>**/*.xsd</schemaInclude>
 									</schemaIncludes>
-									<bindingDirectory>src/main/resources/org/apache/causeway/schema</bindingDirectory>
+									<bindingDirectory>src/main/resources/schema</bindingDirectory>
 									<bindingIncludes>
-										<bindingInclude>bindings.xml</bindingInclude>
+										<bindingInclude>**/bindings.xml</bindingInclude>
 									</bindingIncludes>
 									<args>
 										<arg>-extension</arg>
@@ -118,27 +85,34 @@
 										<arg>-Xannotate</arg>
 									</args>
 									<extension>true</extension>
-									<plugins>
-										<plugin>
-											<groupId>org.jvnet.jaxb2_commons</groupId>
-											<artifactId>jaxb2-basics-annotate</artifactId>
-											<version>1.1.0</version>
-										</plugin>
-									</plugins>
 								</configuration>
 							</execution>
 						</executions>
 						<dependencies>
+							<dependency>
+							      <groupId>jakarta.xml.bind</groupId>
+							      <artifactId>jakarta.xml.bind-api</artifactId>
+							      <version>4.0.0</version>
+						    </dependency>
+						    <dependency>
+							      <groupId>jakarta.inject</groupId>
+							      <artifactId>jakarta.inject-api</artifactId>
+							      <version>2.0.1</version>
+						    </dependency>
+						    <dependency>
+							    <groupId>javax.xml.bind</groupId>
+							    <artifactId>jaxb-api</artifactId>
+							    <version>2.3.0</version>
+							</dependency>
 							<dependency>
 								<groupId>org.jvnet.jaxb2_commons</groupId>
 								<artifactId>jaxb2-namespace-prefix</artifactId>
 								<version>1.3</version>
 							</dependency>
 							<dependency>
-								
-								<groupId>org.glassfish.jaxb</groupId>
-								<artifactId>jaxb-runtime</artifactId>
-								<version>2.3.3</version>
+								<groupId>org.jvnet.jaxb2_commons</groupId>
+								<artifactId>jaxb2-basics-annotate</artifactId>
+								<version>1.1.0</version>
 							</dependency>
 						</dependencies>
 					</plugin>
@@ -161,9 +135,93 @@
 							</execution>
 						</executions>
 					</plugin>
+					<plugin>
+		                <groupId>org.apache.maven.plugins</groupId>
+		                <artifactId>maven-antrun-plugin</artifactId>
+		                <executions>
+		                    <execution>
+		                        <id>patch-javax-to-jakarta-ns</id>
+		                        <phase>generate-sources</phase>
+		                        <goals>
+		                            <goal>run</goal>
+		                        </goals>
+		                        <configuration>
+		                            <target>
+										<replace 
+											dir="target/generated-sources/xjc"
+											token="javax.xml.bind" 
+											value="jakarta.xml.bind">
+											<include name="**/*.java"/>
+										</replace>
+		                            </target>
+		                        </configuration>
+		                    </execution>
+		                </executions>
+            </plugin>
+
+<!-- generates jakarta namespaces - but (sub) plugins do fail
+					<plugin>
+					    <groupId>org.codehaus.mojo</groupId>
+					    <artifactId>jaxb2-maven-plugin</artifactId>
+					    <version>3.1.0</version>
+					    <executions>
+					        <execution>
+					            <id>xjc</id>
+					            <goals>
+					                <goal>xjc</goal>
+					            </goals>
+					            <configuration>
+									<arguments>
+										<argument>-Xnamespace-prefix</argument>
+										<argument>-Xannotate</argument>
+									</arguments>
+								</configuration>
+					        </execution>
+					    </executions>
+					    <configuration>
+					        <xjbSources>
+					            <xjbSource>src/main/resources/org/apache/causeway/schema/bindings.xjb</xjbSource>
+					        </xjbSources>
+					        <sources>
+								<source>src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd</source>
+								<source>src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd</source>
+								<source>src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd</source>
+								<source>src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd</source>
+								<source>src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd</source>
+					        </sources>
+					        <outputDirectory>${basedir}/target/generated-sources/xjc</outputDirectory>
+					        <clearOutputDir>false</clearOutputDir>
+					    </configuration>
+					    <dependencies>
+							<dependency>
+							      <groupId>jakarta.xml.bind</groupId>
+							      <artifactId>jakarta.xml.bind-api</artifactId>
+							      <version>4.0.0</version>
+						    </dependency>
+							<dependency>
+							    <groupId>javax.xml.bind</groupId>
+							    <artifactId>jaxb-api</artifactId>
+							    <version>2.3.0</version>
+							</dependency>
+							<dependency>
+							      <groupId>jakarta.inject</groupId>
+							      <artifactId>jakarta.inject-api</artifactId>
+							      <version>2.0.1</version>
+						    </dependency>
+							<dependency>
+								<groupId>org.jvnet.jaxb2_commons</groupId>
+								<artifactId>jaxb2-namespace-prefix</artifactId>
+								<version>1.3</version>
+							</dependency>
+			                <dependency>
+         				    	<groupId>org.jvnet.jaxb2_commons</groupId>
+								<artifactId>jaxb2-basics-annotate</artifactId>
+								<version>1.1.0</version>
+                			</dependency>
+						</dependencies>
+					</plugin>
+
 					-->
-					
-					
 				</plugins>
 			</build>
 		</profile>
diff --git a/api/schema/src/main/java/module-info.java b/api/schema/src/main/java/module-info.java
index 7461bf5eea..d4757b35d6 100644
--- a/api/schema/src/main/java/module-info.java
+++ b/api/schema/src/main/java/module-info.java
@@ -27,7 +27,7 @@ module org.apache.causeway.schema {
     requires java.xml;
     requires jakarta.xml.bind;
     requires spring.context;
-    requires java.inject;
+    requires jakarta.inject;
 
     opens org.apache.causeway.schema.metamodel.v2;
     opens org.apache.causeway.schema.common.v2;
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb b/api/schema/src/main/resources/schema/bindings.xml
similarity index 88%
rename from api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb
rename to api/schema/src/main/resources/schema/bindings.xml
index 39d6c6ae6c..d1cbada9c7 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xjb
+++ b/api/schema/src/main/resources/schema/bindings.xml
@@ -17,10 +17,12 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<jaxb:bindings version="3.0" xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
-    xmlns:xjc="https://jakarta.ee/xml/ns/jaxb/xjc"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    jaxb:extensionBindingPrefixes="xjc">
+<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+               jaxb:version="2.0"
+               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+               xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"
+               xsi:schemaLocation="http://java.sun.com/xml/ns/jaxb http://java.sun.com/xml/ns/jaxb/bindingschema_2_0.xsd"
+>
     
     <jaxb:bindings schemaLocation="chg/chg-2.0.xsd">
         <jaxb:schemaBindings>
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd b/api/schema/src/main/resources/schema/chg/chg-2.0.xsd
similarity index 96%
rename from api/schema/src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd
rename to api/schema/src/main/resources/schema/chg/chg-2.0.xsd
index 3a398a2358..2610f33af8 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/chg/chg-2.0.xsd
+++ b/api/schema/src/main/resources/schema/chg/chg-2.0.xsd
@@ -34,7 +34,7 @@
             <xs:documentation>Represents v2.0 of this schema (as per majorVersion.minorVersion @default attribute, below).  The changes (create/update/delete) to one or more domain objects within a transaction.  (nb: only published objects are included in these lists).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.chg.v2.ChangesDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.chg.v2.ChangesDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexType>
@@ -84,7 +84,7 @@
         <xs:annotation>
             <xs:documentation>A set of changes to domain objects.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.chg.v2.ObjectsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.chg.v2.ObjectsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd b/api/schema/src/main/resources/schema/cmd/cmd-2.0.xsd
similarity index 92%
rename from api/schema/src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd
rename to api/schema/src/main/resources/schema/cmd/cmd-2.0.xsd
index 94ca3b7b5c..918637c4b2 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/cmd/cmd-2.0.xsd
+++ b/api/schema/src/main/resources/schema/cmd/cmd-2.0.xsd
@@ -33,7 +33,7 @@
         <xs:annotation>
             <xs:documentation>Collection of commandDto's</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.CommandsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.CommandsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexType>
@@ -63,7 +63,7 @@
                 Commands can also be deferred, which is to say that they can be scheduled to be invoked in the background.  In such cases the originating command/action which schedules the background commands is called the _parent_ of the background commands.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.CommandDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.CommandDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexType>
@@ -132,7 +132,7 @@
             <xs:documentation>Represents the information required to be able to invoke an action or modify a property on the target(s).  Specifically, is the identifier of the action/property, along with the parameter arguments.  Is subclassed by 'actionDto' and 'propertyDto'.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.MemberDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.MemberDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -156,7 +156,7 @@
             <xs:documentation>Captures the information required to be able to invoke an action on the target(s).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.ActionDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.ActionDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -178,7 +178,7 @@
             <xs:documentation>Captures the information required to be able to modify a property on the target(s).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.PropertyDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.PropertyDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -195,7 +195,7 @@
             <xs:documentation>A list of of parameter/argument values.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.ParamsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.ParamsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence minOccurs="0" maxOccurs="unbounded">
@@ -208,7 +208,7 @@
             <xs:documentation>Defines an action parameter: its name, type and value (ie provided argument).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.ParamDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.ParamDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -222,7 +222,7 @@
             <xs:documentation>Key value mapping.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.cmd.v2.MapDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.cmd.v2.MapDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd b/api/schema/src/main/resources/schema/common/common-2.0.xsd
similarity index 85%
rename from api/schema/src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd
rename to api/schema/src/main/resources/schema/common/common-2.0.xsd
index 47685f2274..5a9fbdbc14 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/common/common-2.0.xsd
+++ b/api/schema/src/main/resources/schema/common/common-2.0.xsd
@@ -25,7 +25,7 @@
            xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.1"
            xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
            xmlns:annox="http://annox.dev.java.net"
-           jaxb:extensionBindingPrefixes="annox">
+           jaxb:extensionBindingPrefixes="xjc annox">
            
 	<xs:annotation>
 	   <xs:appinfo>
@@ -39,7 +39,7 @@
         <xs:annotation>
             <xs:documentation>Represents a value of fundamental type.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.ValueDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.ValueDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:choice minOccurs="0" maxOccurs="1">
@@ -77,7 +77,7 @@
             <xs:documentation>A fixed-size ordered list of named type/value pairs.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.TypedTupleDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.TypedTupleDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -91,7 +91,7 @@
         <xs:annotation>
             <xs:documentation>Object identifier.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.OidDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.OidDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:attribute name="type" type="xs:string"/>
@@ -103,7 +103,7 @@
             <xs:documentation>A collection of (argument) values
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.CollectionDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.CollectionDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -117,7 +117,7 @@
         <xs:annotation>
             <xs:documentation>Data type that stores binary data.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.BlobDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.BlobDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -131,7 +131,7 @@
         <xs:annotation>
             <xs:documentation>Data type that stores textual data.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.ClobDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.ClobDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -145,7 +145,7 @@
         <xs:annotation>
             <xs:documentation>A list of OIDs</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.OidsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.OidsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -157,7 +157,7 @@
         <xs:annotation>
             <xs:documentation>Enumeration</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.EnumDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.EnumDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -170,7 +170,7 @@
         <xs:annotation>
             <xs:documentation>Value type</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.ValueType")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.ValueType")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:restriction base="xs:string">
@@ -213,7 +213,7 @@
             <xs:documentation>Captures a period of time, eg for capturing metrics/timings.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.PeriodDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.PeriodDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -237,7 +237,7 @@
             <xs:documentation>Captures a pair of numbers representing a difference.  Used for example to capture metrics (number objects modified before and after).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.DifferenceType")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.DifferenceType")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -261,7 +261,7 @@
             <xs:documentation>Captures both a value and its corresponding type.  Used for the return value of action invocations, and for the new value in property edits.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.ValueWithTypeDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.ValueWithTypeDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -277,7 +277,7 @@
             <xs:documentation>Defines a named value, a tuple of: name, type and value.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.NamedValueWithTypeDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.NamedValueWithTypeDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -291,7 +291,7 @@
         <xs:annotation>
             <xs:documentation>Whether this interaction with a member is invoking an action, or editing a property.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.common.v2.InteractionType")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.common.v2.InteractionType")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:restriction base="xs:string">
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd b/api/schema/src/main/resources/schema/ixn/ixn-2.0.xsd
similarity index 93%
rename from api/schema/src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd
rename to api/schema/src/main/resources/schema/ixn/ixn-2.0.xsd
index df5c642680..948de23050 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/ixn/ixn-2.0.xsd
+++ b/api/schema/src/main/resources/schema/ixn/ixn-2.0.xsd
@@ -35,7 +35,7 @@
         <xs:annotation>
             <xs:documentation>A collection of interactions.</xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.InteractionsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.InteractionsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexType>
@@ -65,7 +65,7 @@
                 There is typically just a single execution per command.  In more complex cases though executions can be nested, whereby a top-level execution causes other executions, as invoked through a wrapper (Wrapperproxy obtained from the WrapperFactory service).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.InteractionDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.InteractionDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexType>
@@ -104,7 +104,7 @@
             <xs:documentation>Represents either an action invocation or a property edit.  Is subclassed by both.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.MemberExecutionDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.MemberExecutionDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -168,7 +168,7 @@
     <xs:complexType name="actionInvocationDto">
         <xs:annotation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.ActionInvocationDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.ActionInvocationDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -194,7 +194,7 @@
     <xs:complexType name="propertyEditDto">
         <xs:annotation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.PropertyEditDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.PropertyEditDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -209,7 +209,7 @@
     <xs:complexType name="metricsDto">
         <xs:annotation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.MetricsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.MetricsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -231,7 +231,7 @@
     <xs:complexType name="objectCountsDto">
         <xs:annotation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.ObjectCountsDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.ObjectCountsDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
@@ -255,7 +255,7 @@
             <xs:documentation>Captures any exception thrown by an action invocation.  Use as the xsd:type of the 'threw' element.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.ixn.v2.ExceptionDto")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.ixn.v2.ExceptionDto")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:sequence>
diff --git a/api/schema/src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd b/api/schema/src/main/resources/schema/metamodel/metamodel-2.0.xsd
similarity index 90%
rename from api/schema/src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd
rename to api/schema/src/main/resources/schema/metamodel/metamodel-2.0.xsd
index 238a87bc61..98265543ca 100644
--- a/api/schema/src/main/resources/org/apache/causeway/schema/metamodel/metamodel-2.0.xsd
+++ b/api/schema/src/main/resources/schema/metamodel/metamodel-2.0.xsd
@@ -26,7 +26,7 @@
                     classes, the metamodel.
                 </xs:documentation>
                 <xs:appinfo>
-                    <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.MetamodelDto")</annox:annotate>
+                    <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.MetamodelDto")</annox:annotate>
                 </xs:appinfo>
             </xs:annotation>
             <xs:sequence minOccurs="1" maxOccurs="unbounded">
@@ -43,7 +43,7 @@
                     to ObjectSpecification in the internal metamodel.
                 </xs:documentation>
                 <xs:appinfo>
-                    <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.DomainClassDto")
+                    <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.DomainClassDto")
                     </annox:annotate>
                 </xs:appinfo>
             </xs:annotation>
@@ -154,7 +154,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Member")
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Member")
                 </annox:annotate>
             </xs:appinfo>
         </xs:annotation>
@@ -188,7 +188,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Property")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Property")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -217,7 +217,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Collection")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Collection")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -245,7 +245,7 @@
                 Corresponds to ObjectAction in the internal metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Action")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Action")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -284,7 +284,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Param")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Param")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -323,7 +323,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.ScalarParam")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.ScalarParam")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -342,7 +342,7 @@
                 internal metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.VectorParam")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.VectorParam")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -359,7 +359,7 @@
                 Corresponds to FacetHolder interface in the internal metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.FacetHolder")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.FacetHolder")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -388,7 +388,7 @@
                 metamodel.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Facet")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Facet")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -419,7 +419,7 @@
                 an attribute of the value).
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.FacetAttr")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.FacetAttr")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:complexContent>
@@ -449,7 +449,7 @@
                 tools to add arbitrary meta data.
             </xs:documentation>
             <xs:appinfo>
-                <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.Annotation")</annox:annotate>
+                <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.Annotation")</annox:annotate>
             </xs:appinfo>
         </xs:annotation>
         <xs:simpleContent>
@@ -473,7 +473,7 @@
             <xs:documentation>Common ancestor of facet and facetHolder.
             </xs:documentation>
             <xs:appinfo>
-            <annox:annotate>@javax.inject.Named("causeway.schema.metamodel.v2.MetamodelElement")</annox:annotate>
+            <annox:annotate>@jakarta.inject.Named("causeway.schema.metamodel.v2.MetamodelElement")</annox:annotate>
         </xs:appinfo>
         </xs:annotation>
         <xs:sequence>