Repository: cayenne Updated Branches: refs/heads/master 1a9fd2ada -> 90a0fd48b
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/90a0fd48 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/90a0fd48 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/90a0fd48 Branch: refs/heads/master Commit: 90a0fd48b549f0c14d29fa5b487a3ec75c482e0f Parents: 1a9fd2a Author: Nikita Timofeev <[email protected]> Authored: Fri Jul 13 15:26:52 2018 +0300 Committer: Nikita Timofeev <[email protected]> Committed: Fri Jul 13 15:26:52 2018 +0300 ---------------------------------------------------------------------- RELEASE-NOTES.txt | 10 ++++++++++ .../reverse/dbimport/DefaultDbImportActionTest.java | 6 +++--- .../org/apache/cayenne/project/SaveableNodesGetter.java | 2 +- .../project/upgrade/handlers/UpgradeHandler_V10.java | 4 ++-- .../project/upgrade/handlers/UpgradeHandler_V7.java | 2 +- .../project/upgrade/handlers/UpgradeHandler_V8.java | 2 +- .../project/upgrade/handlers/UpgradeHandler_V9.java | 2 +- .../cayenne/configuration/DataChannelDescriptor.java | 3 ++- .../src/main/java/org/apache/cayenne/map/DataMap.java | 12 ++++++------ 9 files changed, 27 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/RELEASE-NOTES.txt ---------------------------------------------------------------------- diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt index 796888f..ead4716 100644 --- a/RELEASE-NOTES.txt +++ b/RELEASE-NOTES.txt @@ -8,6 +8,16 @@ To browse individual bug reports check out project issue tracker: https://issues.apache.org/jira/browse/CAY ---------------------------------- +Release: 4.1.M3 +Date: +---------------------------------- +Changes/New Features: + +Bug Fixes: + +CAY-2444 Change URI from http:// to https:// in xsi:schemaLocation + +---------------------------------- Release: 4.1.M2 Date: July 11, 2018 ---------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java ---------------------------------------------------------------------- diff --git a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java index 910a8e0..6b9986f 100644 --- a/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java +++ b/cayenne-dbsync/src/test/java/org/apache/cayenne/dbsync/reverse/dbimport/DefaultDbImportActionTest.java @@ -397,7 +397,7 @@ public class DefaultDbImportActionTest { Files.write(projectFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<domain xmlns=\"http://cayenne.apache.org/schema/10/domain\"\n"; + "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; + - "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/domain http://cayenne.apache.org/schema/10/domain.xsd\"\n"; + + "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/domain https://cayenne.apache.org/schema/10/domain.xsd\"\n"; + "\t project-version=\"10\">\n" + "</domain>").getBytes(Charset.forName("UTF-8"))); assertTrue(projectFile.isFile()); @@ -442,7 +442,7 @@ public class DefaultDbImportActionTest { Files.write(projectFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<domain xmlns=\"http://cayenne.apache.org/schema/10/domain\"\n"; + "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; + - "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/domain http://cayenne.apache.org/schema/10/domain.xsd\"\n"; + + "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/domain https://cayenne.apache.org/schema/10/domain.xsd\"\n"; + "\t project-version=\"10\">\n" + "\t<map name=\"testSaveLoaded4\"/>\n" + "</domain>").getBytes(Charset.forName("UTF-8"))); @@ -461,7 +461,7 @@ public class DefaultDbImportActionTest { Files.write(dataMapFile.toPath(), ("<?xml version=\"1.0\" encoding=\"utf-8\"?>\n" + "<data-map xmlns=\"http://cayenne.apache.org/schema/10/modelMap\"\n"; + "\t xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; + - "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/modelMap http://cayenne.apache.org/schema/10/modelMap.xsd\"\n"; + + "\t xsi:schemaLocation=\"http://cayenne.apache.org/schema/10/modelMap https://cayenne.apache.org/schema/10/modelMap.xsd\"\n"; + "\t project-version=\"10\">\n" + "\t<db-entity name=\"test\">\n" + "\t\t<db-attribute name=\"test\" type=\"INT\"/>\n" + http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-project/src/main/java/org/apache/cayenne/project/SaveableNodesGetter.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/SaveableNodesGetter.java b/cayenne-project/src/main/java/org/apache/cayenne/project/SaveableNodesGetter.java index 8da76e6..815c376 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/SaveableNodesGetter.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/SaveableNodesGetter.java @@ -44,6 +44,6 @@ class SaveableNodesGetter extends BaseConfigurationNodeVisitor<Collection<Config @Override public Collection<ConfigurationNode> visitDataMap(DataMap dataMap) { - return Collections.<ConfigurationNode> singletonList(dataMap); + return Collections.singletonList(dataMap); } } http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10.java index 44b55b6..01e0bd7 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V10.java @@ -45,7 +45,7 @@ public class UpgradeHandler_V10 implements UpgradeHandler { domain.setAttribute("xmlns","http://cayenne.apache.org/schema/10/domain";); domain.setAttribute("xmlns:xsi","http://www.w3.org/2001/XMLSchema-instance";); domain.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/10/domain " + - "http://cayenne.apache.org/schema/10/domain.xsd";); + "https://cayenne.apache.org/schema/10/domain.xsd";); // update version domain.setAttribute("project-version", getVersion()); } @@ -56,7 +56,7 @@ public class UpgradeHandler_V10 implements UpgradeHandler { // update schema dataMap.setAttribute("xmlns","http://cayenne.apache.org/schema/10/modelMap";); dataMap.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/10/modelMap " + - "http://cayenne.apache.org/schema/10/modelMap.xsd";); + "https://cayenne.apache.org/schema/10/modelMap.xsd";); // update version dataMap.setAttribute("project-version", getVersion()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7.java index 174e660..8e22990 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V7.java @@ -67,7 +67,7 @@ public class UpgradeHandler_V7 implements UpgradeHandler { Element dataMap = upgradeUnit.getDocument().getDocumentElement(); dataMap.setAttribute("xmlns","http://cayenne.apache.org/schema/7/modelMap";); dataMap.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/7/modelMap " + - "http://cayenne.apache.org/schema/7/modelMap.xsd";); + "https://cayenne.apache.org/schema/7/modelMap.xsd";); dataMap.setAttribute("project-version", getVersion()); } http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8.java index c2898bc..115969d 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V8.java @@ -51,7 +51,7 @@ public class UpgradeHandler_V8 implements UpgradeHandler { Element dataMap = upgradeUnit.getDocument().getDocumentElement(); dataMap.setAttribute("xmlns","http://cayenne.apache.org/schema/8/modelMap";); dataMap.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/8/modelMap " + - "http://cayenne.apache.org/schema/8/modelMap.xsd";); + "https://cayenne.apache.org/schema/8/modelMap.xsd";); dataMap.setAttribute("project-version", getVersion()); XPath xpath = XPathFactory.newInstance().newXPath(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java ---------------------------------------------------------------------- diff --git a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java index 91850ea..7f9a53b 100644 --- a/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java +++ b/cayenne-project/src/main/java/org/apache/cayenne/project/upgrade/handlers/UpgradeHandler_V9.java @@ -57,7 +57,7 @@ public class UpgradeHandler_V9 implements UpgradeHandler { Element dataMap = document.getDocumentElement(); dataMap.setAttribute("xmlns","http://cayenne.apache.org/schema/9/modelMap";); dataMap.setAttribute("xsi:schemaLocation", "http://cayenne.apache.org/schema/9/modelMap " + - "http://cayenne.apache.org/schema/9/modelMap.xsd";); + "https://cayenne.apache.org/schema/9/modelMap.xsd";); dataMap.setAttribute("project-version", getVersion()); XPath xpath = XPathFactory.newInstance().newXPath(); http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java ---------------------------------------------------------------------- diff --git a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java index 92bd8bb..310fb69 100644 --- a/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java +++ b/cayenne-server/src/main/java/org/apache/cayenne/configuration/DataChannelDescriptor.java @@ -44,6 +44,7 @@ public class DataChannelDescriptor implements ConfigurationNode, Serializable, X * The namespace in which the data map XML file will be created. */ public static final String SCHEMA_XSD = "http://cayenne.apache.org/schema/10/domain";; + public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/10/domain.xsd";; protected String name; protected Map<String, String> properties; @@ -64,7 +65,7 @@ public class DataChannelDescriptor implements ConfigurationNode, Serializable, X encoder.start("domain") .attribute("xmlns", SCHEMA_XSD) .attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance";, true) - .attribute("xsi:schemaLocation", SCHEMA_XSD + " " + SCHEMA_XSD + ".xsd", true) + .attribute("xsi:schemaLocation", SCHEMA_XSD + " " + SCHEMA_XSD_LOCATION, true) .projectVersion(); if (!properties.isEmpty()) { http://git-wip-us.apache.org/repos/asf/cayenne/blob/90a0fd48/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 018509f..73e68f7 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 @@ -117,6 +117,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/10/modelMap";; + public static final String SCHEMA_XSD_LOCATION = "https://cayenne.apache.org/schema/10/modelMap.xsd";; protected String name; protected String location; @@ -163,7 +164,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable * Creates a new named DataMap. */ public DataMap(String mapName) { - this(mapName, Collections.<String, Object> emptyMap()); + this(mapName, Collections.emptyMap()); } public DataMap(String mapName, Map<String, Object> properties) { @@ -237,7 +238,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable public void initWithProperties(Map<String, Object> properties) { // must init defaults even if properties are empty if (properties == null) { - properties = Collections.<String, Object> emptyMap(); + properties = Collections.emptyMap(); } Object lockType = properties.get(DEFAULT_LOCK_TYPE_PROPERTY); @@ -254,11 +255,11 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable : ObjEntity.LOCK_TYPE_NONE; this.defaultPackage = (packageName != null) ? packageName.toString() : null; - this.quotingSQLIdentifiers = (quoteSqlIdentifier != null) ? "true".equalsIgnoreCase(quoteSqlIdentifier.toString()) : false; + this.quotingSQLIdentifiers = (quoteSqlIdentifier != null) && "true".equalsIgnoreCase(quoteSqlIdentifier.toString()); this.defaultSchema = (schema != null) ? schema.toString() : null; this.defaultCatalog = (catalog != null) ? catalog.toString() : null; this.defaultSuperclass = (superclass != null) ? superclass.toString() : null; - this.clientSupported = (clientEntities != null) ? "true".equalsIgnoreCase(clientEntities.toString()) : false; + this.clientSupported = (clientEntities != null) && "true".equalsIgnoreCase(clientEntities.toString()); this.defaultClientPackage = (clientPackageName != null) ? clientPackageName.toString() : null; this.defaultClientSuperclass = (clientSuperclass != null) ? clientSuperclass.toString() : null; } @@ -302,7 +303,7 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable encoder.start("data-map") .attribute("xmlns", SCHEMA_XSD) .attribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance";, true) - .attribute("xsi:schemaLocation", SCHEMA_XSD + " " + SCHEMA_XSD + ".xsd", true) + .attribute("xsi:schemaLocation", SCHEMA_XSD + " " + SCHEMA_XSD_LOCATION, true) .projectVersion() // properties .property(DEFAULT_LOCK_TYPE_PROPERTY, defaultLockType) @@ -1250,7 +1251,6 @@ public class DataMap implements Serializable, ConfigurationNode, XMLSerializable /** * - * @param name * @return package + "." + name when it is possible otherwise just name * * @since 4.0
