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 6c1ac7e744 ISIS-3306: backport schema gen. conf. simplification from
spring6 branch
6c1ac7e744 is described below
commit 6c1ac7e7443bcc02a8f00a6e667024016479cdc9
Author: Andi Huber <[email protected]>
AuthorDate: Mon Dec 12 19:48:31 2022 +0100
ISIS-3306: backport schema gen. conf. simplification from spring6 branch
---
api/schema/pom.xml | 12 ++++--------
.../resources/{org/apache/causeway => }/schema/bindings.xml | 0
.../{org/apache/causeway => }/schema/chg/chg-2.0.xsd | 0
.../{org/apache/causeway => }/schema/cmd/cmd-2.0.xsd | 0
.../{org/apache/causeway => }/schema/common/common-2.0.xsd | 0
.../{org/apache/causeway => }/schema/ixn/ixn-2.0.xsd | 0
.../apache/causeway => }/schema/metamodel/metamodel-2.0.xsd | 0
7 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/api/schema/pom.xml b/api/schema/pom.xml
index 1a641dec6e..bc0b1c0a90 100644
--- a/api/schema/pom.xml
+++ b/api/schema/pom.xml
@@ -71,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>
diff --git
a/api/schema/src/main/resources/org/apache/causeway/schema/bindings.xml
b/api/schema/src/main/resources/schema/bindings.xml
similarity index 100%
rename from
api/schema/src/main/resources/org/apache/causeway/schema/bindings.xml
rename to api/schema/src/main/resources/schema/bindings.xml
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 100%
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
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 100%
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
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 100%
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
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 100%
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
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 100%
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
