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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 123d5ca5c0 CAUSEWAY-3354: updates docs and mig notes relating to xsd
change
123d5ca5c0 is described below
commit 123d5ca5c09626bfb0cce4456aaa1417687bf469
Author: danhaywood <[email protected]>
AuthorDate: Thu Feb 16 07:34:17 2023 +0000
CAUSEWAY-3354: updates docs and mig notes relating to xsd change
---
.../index/services/grid/GridSystemService.adoc | 4 ++--
.../applib-classes/pages/layout/menubars.adoc | 4 ++--
.../applib-classes/pages/layout/object-layout.adoc | 8 +++----
.../ROOT/pages/2022/2.0.0-RC1/mignotes.adoc | 25 +++++++++++++++-------
.../modules/petclinic/pages/040-pet-entity.adoc | 2 +-
.../modules/fun/pages/ui/menubars-layout.adoc | 6 +++---
.../modules/fun/pages/ui/object-layout.adoc | 12 +++++------
.../causeway/client/kroviz/utils/TestUtils.kt | 2 +-
.../kroviz/src/main/resources/bootstrap3.xsd | 10 ++++-----
.../src/main/resources/component/component.xsd | 8 +++----
.../kroviz/src/main/resources/links/links.xsd | 2 +-
.../snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt | 6 +++---
.../kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt | 24 ++++++++++-----------
.../causeway/client/kroviz/snapshots/sample.xml | 6 +++---
.../snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt | 4 ++--
.../snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt | 2 +-
.../snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt | 6 +++---
.../causeway/client/kroviz/util/XmlHelperTest.kt | 2 +-
.../adoc/modules/ROOT/pages/layout-resources.adoc | 12 +++++------
19 files changed, 77 insertions(+), 68 deletions(-)
diff --git
a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
index cc22e4720c..c7265187bd 100644
---
a/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
+++
b/antora/components/refguide-index/modules/applib/pages/index/services/grid/GridSystemService.adoc
@@ -71,14 +71,14 @@ There can be multiple implementations of this service, this
indicates the base c
The target namespace for this grid system.
-This is used when generating the XML. The Bootstrap3 grid system provided by
the framework returns the value
`http://causeway.apache.org/applib/layout/grid/bootstrap3`.
+This is used when generating the XML. The Bootstrap3 grid system provided by
the framework returns the value
`https://causeway.apache.org/applib/layout/grid/bootstrap3`.
[#schemaLocation_]
=== schemaLocation()
The schema location for the XSD.
-Every grid system is expected to provide a schema XSD in order to provide code
completion in an IDE. The Bootstrap3 grid system provided by the framework
returns the value
`http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd`.
+Every grid system is expected to provide a schema XSD in order to provide code
completion in an IDE. The Bootstrap3 grid system provided by the framework
returns the value
`https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd`.
[#defaultGrid_Class]
=== defaultGrid(Class)
diff --git
a/antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc
b/antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc
index f9c2644752..439bf5bcfb 100644
---
a/antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc
+++
b/antora/components/refguide/modules/applib-classes/pages/layout/menubars.adoc
@@ -14,7 +14,7 @@ The component class `ServiceActionLayoutData` defines action
metadata, being bro
This is similar to the `ActionLayoutData` component class used for object
layouts, but also captures the identity of the "owning" domain service.
Service actions are grouped into menu sections.
-All of the classes in this package are JAXB-annotated, meaning that they can
be serialized to/from XML (in the
`http://causeway.apache.org/applib/layout/menubars/bootstrap3` XSD namespace).
+All of the classes in this package are JAXB-annotated, meaning that they can
be serialized to/from XML (in the
`https://causeway.apache.org/applib/layout/menubars/bootstrap3` XSD namespace).
This ability to serialize to/from XML is used by the
xref:refguide:applib:index/services/menu/MenuBarsLoaderService.adoc[MenuBarsLoaderService],
the default implementation of which reads the grid layout for a domain class
from a `.layout.xml` file on the classpath.
It also allows the menu bars to be exposed through the REST API provided by
the xref:vro:ROOT:about.adoc[REST API (Restful Objects viewer)], as either XML
or JSON.
@@ -65,4 +65,4 @@ This is similar to `ActionLayoutData` (of the
xref:applib-classes:layout.adoc[ob
The link classes reside in the `org.apache.causeway.applib.layout.links`
package, and consist of just the `Link` class.
-The XSD for these classes is available at
link:http://causeway.apache.org/applib/layout/links/links.xsd[].
+The XSD for these classes is available at
link:https://causeway.apache.org/applib/layout/links/links.xsd[].
diff --git
a/antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc
b/antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc
index f275caaad5..a1eb003bcf 100644
---
a/antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc
+++
b/antora/components/refguide/modules/applib-classes/pages/layout/object-layout.adoc
@@ -19,7 +19,7 @@ The component classes, though, are intended to be reusable
across all grid syste
The component classes, meanwhile, are broadly equivalent to the "layout"
annotations
(xref:refguide:applib:index/annotation/PropertyLayout.adoc[@PropertyLayout],
xref:refguide:applib:index/annotation/CollectionLayout.adoc[@CollectionLayout],
xref:refguide:applib:index/annotation/ActionLayout.adoc[@ActionLayout] and
xref:refguide:applib:index/annotation/DomainObjectLayout.adoc[@DomainObjectLayout]
-All of the classes in this package are JAXB-annotated, meaning that they can
be serialized to/from XML (the `component` classes in the
`http://causeway.apache.org/applib/layout/component` XSD namespace, the
bootstrap 3 grid classes in the
`http://causeway.apache.org/applib/layout/grid/bootstrap3` XSD namespace).
+All of the classes in this package are JAXB-annotated, meaning that they can
be serialized to/from XML (the `component` classes in the
`https://causeway.apache.org/applib/layout/component` XSD namespace, the
bootstrap 3 grid classes in the
`https://causeway.apache.org/applib/layout/grid/bootstrap3` XSD namespace).
This ability to serialize to/from XML is used by the
xref:refguide:applib:index/services/grid/GridLoaderService.adoc[GridLoaderService],
the default implementation of which reads the grid layout for a domain class
from a `.layout.xml` file on the classpath.
It also allows the grid to be exposed through the REST API provided by the
xref:vro:ROOT:about.adoc[REST API (Restful Objects viewer)], as either XML or
JSON.
@@ -51,7 +51,7 @@ In addition, the component package includes `Grid`,
representing the top level c
`Grid` itself is merely an interface, but it also defines the visitor pattern
to make it easy for validate and normalize the grid layouts.
The `GridAbstract` convenience superclass provides a partial implementation of
this visitor pattern.
-The XSD for these classes is available at
link:http://causeway.apache.org/applib/layout/component/component.xsd[].
+The XSD for these classes is available at
link:https://causeway.apache.org/applib/layout/component/component.xsd[].
== Bootstrap3 Grid
@@ -107,7 +107,7 @@ As you can probably guess, the `BS3Grid` is the top-level
object (that is, it is
All of these classes also allow custom CSS to be specified; these are added to
the CSS classes for the corresponding `<div`> in the rendered page.
The xref:vw:ROOT:customisation.adoc#custom-css[application.css] file can then
be used for application-specific CSS, allowing arbitrary fine-tuning of the
layout of the page.
-The XSD for these classes is available at
link:http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd[].
+The XSD for these classes is available at
link:https://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd[].
== Link
@@ -136,4 +136,4 @@ This is always "GET".
<.> The (absolute) URL to access the Restful Objects resource.
<.> The media type (`Accept` header) that will be returned by the URL.
-The XSD for these classes is available at
link:http://causeway.apache.org/applib/layout/links/links.xsd[].
+The XSD for these classes is available at
link:https://causeway.apache.org/applib/layout/links/links.xsd[].
diff --git
a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
index df94cb2e61..e217653476 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2022/2.0.0-RC1/mignotes.adoc
@@ -6,13 +6,22 @@
This page will be added to as development progresses.
== Project Rename
-Any occurrences of `isis` within source code, including configuration
resources,
+Any occurrences of `isis` within source code, including configuration
resources,
have been replaced with `causeway` while keeping variants:
* lower-case `isis` -> `causeway`
* upper-case `ISIS` -> `CAUSEWAY`
* or capital case `Isis` -> `Causeway`
+== XSDs
+
+The namespace and location of XSDs has changed:
+
+* from: `http://isis.apache.org/...`
+* to `https://causewaY.apache.org/...`
+
+Note that the scheme has changed also, from `http` to `https`.
+
== Configuration
The following changed:
@@ -32,7 +41,7 @@ The following changed:
| causeway.viewer.*wicket*.application.menubars-layout-*xml*
| causeway.viewer.*common*.application.menubars-layout-*file*
-| causeway.viewer.*wicket*.application
+| causeway.viewer.*wicket*.application
| causeway.viewer.*common*.application
| causeway.viewer.*wicket*.credit
@@ -50,7 +59,7 @@ The following changed:
| previously
| new
-|
+|
`o.a.c.v.restfulobjects.jaxrsresteasy4.CausewayModuleViewerRestfulObjectsJaxrsResteasy4`
from
[source,xml]
----
@@ -58,7 +67,7 @@ The following changed:
<artifactId>causeway-viewer-restfulobjects-jaxrsresteasy4</artifactId>
----
|
-`o.a.c.v.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy`
from
+`o.a.c.v.restfulobjects.jaxrsresteasy.CausewayModuleViewerRestfulObjectsJaxrsResteasy`
from
[source,xml]
----
<groupId>org.apache.causeway.viewer</groupId>
@@ -76,14 +85,14 @@ The following changed:
| previously
| new
-| `ViewModel` implementations were required to have at least a _public_ single
argument constructor,
+| `ViewModel` implementations were required to have at least a _public_ single
argument constructor,
taking a `String` argument for the `ViewModel's` memento.
-| `ViewModel` implementations now allow *any* _public_ constructor signature,
+| `ViewModel` implementations now allow *any* _public_ constructor signature,
where arguments are auto-resolved by the `ServiceRegistry`.
`String` arguments still get the `ViewModel's` memento passed in.
-If the `ViewModel` has multiple _public_ constructors, it picks (the) one,
-that has an `@Inject` or `@Autowired` annotation.
+If the `ViewModel` has multiple _public_ constructors, it picks (the) one,
+that has an `@Inject` or `@Autowired` annotation.
|===
diff --git
a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
index 3053da0f56..603d57d211 100644
--- a/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
+++ b/antora/components/tutorials/modules/petclinic/pages/040-pet-entity.adoc
@@ -525,7 +525,7 @@ mvn -pl spring-boot:run
.Pet.layout.xml
----
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<bs3:grid
xsi:schemaLocation="http://causeway.apache.org/applib/layout/component
http://causeway.apache.org/applib/layout/component/component.xsd
http://causeway.apache.org/applib/layout/links
http://causeway.apache.org/applib/layout/links/links.xsd
http://causeway.apache.org/applib/layout/grid/bootstrap3
http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";
xmlns:cpt="http://causeway.apache.org/appli [...]
+<bs3:grid
xsi:schemaLocation="https://causeway.apache.org/applib/layout/component
https://causeway.apache.org/applib/layout/component/component.xsd
https://causeway.apache.org/applib/layout/links
https://causeway.apache.org/applib/layout/links/links.xsd
https://causeway.apache.org/applib/layout/grid/bootstrap3
https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";
xmlns:cpt="https://causeway.apache.o [...]
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject bookmarking="AS_ROOT"/>
diff --git
a/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
b/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
index 6c1b62ace4..337a9fee51 100644
--- a/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
+++ b/antora/components/userguide/modules/fun/pages/ui/menubars-layout.adoc
@@ -110,9 +110,9 @@ For example, here's a fragment of that provided by the
xref:docs:starters:simple
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<mb3:menuBars
xsi:schemaLocation="..."
- xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:mb3="http://causeway.apache.org/applib/layout/menubars/bootstrap3";
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+ xmlns:mb3="https://causeway.apache.org/applib/layout/menubars/bootstrap3";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<mb3:primary> <!--.-->
<mb3:menu> <!--.-->
diff --git
a/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
b/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
index b56992006d..70dee4af65 100644
--- a/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
+++ b/antora/components/userguide/modules/fun/pages/ui/object-layout.adoc
@@ -65,12 +65,12 @@ There are two: one for the grid classes, and one for the
common component classe
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<bs3:grid
- xsi:schemaLocation="http://causeway.apache.org/applib/layout/component
-
http://causeway.apache.org/applib/layout/component/component.xsd
- http://causeway.apache.org/applib/layout/grid/bootstrap3
-
http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";
- xmlns:c="http://causeway.apache.org/applib/layout/component";
+ xsi:schemaLocation="https://causeway.apache.org/applib/layout/component
+
https://causeway.apache.org/applib/layout/component/component.xsd
+ https://causeway.apache.org/applib/layout/grid/bootstrap3
+
https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";
+ xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";
+ xmlns:c="https://causeway.apache.org/applib/layout/component";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
...
</bs3:grid>
diff --git
a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/TestUtils.kt
b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/TestUtils.kt
index 80fc7ff433..18c1b341ab 100644
---
a/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/TestUtils.kt
+++
b/incubator/clients/kroviz/src/main/kotlin/org/apache/causeway/client/kroviz/utils/TestUtils.kt
@@ -23,7 +23,7 @@ object TestUtils {
fun execute() {
//given
val inputXml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\"?><bs3:grid
xmlns:cpt=\"http://causeway.apache.org/applib/layout/component\";
xmlns:lnk=\"http://causeway.apache.org/applib/layout/links\";
xmlns:bs3=\"http://causeway.apache.org/applib/layout/grid/bootstrap3\";><bs3:row><bs3:col
span=\"10\"
unreferencedActions=\"true\"><cpt:domainObject><cpt:link><lnk:rel>urn:org.restfulobjects:rels/element</lnk:rel><lnk:method>GET</lnk:method><lnk:href>http://localhost:8080/restful/ob
[...]
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\"?><bs3:grid
xmlns:cpt=\"https://causeway.apache.org/applib/layout/component\";
xmlns:lnk=\"https://causeway.apache.org/applib/layout/links\";
xmlns:bs3=\"https://causeway.apache.org/applib/layout/grid/bootstrap3\";><bs3:row><bs3:col
span=\"10\"
unreferencedActions=\"true\"><cpt:domainObject><cpt:link><lnk:rel>urn:org.restfulobjects:rels/element</lnk:rel><lnk:method>GET</lnk:method><lnk:href>http://localhost:8080/restful
[...]
//when
val outputXml = XmlHelper.format(inputXml)
console.log("[TU.execute]")
diff --git a/incubator/clients/kroviz/src/main/resources/bootstrap3.xsd
b/incubator/clients/kroviz/src/main/resources/bootstrap3.xsd
index 48ca8a3743..fd27044e23 100644
--- a/incubator/clients/kroviz/src/main/resources/bootstrap3.xsd
+++ b/incubator/clients/kroviz/src/main/resources/bootstrap3.xsd
@@ -11,18 +11,18 @@
language governing permissions and limitations under the License. -->
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:tns="http://causeway.apache.org/applib/layout/grid/bootstrap3";
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:tns="https://causeway.apache.org/applib/layout/grid/bootstrap3";
elementFormDefault="qualified"
-
targetNamespace="http://causeway.apache.org/applib/layout/grid/bootstrap3";
+
targetNamespace="https://causeway.apache.org/applib/layout/grid/bootstrap3";
version="1.0">
<xs:import
- namespace="http://causeway.apache.org/applib/layout/component";
+ namespace="https://causeway.apache.org/applib/layout/component";
schemaLocation="../../component/component.xsd"/>
<xs:import
- namespace="http://causeway.apache.org/applib/layout/links";
+ namespace="https://causeway.apache.org/applib/layout/links";
schemaLocation="../../links/links.xsd"/>
<xs:element name="clearFixHidden" type="tns:clearFixHidden"/>
diff --git
a/incubator/clients/kroviz/src/main/resources/component/component.xsd
b/incubator/clients/kroviz/src/main/resources/component/component.xsd
index 02e5129316..a33a0f2d98 100644
--- a/incubator/clients/kroviz/src/main/resources/component/component.xsd
+++ b/incubator/clients/kroviz/src/main/resources/component/component.xsd
@@ -10,14 +10,14 @@
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:tns="http://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+ xmlns:tns="https://causeway.apache.org/applib/layout/component";
elementFormDefault="qualified"
- targetNamespace="http://causeway.apache.org/applib/layout/component";
+
targetNamespace="https://causeway.apache.org/applib/layout/component";
version="1.0">
<xs:import
- namespace="http://causeway.apache.org/applib/layout/links";
+ namespace="https://causeway.apache.org/applib/layout/links";
schemaLocation="../links/links.xsd"/>
<xs:element name="action" type="tns:action"/>
diff --git a/incubator/clients/kroviz/src/main/resources/links/links.xsd
b/incubator/clients/kroviz/src/main/resources/links/links.xsd
index 2251551383..9fd43ff579 100644
--- a/incubator/clients/kroviz/src/main/resources/links/links.xsd
+++ b/incubator/clients/kroviz/src/main/resources/links/links.xsd
@@ -12,7 +12,7 @@
<xs:schema
xmlns:xs="http://www.w3.org/2001/XMLSchema";
elementFormDefault="qualified"
- targetNamespace="http://causeway.apache.org/applib/layout/links";
+ targetNamespace="https://causeway.apache.org/applib/layout/links";
version="1.0">
<xs:complexType name="link">
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt
index 6e0eb0d7e7..ddad271e4a 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/STRINGS_LAYOUT_XML.kt
@@ -23,9 +23,9 @@ import org.apache.causeway.client.kroviz.snapshots.Response
object STRINGS_LAYOUT_XML: Response() {
override val url =
"http://localhost:8080/restful/objects/demo.Tab/ADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8-CiAgICA8ZmllbGQxPmZpZWxkIDE8L2ZpZWxkMT4KICAgIDxmaWVsZDI-ZmllbGQgMjwvZmllbGQyPgogICAgPGhpZGRlbj5mYWxzZTwvaGlkZGVuPgo8L0RlbW8-Cg==/object-layout";
override val str = """<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject>
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt
index e63e17e797..7acd5e7f56 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/demo2_0_0/TAB_LAYOUT_XML.kt
@@ -23,19 +23,19 @@ import org.apache.causeway.client.kroviz.snapshots.Response
object TAB_LAYOUT_XML: Response() {
override val url =
"http://localhost:8080/restful/objects/demo.Tab/ADw_eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04IiBzdGFuZGFsb25lPSJ5ZXMiPz4KPERlbW8-CiAgICA8ZmllbGQxPmZpZWxkIDE8L2ZpZWxkMT4KICAgIDxmaWVsZDI-ZmllbGQgMjwvZmllbGQyPgogICAgPGhpZGRlbj5mYWxzZTwvaGlkZGVuPgo8L0RlbW8-Cg==/object-layout";
override val str = """<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
- license agreements. See the NOTICE file distributed with this work for
additional
- information regarding copyright ownership. The ASF licenses this file
to
- you under the Apache License, Version 2.0 (the "License"); you may not
use
- this file except in compliance with the License. You may obtain a copy
of
- the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
- by applicable law or agreed to in writing, software distributed under
the
- License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
- OF ANY KIND, either express or implied. See the License for the
specific
+<!-- Licensed to the Apache Software Foundation (ASF) under one or more
contributor
+ license agreements. See the NOTICE file distributed with this work for
additional
+ information regarding copyright ownership. The ASF licenses this file to
+ you under the Apache License, Version 2.0 (the "License"); you may not
use
+ this file except in compliance with the License. You may obtain a copy
of
+ the License at http://www.apache.org/licenses/LICENSE-2.0 Unless
required
+ by applicable law or agreed to in writing, software distributed under
the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
+ OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject>
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.xml
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.xml
index 89a3777d9d..9b387ee768 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.xml
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/sample.xml
@@ -19,9 +19,9 @@
~
-->
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="10" unreferencedActions="true">
<cpt:domainObject>
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt
index 36264e7d84..b27a539bb2 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/CFG_LAYOUT_XML.kt
@@ -23,7 +23,7 @@ import org.apache.causeway.client.kroviz.snapshots.Response
object CFG_LAYOUT_XML: Response() {
override val url=
"http://localhost:8080/restful/objects/causewayApplib.ConfigurationProperty/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiIHN0YW5kYWxvbmU9InllcyI_Pgo8Y29uZmlndXJhdGlvblByb3BlcnR5PgogICAgPGtleT5pc2lzLmFwcE1hbmlmZXN0PC9rZXk-CiAgICA8dmFsdWU-ZG9tYWluYXBwLmFwcGxpY2F0aW9uLm1hbmlmZXN0LkRvbWFpbkFwcEFwcE1hbmlmZXN0PC92YWx1ZT4KPC9jb25maWd1cmF0aW9uUHJvcGVydHk-Cg==/object-layout";
override val str = """
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
xmlns:lnk="http://causeway.apache.org/applib/layout/links";
xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
xmlns:lnk="https://causeway.apache.org/applib/layout/links";
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject>
@@ -110,6 +110,6 @@ object CFG_LAYOUT_XML: Response() {
<bs3:tabGroup unreferencedCollections="true"/>
</bs3:col>
</bs3:row>
-</bs3:grid>
+</bs3:grid>
"""
}
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt
index 30b5e9a59d..96d792c641 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/FR_OBJECT_LAYOUT.kt
@@ -23,7 +23,7 @@ import org.apache.causeway.client.kroviz.snapshots.Response
object FR_OBJECT_LAYOUT : Response() {
override val url =
"http://localhost:8080/restful/objects/causewayApplib.FixtureResult/PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPG1lbWVudG8-PGtleT5kb21haW4tYXBwLWRlbW8vcGVyc2lzdC1hbGwvaXRlbS01PC9rZXk-PG9iamVjdC5ib29rbWFyaz5zaW1wbGUuU2ltcGxlT2JqZWN0OjExNDwvb2JqZWN0LmJvb2ttYXJrPjwvbWVtZW50bz4=/object-layout";
override val str = """
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
xmlns:lnk="http://causeway.apache.org/applib/layout/links";
xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
xmlns:lnk="https://causeway.apache.org/applib/layout/links";
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject>
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt
index d77a212f76..8d943eb622 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/snapshots/simpleapp1_16_0/SO_LAYOUT_XML.kt
@@ -23,9 +23,9 @@ import org.apache.causeway.client.kroviz.snapshots.Response
object SO_LAYOUT_XML: Response() {
override val url =
"http://localhost:8080/restful/domain-types/simple.SimpleObject/layout";
override val str = """
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<script/>
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
diff --git
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/util/XmlHelperTest.kt
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/util/XmlHelperTest.kt
index 57ab464211..9c19305e83 100644
---
a/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/util/XmlHelperTest.kt
+++
b/incubator/clients/kroviz/src/test/kotlin/org/apache/causeway/client/kroviz/util/XmlHelperTest.kt
@@ -42,7 +42,7 @@ class XmlHelperTest {
fun testFormat() {
//given
val inputXml =
- "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\"?><bs3:grid
xmlns:cpt=\"http://causeway.apache.org/applib/layout/component\";
xmlns:lnk=\"http://causeway.apache.org/applib/layout/links\";
xmlns:bs3=\"http://causeway.apache.org/applib/layout/grid/bootstrap3\";><bs3:row><bs3:col
span=\"10\"
unreferencedActions=\"true\"><cpt:domainObject><cpt:link><lnk:rel>urn:org.restfulobjects:rels/element</lnk:rel><lnk:method>GET</lnk:method><lnk:href>http://localhost:8080/restful/ob
[...]
+ "<?xml version=\"1.0\" encoding=\"UTF-8\"
standalone=\"yes\"?><bs3:grid
xmlns:cpt=\"https://causeway.apache.org/applib/layout/component\";
xmlns:lnk=\"https://causeway.apache.org/applib/layout/links\";
xmlns:bs3=\"https://causeway.apache.org/applib/layout/grid/bootstrap3\";><bs3:row><bs3:col
span=\"10\"
unreferencedActions=\"true\"><cpt:domainObject><cpt:link><lnk:rel>urn:org.restfulobjects:rels/element</lnk:rel><lnk:method>GET</lnk:method><lnk:href>http://localhost:8080/restful
[...]
//when
val outputXml = XmlHelper.format(inputXml)
// then
diff --git
a/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
b/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
index f317354f0f..11ade631ce 100644
--- a/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
+++ b/viewers/restfulobjects/adoc/modules/ROOT/pages/layout-resources.adoc
@@ -18,9 +18,9 @@ For example, the xref:docs:starters:helloworld.adoc[Hello
World starter app] has
----
<mb3:menuBars
xsi:schemaLocation="..."
- xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:mb3="http://causeway.apache.org/applib/layout/menubars/bootstrap3";
+ xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+ xmlns:mb3="https://causeway.apache.org/applib/layout/menubars/bootstrap3";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";>
<mb3:primary>
<mb3:menu>
@@ -175,9 +175,9 @@ For example, the layout for a "HelloWorldObject" instance
in the hello world sta
License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS
OF ANY KIND, either express or implied. See the License for the specific
language governing permissions and limitations under the License. -->
-<bs3:grid xmlns:cpt="http://causeway.apache.org/applib/layout/component";
- xmlns:lnk="http://causeway.apache.org/applib/layout/links";
- xmlns:bs3="http://causeway.apache.org/applib/layout/grid/bootstrap3";>
+<bs3:grid xmlns:cpt="https://causeway.apache.org/applib/layout/component";
+ xmlns:lnk="https://causeway.apache.org/applib/layout/links";
+
xmlns:bs3="https://causeway.apache.org/applib/layout/grid/bootstrap3";>
<bs3:row>
<bs3:col span="12" unreferencedActions="true">
<cpt:domainObject bookmarking="AS_ROOT">
