Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace http://www.w3.org/2001/xml.xsd with http://www.w3.org/2001/xm… #40

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

replace http://www.w3.org/2001/xml.xsd with http://www.w3.org/2001/xm… #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions xml/script/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -370,6 +370,9 @@ function passThree(schemaFilename) {
if (systemId == "http://www.w3.org/2001/xml.xsd") {
resolvedFilename = baseDir + "lib/external/xml.xsd";
}
else if (systemId == "https://www.w3.org/2001/xml.xsd") {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this also cover both http + https like the change at line 511?

else if (systemId == "http://www.w3.org/2001/xml.xsd" || systemId == "https://www.w3.org/2001/xml.xsd") {

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a fair point. I just did what was needed for the tests to pass. I'll try this update as well...

resolvedFilename = baseDir + "lib/external/xml.xsd";
}
else if (systemId == "XMLSchema.dtd") {
resolvedFilename = baseDir + "lib/external/XMLSchema.dtd";
}
Expand Down Expand Up @@ -505,12 +508,12 @@ function resolveEntityUsingBuildDirectory(publicId, systemId, fallbackDir) {
}
}
}
else if (systemId == "http://www.w3.org/2001/xml.xsd") {
else if (systemId == "http://www.w3.org/2001/xml.xsd" || systemId == "https://www.w3.org/2001/xml.xsd") {
if (windows) {
resolvedUrl = "file:///" + baseDir.replace(/\\/g, "/" ) + "lib/external/xml.xsd"
}
else {
resolvedUrl = filePrefix + baseDir + "lib/external/xml.xsd";
resolvedUrl = filePrefix + baseDir + "lib/external/xml.xsd";
}
printDebug("XML.XSD = " + resolvedUrl);
}
Expand Down
2 changes: 1 addition & 1 deletion xml/src/jakartaee_10.xsds
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@


<xsd:import namespace="http://www.w3.org/XML/1998/namespace"
schemaLocation="http://www.w3.org/2001/xml.xsd"/>
schemaLocation="https://www.w3.org/2001/xml.xsd"/>

<xsd:include schemaLocation="jakartaee_web_services_client_2_0.xsd"/>

Expand Down