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.

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

Remove inconsistent xml-model processing instructions #351

Merged
merged 554 commits into from
Mar 2, 2019

Conversation

AirQuick
Copy link
Member

This pull request derives from #350. So needs to be handled after that.


Some files have xml-model processing instruction. But they are inconsistent:

  • Some files have it. The others do not have it.
  • src/schematron/schut-to-xspec.xsl specifies a wrong type of schema.
  • Some files (test/schematron-014.xspec for instance) specify an incorrect path.

This pull request removes all xml-model, because

  • The existing instances of xml-model have errors as listed above.
  • Decent XML editors such as oXygen should be able to associate schema without xml-model.
  • If xml-model is really necessary, it should be added to all the files in a consistent manner.

…from-xquery-xml

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…from-ws

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…ylesheet-pi

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…a-aware_e2e

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…age-e2e

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…214_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…204_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…208_cumulative

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…177_cumulative

# Conflicts:
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…-param-common-attrs

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…-param-as

# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	.travis.yml
#	appveyor.yml
#	bin/xspec.bat
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…ery-result-xml

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…185_cumulative

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…-tests

# Conflicts:
#	test/xspec-bat.cmd
#	test/xspec.bats
…ntext

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…overage

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…ne-coverage

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…-bats

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…c-rule

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…xpected-uri

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…talog

# Conflicts:
#	build.xml
#	test/saxon-custom-options/config.xml
#	test/saxon-custom-options/test.xspec
#	test/xspec-bat.cmd
#	test/xspec.bats
…-param-as

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/xspec-rule.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…177_cumulative

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-param-common-attrs

# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
…-param-as

# Conflicts:
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
# Conflicts:
#	test/end-to-end/cases/expected/stylesheet/xspec-rule-result.html
#	test/end-to-end/cases/expected/xspec-rule-junit-norm.xml
#	test/end-to-end/cases/expected/xspec-three-dots-junit-norm.xml
#	test/generate-tests-utils.xspec
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick AirQuick added this to the v1.3.0 milestone Feb 11, 2019
…177_cumulative

# Conflicts:
#	test/end-to-end/cases/expected/schematron/schematron-01-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-153-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-ambiguous-expect-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-focus-1-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-function-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-import-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-pending-result.xml
#	test/end-to-end/cases/expected/stylesheet/xspec-xslt2-result.xml
# Conflicts:
#	test/win-bats/collection.xml
#	test/xspec.bats
@AirQuick AirQuick merged commit 2d897b4 into xspec:master Mar 2, 2019
@AirQuick AirQuick deleted the rm-xml-model branch March 2, 2019 03:09
@AirQuick
Copy link
Member Author

AirQuick commented Mar 2, 2019

@cirulls
Merged this bug fix.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant