You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/04 13:58:43 UTC
[isis] 03/03: ISIS-2158: organize XSD imports for 'core' (from
IntelliJ)
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit e6dce4cdbb9768a557afed2a53c405df3e454ac7
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Sat Jan 4 13:58:09 2020 +0000
ISIS-2158: organize XSD imports for 'core' (from IntelliJ)
---
.../java/org/apache/isis/metamodel/services/grid/Foo.layout.xml | 5 ++++-
.../apache/isis/metamodel/services/grid/Foo2.layout.fallback.xml | 5 ++++-
.../apache/isis/metamodel/services/grid/Foo3.layout.fallback.xml | 5 ++++-
.../java/org/apache/isis/metamodel/services/grid/Foo3.layout.xml | 5 ++++-
.../org/apache/isis/metamodel/services/menubars/menubars.layout.xml | 6 +++++-
core/schema/src/main/resources/org/apache/isis/schema/bindings.xml | 1 -
6 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo.layout.xml b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo.layout.xml
index 7ff1fc0..6822d30 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo.layout.xml
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo.layout.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
</bs3:row>
</bs3:grid>
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo2.layout.fallback.xml b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo2.layout.fallback.xml
index 7ff1fc0..6822d30 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo2.layout.fallback.xml
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo2.layout.fallback.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
</bs3:row>
</bs3:grid>
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.fallback.xml b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.fallback.xml
index 7ff1fc0..6822d30 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.fallback.xml
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.fallback.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
</bs3:row>
</bs3:grid>
diff --git a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.xml b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.xml
index 7ff1fc0..6822d30 100644
--- a/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.xml
+++ b/core/metamodel/src/test/java/org/apache/isis/metamodel/services/grid/Foo3.layout.xml
@@ -17,7 +17,10 @@
specific language governing permissions and limitations
under the License.
-->
-<bs3:grid xsi:schemaLocation="http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd" xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<bs3:grid
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/grid/bootstrap3 http://isis.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd"
+ xmlns:bs3="http://isis.apache.org/applib/layout/grid/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<bs3:row>
</bs3:row>
</bs3:grid>
diff --git a/core/metamodel/src/test/resources/org/apache/isis/metamodel/services/menubars/menubars.layout.xml b/core/metamodel/src/test/resources/org/apache/isis/metamodel/services/menubars/menubars.layout.xml
index b1eff73..988e14c 100644
--- a/core/metamodel/src/test/resources/org/apache/isis/metamodel/services/menubars/menubars.layout.xml
+++ b/core/metamodel/src/test/resources/org/apache/isis/metamodel/services/menubars/menubars.layout.xml
@@ -17,7 +17,11 @@
specific language governing permissions and limitations
under the License.
-->
-<mb3:menuBars xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd http://isis.apache.org/applib/layout/links http://isis.apache.org/applib/layout/links/links.xsd" xmlns:cpt="http://isis.apache.org/applib/layout/component" xmlns:lnk="http://isis.apache.org/applib/layout/links" xmlns:mb3="h [...]
+<mb3:menuBars
+ xsi:schemaLocation="http://isis.apache.org/applib/layout/menubars/bootstrap3 http://isis.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd http://isis.apache.org/applib/layout/component http://isis.apache.org/applib/layout/component/component.xsd"
+ xmlns:cpt="http://isis.apache.org/applib/layout/component"
+ xmlns:mb3="http://isis.apache.org/applib/layout/menubars/bootstrap3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<mb3:primary>
<mb3:menu>
<mb3:named>Hello World Objects</mb3:named>
diff --git a/core/schema/src/main/resources/org/apache/isis/schema/bindings.xml b/core/schema/src/main/resources/org/apache/isis/schema/bindings.xml
index 3f49f2e..eaab1e2 100644
--- a/core/schema/src/main/resources/org/apache/isis/schema/bindings.xml
+++ b/core/schema/src/main/resources/org/apache/isis/schema/bindings.xml
@@ -18,7 +18,6 @@
under the License.
-->
<jaxb:bindings xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
jaxb:version="2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:namespace="http://jaxb2-commons.dev.java.net/namespace-prefix"