Repository: cayenne Updated Branches: refs/heads/STABLE-4.0 816629569 -> 541b5e468
CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/541b5e46 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/541b5e46 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/541b5e46 Branch: refs/heads/STABLE-4.0 Commit: 541b5e468304b3a0d2bfac1f01a9eb039e5aa59c Parents: 8166295 Author: Nikita Timofeev <[email protected]> Authored: Fri Jul 13 14:59:46 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Fri Jul 13 14:59:46 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 1 + .../src/main/java/org/apache/cayenne/map/DataMap.java | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/541b5e46/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index c7474b3..f7d400d 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -22,6 +22,7 @@ CAY-2430 Modeler: Redo throws NPE CAY-2435 cdbimport: procedure parameters are not imported CAY-2436 NPE in CayenneRuntimeException constructor CAY-2442 Broken EventBridge providers implementations +CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation ---------------------------------- Release: 4.0.RC1 http://git-wip-us.apache.org/repos/asf/cayenne/blob/541b5e46/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java index b3002df..1747406 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/map/DataMap.java @@ -121,6 +121,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable * also the URI to locate a copy of the schema document. */ public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/9/modelMap";; + public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/9/modelMap.xsd";; protected String name; protected String location; @@ -311,11 +312,11 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable * @since 1.1 */ public void encodeAsXML(XMLEncoder encoder) { - encoder.println("<data-map xmlns=\"http://cayenne.apache.org/schema/9/modelMap\"";); + encoder.println("<data-map xmlns=\"" + SCHEMA_XSD + "\""); encoder.indent(1); encoder.println(" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"";); - encoder.println(" xsi:schemaLocation=\"" + SCHEMA_XSD + " " + SCHEMA_XSD + ".xsd\""); + encoder.println(" xsi:schemaLocation=\"" + SCHEMA_XSD + " " + SCHEMA_XSD_LOCATION + "\""); encoder.printProjectVersion(); encoder.println(">");
