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/causeway.git
The following commit(s) were added to refs/heads/master by this push:
new 9a6826d337 CAUSEWAY-3354: Rename XML namespace identifiers in *.java
9a6826d337 is described below
commit 9a6826d3370b7fcc08c1fbe23bf4121ad55b15d2
Author: Andi Huber <[email protected]>
AuthorDate: Wed Feb 8 11:32:14 2023 +0100
CAUSEWAY-3354: Rename XML namespace identifiers in *.java
---
.../java/org/apache/causeway/applib/annotation/ActionLayout.java | 2 +-
.../org/apache/causeway/applib/annotation/BookmarkPolicy.java | 2 +-
.../java/org/apache/causeway/applib/annotation/LabelPosition.java | 2 +-
.../java/org/apache/causeway/applib/annotation/PromptStyle.java | 2 +-
.../main/java/org/apache/causeway/applib/annotation/Redirect.java | 2 +-
.../java/org/apache/causeway/applib/annotation/Repainting.java | 2 +-
.../main/java/org/apache/causeway/applib/annotation/Where.java | 2 +-
.../causeway/applib/layout/component/CssClassFaPosition.java | 2 +-
.../org/apache/causeway/applib/layout/component/package-info.java | 4 ++--
.../causeway/applib/layout/grid/bootstrap/package-info.java | 4 ++--
.../org/apache/causeway/applib/layout/links/package-info.java | 4 ++--
.../causeway/applib/layout/menubars/bootstrap/package-info.java | 4 ++--
.../apache/causeway/applib/services/grid/GridSystemService.java | 4 ++--
.../causeway/core/metamodel/services/grid/GridServiceDefault.java | 8 ++++----
.../services/grid/bootstrap/GridSystemServiceBootstrap.java | 4 ++--
.../menubars/bootstrap/MenuBarsServiceBootstrap.java | 4 ++--
16 files changed, 26 insertions(+), 26 deletions(-)
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
index 50da957abc..8593b4cf2d 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/ActionLayout.java
@@ -217,7 +217,7 @@ public @interface ActionLayout {
Position position()
default Position.NOT_SPECIFIED;
- @XmlType(namespace = "http://causeway.apache.org/applib/layout/component";)
+ @XmlType(namespace = "https://causeway.apache.org/applib/layout/component";)
enum Position {
BELOW,
RIGHT,
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java
index cc3e058bdb..e57a843068 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/BookmarkPolicy.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType;
* @since 1.x {@index}
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum BookmarkPolicy {
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java
index 728ef08fee..bca54cb098 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/LabelPosition.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlType;
* @see org.apache.causeway.applib.annotation.ParameterLayout
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum LabelPosition {
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java
index 24cf6dddb6..02e912a73c 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/PromptStyle.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
* @since 1.x {@index}
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum PromptStyle {
/**
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java
index b452023911..c4e85cf41e 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Redirect.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType;
* @since 1.x {@index}
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum Redirect {
/**
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java
index cc1acb0aed..61e157e596 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Repainting.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
* @since 1.x {@index}
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum Repainting {
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
index 412d1e095d..98e4608d28 100644
--- a/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
+++ b/api/applib/src/main/java/org/apache/causeway/applib/annotation/Where.java
@@ -45,7 +45,7 @@ import org.apache.causeway.applib.util.Enums;
* the framework developer should only use those values that represent
concrete locations.
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum Where {
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java
index 7724cd7790..01cf0f33b0 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/CssClassFaPosition.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlType;
* @since 1.x {@index}
*/
@XmlType(
- namespace = "http://causeway.apache.org/applib/layout/component";
+ namespace = "https://causeway.apache.org/applib/layout/component";
)
public enum CssClassFaPosition {
LEFT, RIGHT;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
index 15d5237f0e..cc15a276ca 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/layout/component/package-info.java
@@ -28,11 +28,11 @@
*
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://causeway.apache.org/applib/layout/component";,
+ namespace = "https://causeway.apache.org/applib/layout/component";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
@javax.xml.bind.annotation.XmlNs(
- namespaceURI =
"http://causeway.apache.org/applib/layout/component";, prefix = "cpt")
+ namespaceURI =
"https://causeway.apache.org/applib/layout/component";, prefix = "cpt")
} // specifying the location seems to cause JaxbService#toXsd()
to not generate the schema; not sure why...
//, location =
..."http://causeway.apache.org/schema/metamodel/layout/common/common.xsd";
)
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java
b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java
index 58f146988e..944192d140 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/layout/grid/bootstrap/package-info.java
@@ -28,10 +28,10 @@
* </p>
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://causeway.apache.org/applib/layout/grid/bootstrap3";,
+ namespace =
"https://causeway.apache.org/applib/layout/grid/bootstrap3";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
@javax.xml.bind.annotation.XmlNs(
- namespaceURI =
"http://causeway.apache.org/applib/layout/grid/bootstrap3";, prefix = "bs")
+ namespaceURI =
"https://causeway.apache.org/applib/layout/grid/bootstrap3";, prefix = "bs")
})
package org.apache.causeway.applib.layout.grid.bootstrap;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java
b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java
index bfacb28d40..8ec67acb5c 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/layout/links/package-info.java
@@ -28,11 +28,11 @@
*
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace = "http://causeway.apache.org/applib/layout/links";,
+ namespace = "https://causeway.apache.org/applib/layout/links";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
@javax.xml.bind.annotation.XmlNs(
- namespaceURI =
"http://causeway.apache.org/applib/layout/links";, prefix = "lnk")
+ namespaceURI =
"https://causeway.apache.org/applib/layout/links";, prefix = "lnk")
}
)
package org.apache.causeway.applib.layout.links;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java
b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java
index be2bd6a9ff..8a3c4909b7 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/layout/menubars/bootstrap/package-info.java
@@ -28,11 +28,11 @@
*
*/
@javax.xml.bind.annotation.XmlSchema(
- namespace =
"http://causeway.apache.org/applib/layout/menubars/bootstrap3";,
+ namespace =
"https://causeway.apache.org/applib/layout/menubars/bootstrap3";,
elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED,
xmlns = {
@javax.xml.bind.annotation.XmlNs(
- namespaceURI =
"http://causeway.apache.org/applib/layout/menubars/bootstrap3";, prefix = "mb3")
+ namespaceURI =
"https://causeway.apache.org/applib/layout/menubars/bootstrap3";, prefix = "mb3")
}
)
package org.apache.causeway.applib.layout.menubars.bootstrap;
diff --git
a/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridSystemService.java
b/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridSystemService.java
index bb2526d0ee..1371dbea28 100644
---
a/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridSystemService.java
+++
b/api/applib/src/main/java/org/apache/causeway/applib/services/grid/GridSystemService.java
@@ -51,7 +51,7 @@ public interface GridSystemService<G extends Grid> {
* <p>
* 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`.
+ * `https://causeway.apache.org/applib/layout/grid/bootstrap3`.
* </p>
*/
String tns();
@@ -63,7 +63,7 @@ public interface GridSystemService<G extends Grid> {
* 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`.
+ *
`https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd`.
* </p>
*/
String schemaLocation();
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridServiceDefault.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridServiceDefault.java
index c8dae8e3d3..49f1a7d446 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridServiceDefault.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/GridServiceDefault.java
@@ -52,11 +52,11 @@ import lombok.experimental.Accessors;
@RequiredArgsConstructor(onConstructor_ = {@Inject})
public class GridServiceDefault implements GridService {
- public static final String COMPONENT_TNS =
"http://causeway.apache.org/applib/layout/component";;
- public static final String COMPONENT_SCHEMA_LOCATION =
"http://causeway.apache.org/applib/layout/component/component.xsd";;
+ public static final String COMPONENT_TNS =
"https://causeway.apache.org/applib/layout/component";;
+ public static final String COMPONENT_SCHEMA_LOCATION =
"https://causeway.apache.org/applib/layout/component/component.xsd";;
- public static final String LINKS_TNS =
"http://causeway.apache.org/applib/layout/links";;
- public static final String LINKS_SCHEMA_LOCATION =
"http://causeway.apache.org/applib/layout/links/links.xsd";;
+ public static final String LINKS_TNS =
"https://causeway.apache.org/applib/layout/links";;
+ public static final String LINKS_SCHEMA_LOCATION =
"https://causeway.apache.org/applib/layout/links/links.xsd";;
private final GridLoaderService gridLoaderService;
@Getter(onMethod_={@Override}) @Accessors(fluent = true)
diff --git
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
index 9646eef192..f64e3d0d96 100644
---
a/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
+++
b/core/metamodel/src/main/java/org/apache/causeway/core/metamodel/services/grid/bootstrap/GridSystemServiceBootstrap.java
@@ -94,8 +94,8 @@ import lombok.extern.log4j.Log4j2;
public class GridSystemServiceBootstrap
extends GridSystemServiceAbstract<BSGrid> {
- public static final String TNS =
"http://causeway.apache.org/applib/layout/grid/bootstrap3";;
- public static final String SCHEMA_LOCATION =
"http://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";;
+ public static final String TNS =
"https://causeway.apache.org/applib/layout/grid/bootstrap3";;
+ public static final String SCHEMA_LOCATION =
"https://causeway.apache.org/applib/layout/grid/bootstrap3/bootstrap3.xsd";;
@Inject @Lazy // circular dependency (late binding)
@Setter @Accessors(chain = true) // JUnit support
diff --git
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
index 7f22314372..281ae1b354 100644
---
a/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
+++
b/core/runtimeservices/src/main/java/org/apache/causeway/core/runtimeservices/menubars/bootstrap/MenuBarsServiceBootstrap.java
@@ -87,8 +87,8 @@ import lombok.extern.log4j.Log4j2;
public class MenuBarsServiceBootstrap
implements MenuBarsService {
- public static final String MB3_TNS =
"http://causeway.apache.org/applib/layout/menubars/bootstrap3";;
- public static final String MB3_SCHEMA_LOCATION =
"http://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd";;
+ public static final String MB3_TNS =
"https://causeway.apache.org/applib/layout/menubars/bootstrap3";;
+ public static final String MB3_SCHEMA_LOCATION =
"https://causeway.apache.org/applib/layout/menubars/bootstrap3/menubars.xsd";;
public static final String COMPONENT_TNS =
GridServiceDefault.COMPONENT_TNS;
public static final String COMPONENT_SCHEMA_LOCATION =
GridServiceDefault.COMPONENT_SCHEMA_LOCATION;
