You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@daffodil.apache.org by sl...@apache.org on 2023/08/17 11:45:28 UTC
[daffodil] branch main updated (af1a1963e -> 531e9a616)
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
from af1a1963e Fix DPath conversion from double to unsigned long
new 41cab1aa3 Make include/import logic more precise and consistent
new 531e9a616 Update schemaLocations to be absolute where needed
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/scala/org/apache/daffodil/cli/Main.scala | 53 +++++++--
.../apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd | 2 +-
.../apache/daffodil/cli/blob_backtracking.dfdl.xsd | 2 +-
.../apache/daffodil/cli/charClassEntities.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema_02.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema_03.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/complex_types.dfdl.xsd | 2 +-
.../apache/daffodil/cli/global_element.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/large_blob.dfdl.xsd | 2 +-
.../apache/daffodil/cli/prefixed_length.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/single.dfdl.xsd | 2 +-
.../apache/daffodil/cli/suppressWarnTest.dfdl.xsd | 4 +-
.../cli/testNonCompatibleImplementation.tdml | 2 +-
.../org/apache/daffodil/cli/trace_input.dfdl.xsd | 2 +-
.../daffodil/cli/unqualified_path_step.dfdl.xsd | 2 +-
.../org/apache/daffodil/layers/buggy.dfdl.xsd | 4 +-
.../apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd | 2 +-
.../test/resources/test/cli/fixedLength.dfdl.xsd | 2 +-
.../daffodil/cli/cliTest/TestCLIParsing.scala | 51 ++++++++-
.../org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/ex_nums.tdml | 2 +-
.../org/apache/daffodil/codegen/c/nested.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/padtest.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/simple.dfdl.xsd | 2 +-
.../apache/daffodil/codegen/c/variablelen.dfdl.xsd | 2 +-
.../org/apache/daffodil/core/dsom/IIBase.scala | 61 ++--------
.../test/example-of-most-dfdl-constructs.dfdl.xml | 2 +-
...xample_a02_targetnamespace_unqualified.dfdl.xsd | 2 +-
.../example_c02_targetnamespace_qualified.dfdl.xsd | 2 +-
.../example_nested_namespaces_qualified.dfdl.xsd | 2 +-
...sted_namespaces_qualified_with_default.dfdl.xsd | 2 +-
.../example_nested_namespaces_unqualified.dfdl.xsd | 2 +-
.../test/example_no_targetnamespace.dfdl.xsd | 2 +-
.../org/apache/daffodil/core/api/TestAPI.scala | 4 +-
.../org/apache/daffodil/core/api/TestAPI1.scala | 72 ++++++------
.../daffodil/core/api/TestDsomCompiler3.scala | 2 +-
.../apache/daffodil/core/api/TestForHeapDump.scala | 2 +-
.../core/api/TestParseIndividualMessages.scala | 4 +-
.../core/dpath/TestDFDLExpressionEvaluation.scala | 12 +-
.../core/dpath/TestDFDLExpressionTree.scala | 8 +-
.../org/apache/daffodil/core/dpath/TestDPath.scala | 6 +-
.../daffodil/core/dsom/TestAppinfoSyntax.scala | 10 +-
.../daffodil/core/dsom/TestDsomCompiler.scala | 52 ++++-----
.../core/dsom/TestDsomCompilerUnparse1.scala | 10 +-
.../daffodil/core/dsom/TestExternalVariables.scala | 10 +-
.../daffodil/core/dsom/TestInputValueCalc.scala | 6 +-
.../dsom/TestInteriorAlignmentElimination.scala | 2 +-
.../daffodil/core/dsom/TestIsScannable.scala | 6 +-
.../core/dsom/TestMiddleEndAttributes.scala | 12 +-
.../core/dsom/TestMiddleEndAttributes2.scala | 2 +-
.../core/dsom/TestMiddleEndAttributes3.scala | 4 +-
.../TestPolymorphicUpwardRelativeExpressions.scala | 4 +-
.../org/apache/daffodil/core/dsom/TestRefMap.scala | 32 +++---
.../daffodil/core/dsom/TestSimpleTypeUnions.scala | 6 +-
.../daffodil/core/dsom/walker/TestDSOMWalker.scala | 6 +-
.../daffodil/core/general/TestPrimitives.scala | 20 ++--
.../daffodil/core/general/TestPrimitives2.scala | 4 +-
.../core/general/TestRuntimeProperties.scala | 8 +-
.../daffodil/core/general/TestTunables.scala | 2 +-
.../apache/daffodil/core/infoset/TestInfoset.scala | 18 +--
.../daffodil/core/infoset/TestInfoset2.scala | 2 +-
.../daffodil/core/infoset/TestInfosetCursor.scala | 22 ++--
.../daffodil/core/infoset/TestInfosetCursor1.scala | 8 +-
.../core/infoset/TestInfosetCursorFromReader.scala | 24 ++--
.../infoset/TestInfosetCursorFromReader2.scala | 2 +-
.../daffodil/core/infoset/TestInfosetFree.scala | 10 +-
.../apache/daffodil/core/layers/TestLayers.scala | 18 +--
.../TestOutputValueCalcAndAlignment.scala | 6 +-
.../TestOutputValueCalcForwardReference.scala | 14 +--
.../daffodil/core/processor/TestSAXUtils.scala | 2 +-
.../core/processor/TestSerialization.scala | 2 +-
.../runtime1/TestDelimiterFinalBacktracking.scala | 2 +-
.../daffodil/core/runtime1/TestUnparseHidden.scala | 14 +--
.../org/apache/daffodil/core/util/TestUtils.scala | 4 +-
.../src/test/resources/test/japi/TopLevel.dfdl.xsd | 2 +-
.../resources/test/japi/alwaysInvalid.dfdl.xsd | 2 +-
.../test/resources/test/japi/ambig_elt.dfdl.xsd | 2 +-
.../src/test/resources/test/japi/blob.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema5.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema6.dfdl.xsd | 2 +-
.../resources/test/japi/mySchemaCDATA.dfdl.xsd | 2 +-
.../test/japi/mySchemaWithComplexVars1.dfdl.xsd | 2 +-
.../resources/test/japi/mySchemaWithVars.dfdl.xsd | 2 +-
.../ncsa/daffodil/xsd/built-in-formats.xsd | 85 --------------
.../daffodil/lib/xml/DaffodilXMLLoader.scala | 54 ++++-----
.../org/apache/daffodil/lib/xml/XMLUtils.scala | 125 +++++++++++++++++++++
.../resources/test/validation/testSchema1.dfdl.xsd | 2 +-
.../apache/daffodil/lib/util/TestSchemaUtils.scala | 2 +-
.../daffodil/lib/xml/test/unit/TestXMLLoader.scala | 4 +-
.../resources/org/apache/daffodil/xsd/dafext.xsd | 1 +
.../src/test/resources/test/sapi/TopLevel.dfdl.xsd | 2 +-
.../test/resources/test/sapi/ambig_elt.dfdl.xsd | 2 +-
.../src/test/resources/test/sapi/blob.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema5.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema6.dfdl.xsd | 2 +-
.../resources/test/sapi/mySchemaCDATA.dfdl.xsd | 2 +-
.../test/sapi/mySchemaWithComplexVars1.dfdl.xsd | 2 +-
.../resources/test/sapi/mySchemaWithVars.dfdl.xsd | 2 +-
.../src/test/resources/xsd/always-fails-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-2.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-3.dfdl.xsd | 2 +-
.../src/test/resources/xsd/extends-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/never-fails-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/string.dfdl.xsd | 2 +-
.../src/test/resources/xsd/unit_price.dfdl.xsd | 2 +-
.../src/test/resources/xsd/uuid.dfdl.xsd | 2 +-
.../src/test/resources/xsd/with-ns-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/without-ns-1.dfdl.xsd | 2 +-
.../org/apache/daffodil/tdml/genericTdml.tdml | 2 +-
.../org/apache/daffodil/tdml/testExtVars1.tdml | 2 +-
.../test/resources/test/tdml/tdmlNamespaces.tdml | 2 +-
.../src/test/resources/test/tdml/tdmlQuoting.tdml | 4 +-
.../src/test/resources/test/tdml/testWarnings.tdml | 2 +-
.../daffodil/processor/tdml/TestDaffodilC.scala | 11 +-
.../processor/tdml/TestTDMLCrossTest.scala | 2 +-
.../processor/tdml/TestTDMLRoundTrips.scala | 14 +--
.../daffodil/processor/tdml/TestTDMLRunner.scala | 58 +++++-----
.../daffodil/processor/tdml/TestTDMLRunner2.scala | 22 ++--
.../tdml/TestTDMLRunnerCommentSyntax.scala | 2 +-
.../processor/tdml/TestTDMLRunnerConfig.scala | 12 +-
.../processor/tdml/TestTDMLRunnerTutorial.scala | 4 +-
.../processor/tdml/TestTDMLRunnerWarnings.scala | 8 +-
.../processor/tdml/TestTDMLUnparseCases.scala | 2 +-
.../ibm-contributed/delimiter_12.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelmulcho_01.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelone107_05.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelonearr_12.dfdl.xsd | 2 +-
.../ibm-contributed/dpaextdeltxt101-err.dfdl.xsd | 2 +-
.../ibm-contributed/dpaextdeltxt101.dfdl.xsd | 2 +-
.../ibm-contributed/dpaflsenc101_04_01.dfdl.xsd | 2 +-
.../ibm-contributed/dpaflsmbyfrm41.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc121_02.dfdl.xsd | 2 +-
.../test-suite/ibm-contributed/dpaspc7131.dfdl.xsd | 2 +-
.../test-suite/ibm-contributed/dpaspc7132.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc7132_2.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc7133_01.dfdl.xsd | 2 +-
.../ibm-contributed/length_explicit_12.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AB.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AF.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AG.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AH.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AM.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AP.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AU.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AV.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AW.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AX.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AY.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AZ.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BA.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BB.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BC.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BD.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BE.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BF.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BG.dfdl.xsd | 2 +-
.../tresys-contributed/bitFlagExpression.tdml | 2 +-
.../tresys-contributed/delimTests.dfdl.xsd | 2 +-
.../tresys-contributed/mixed-binary-text.tdml | 2 +-
.../tresys-contributed/multiple-diagnostics.tdml | 4 +-
.../nested-separator-delimited.tdml | 14 +--
.../tresys-contributed/nested_group_ref.tdml | 2 +-
.../test-suite/tresys-contributed/nilled.tdml | 2 +-
.../tresys-contributed/runtime-diagnostics.tdml | 2 +-
.../tresys-contributed/sepSuppression.tdml | 8 +-
.../tresys-contributed/sepSuppression2.tdml | 6 +-
.../test-suite/tresys-contributed/sequence.tdml | 2 +-
.../test-suite/tresys-contributed/unseparated.tdml | 2 +-
.../anotherChildDir/include01_01_03.dfdl.xsd | 2 +-
.../charsets/TestBitsCharsetDefinition.dfdl.xsd | 2 +-
.../apache/daffodil/codegen/c/collisions.dfdl.xsd | 2 +-
.../choiceBranchRanges/choiceBranchKeyRanges.tdml | 2 +-
.../daffodil/extensions/enum/enumInvalid.tdml | 2 +-
.../org/apache/daffodil/extensions/enum/enums.tdml | 4 +-
.../daffodil/extensions/lookAhead/lookAhead.tdml | 2 +-
.../extensions/type_calc/inputTypeCalc.tdml | 4 +-
.../type_calc/inputTypeCalcExpression.tdml | 2 +-
.../type_calc/typeCalcFunctionErrors.tdml | 6 +-
.../extensions/type_calc/typeCalcFunctions.tdml | 2 +-
.../stringAsXml/namespaced/xsd/binMessage.dfdl.xsd | 2 +-
.../nonamespace/xsd/binMessage.dfdl.xsd | 2 +-
.../org/apache/daffodil/layers/IPv4.dfdl.xsd | 4 +-
.../resources/org/apache/daffodil/layers/ais.tdml | 2 +-
.../org/apache/daffodil/layers/checkDigit.dfdl.xsd | 4 +-
.../org/apache/daffodil/layers/layers.tdml | 10 +-
.../daffodil/layers/xsd/checkDigitLayer.dfdl.xsd | 2 +-
.../general/dfdlFormatPrefixedAttributesSDE.tdml | 2 +-
.../section00/general/disallowDocTypes.tdml | 2 +-
.../general/elementFormDefaultQualified.dfdl.xsd | 2 +-
.../general/elementFormDefaultUnqualified.dfdl.xsd | 2 +-
.../apache/daffodil/section00/general/general.tdml | 8 +-
.../section00/general/generalSchema.dfdl.xsd | 2 +-
.../daffodil/section00/general/infosetWalker.tdml | 2 +-
.../daffodil/section00/general/largeInput.tdml | 2 +-
.../section00/general/parseUnparsePolicy.tdml | 2 +-
.../general/schemaWithOtherAnnotations.dfdl.xsd | 2 +-
.../section00/general/testElementFormDefault.tdml | 6 +-
.../general/testExpressionPropertyWarnings.tdml | 2 +-
.../daffodil/section00/general/testTextBidi.tdml | 2 +-
.../section00/general/testUnparserBitOrderOVC.tdml | 2 +-
.../general/testUnparserFileBuffering.tdml | 8 +-
.../section00/general/testUnparserGeneral.tdml | 8 +-
.../section00/general/testUnparserSAX.tdml | 2 +-
.../daffodil/section00/general/tunables.tdml | 18 +--
.../processing_errors/ProcessingErrors.tdml | 4 +-
.../processing_errors/ProcessingErrorsUnparse.tdml | 6 +-
.../dfdl-schema-validation-diagnostics.tdml | 6 +-
.../AttributeFormDefault.dfdl.xsd | 2 +-
.../MissingAppinfoSource.dfdl.xsd | 2 +-
.../MissingAppinfoSourceNonDfdl.dfdl.xsd | 2 +-
.../MissingClosingTag.dfdl.xsd | 2 +-
.../SchemaDefinitionErrors.tdml | 4 +-
.../schema_definition_errors/lineNumber.dfdl.xsd | 2 +-
.../section02/validation_errors/Validation.tdml | 16 +--
.../section05/dfdl_xsdl_subset/DFDLSubset.tdml | 8 +-
.../apache/daffodil/section05/facets/Facets.tdml | 56 ++++-----
.../apache/daffodil/section05/facets/NulChars.tdml | 2 +-
.../daffodil/section05/facets/PatternRanges.tdml | 2 +-
.../daffodil/section05/facets/testBinary.dfdl.xsd | 2 +-
.../apache/daffodil/section05/simple_types/AJ.tdml | 2 +-
.../daffodil/section05/simple_types/AK.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/AL.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/BitOrder.tdml | 14 +--
.../section05/simple_types/BitOrderInvalid.tdml | 2 +-
.../daffodil/section05/simple_types/Blobs.tdml | 2 +-
.../daffodil/section05/simple_types/Boolean.tdml | 2 +-
.../daffodil/section05/simple_types/Encodings.tdml | 2 +-
.../simple_types/RuntimeCalendarLanguage.tdml | 6 +-
.../section05/simple_types/SimpleTypes.tdml | 18 +--
.../section05/simple_types/SimpleTypes2.tdml | 2 +-
.../section05/simple_types/SimpleTypesUnparse.tdml | 2 +-
.../section05/simple_types/WhiteSpace.tdml | 6 +-
.../simple_types/nonNegativeInteger.dfdl.xsd | 2 +-
.../section05/simple_types/simple-type-bases.tdml | 2 +-
.../daffodil/section05/simple_types/unions.tdml | 2 +-
.../section06/entities/DefaultProperties.dfdl.xsd | 2 +-
.../daffodil/section06/entities/Entities.tdml | 24 ++--
.../section06/entities/InvalidEntities.tdml | 2 +-
.../section06/entities/charClassEntities.dfdl.xsd | 2 +-
.../daffodil/section06/entities/entities_01.tdml | 12 +-
.../section06/entities/utf16schema.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/ABC_IBM.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_IBM_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_invalid_2.dfdl.xsd | 2 +-
.../namespaces/address_namespace.dfdl.xsd | 2 +-
.../namespaces/address_no_namespace.dfdl.xsd | 2 +-
.../namespaces/charClassEntities.dfdl.xsd | 2 +-
.../namespaces/customer_namespace.dfdl.xsd | 4 +-
.../namespaces/customer_no_namespace.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_base.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_step.dfdl.xsd | 4 +-
.../namespaces/ibm_format_compat.dfdl.xsd | 2 +-
.../namespaces/ibm_format_compat_2.dfdl.xsd | 2 +-
.../section06/namespaces/include01.dfdl.xsd | 2 +-
.../section06/namespaces/include02.dfdl.xsd | 2 +-
.../section06/namespaces/includeImport.tdml | 21 +++-
.../section06/namespaces/multi_A_01.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_03.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_11_nons.dfdl.xsd | 4 +-
.../namespaces/multi_A_11_nons_valid.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_20.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_21.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_01.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_04.dfdl.xsd | 4 +-
.../namespaces/multi_B_04_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_05_nons.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_06.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_06_valid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_08.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_11.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_02.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_D_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_E_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_01.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_02.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_04.dfdl.xsd | 6 +-
.../namespaces/multi_base_04_invalid.dfdl.xsd | 4 +-
.../namespaces/multi_base_04_invalid2.dfdl.xsd | 4 +-
.../namespaces/multi_base_05_nons.dfdl.xsd | 4 +-
.../namespaces/multi_base_05_nons_with_A.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_06.dfdl.xsd | 8 +-
.../namespaces/multi_base_06_valid.dfdl.xsd | 8 +-
.../namespaces/multi_base_07_failure.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_09.dfdl.xsd | Bin 7630 -> 7634 bytes
.../section06/namespaces/multi_base_10.dfdl.xsd | 8 +-
.../section06/namespaces/multi_base_11.dfdl.xsd | 6 +-
.../namespaces/multi_base_11_valid.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_17.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_18.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_19.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_20.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_21.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_shi.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_shi2.dfdl.xsd | 6 +-
.../section06/namespaces/multi_temp.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceCharLim.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceRules.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceRules2.dfdl.xsd | 2 +-
.../namespaces/namespaceSpecialChar.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/namespaces.tdml | 18 +--
.../namespaces/predefined_format.dfdl.xsd | 2 +-
.../namespaces/primTypesPrefixes.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/qname1.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname2.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname3.dfdl.xsd | 2 +-
.../org/apache/daffodil/section06/namespaces/shi | 2 +-
.../namespaces/subfolder/multi_A_06_nons.dfdl.xsd | 4 +-
.../subfolder/multi_A_06_nons_valid.dfdl.xsd | 4 +-
.../namespaces/subfolder/multi_C_06_nons.dfdl.xsd | 2 +-
.../subfolder/multi_C_06_nons_valid.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test04sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test05sch6.dfdl.xsd | 2 +-
.../section07/annotations/annotations.tdml | 2 +-
.../daffodil/section07/assertions/assert.tdml | 14 +--
.../section07/defineFormat/defineFormat.dfdl.xsd | 2 +-
.../section07/defineFormat/defineFormat.tdml | 8 +-
.../defineFormat/defineFormat_withComment.dfdl.xsd | 2 +-
.../section07/discriminators/discriminator.tdml | 22 ++--
.../section07/discriminators/discriminator2.tdml | 2 +-
.../discriminators/multipleDiscriminators.tdml | 2 +-
.../discriminators/nestedChoiceDiscriminator.tdml | 2 +-
.../section07/escapeScheme/escapeScenarios.tdml | 14 +--
.../section07/escapeScheme/escapeScheme.tdml | 26 ++---
.../section07/escapeScheme/escapeSchemeNeg.tdml | 2 +-
.../escapeScheme/escapeSchemeUnparse.tdml | 6 +-
.../external_variables/external_variables.dfdl.xsd | 2 +-
.../external_variables/external_variables.tdml | 12 +-
.../section07/property_syntax/PropertySyntax.tdml | 4 +-
.../property_syntax/property_syntax.dfdl.xsd | 2 +-
.../section07/variables/setVarWIthValueLength.tdml | 2 +-
.../daffodil/section07/variables/variables.tdml | 46 ++++----
.../section07/variables/variables_01.dfdl.xsd | 4 +-
.../property_scoping/PropertyScoping.tdml | 16 +--
.../property_scoping/PropertyScoping_01.tdml | 14 +--
.../property_scoping/defaultForm.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_02.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_03.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_04.dfdl.xsd | 2 +-
.../representation_properties/RepProps.tdml | 2 +-
.../representation_properties/encodings.tdml | 6 +-
.../ContentFramingProps.tdml | 16 +--
.../section12/aligned_data/Aligned_Data.tdml | 10 +-
.../section12/aligned_data/BinaryInput_01.tdml | 16 +--
.../delimiter_properties/DelimiterProperties.tdml | 20 ++--
.../DelimiterPropertiesUnparse.tdml | 2 +-
.../delimiter_properties/testDFACreation.dfdl.xsd | 2 +-
.../testOptionalInfix.dfdl.xsd | 2 +-
.../daffodil/section12/lengthKind/AB.dfdl.xsd | 2 +-
.../apache/daffodil/section12/lengthKind/AI.tdml | 2 +-
.../apache/daffodil/section12/lengthKind/AN.tdml | 2 +-
.../section12/lengthKind/DelimitedTests.tdml | 10 +-
.../section12/lengthKind/EndOfParentTests.tdml | 2 +-
.../section12/lengthKind/ExplicitTests.tdml | 46 ++++----
.../section12/lengthKind/PatternTests.tdml | 14 +--
.../section12/lengthKind/PrefixedTests.tdml | 30 ++---
.../daffodil/section12/lengthKind/implicit.tdml | 2 +-
.../length_properties/LengthProperties.tdml | 10 +-
.../apache/daffodil/section13/boolean/boolean.tdml | 6 +-
.../nillable/literal-character-nils-unparse.tdml | 4 +-
.../section13/nillable/literal-character-nils.tdml | 12 +-
.../nillable/literal-value-nils-unparse.tdml | 10 +-
.../section13/nillable/literal-value-nils.tdml | 18 +--
.../daffodil/section13/nillable/nillable.tdml | 4 +-
.../daffodil/section13/nillable/nillable2.tdml | 2 +-
.../apache/daffodil/section13/packed/packed.tdml | 28 ++---
.../text_number_props/TextNumberProps.tdml | 4 +-
.../text_number_props/TextNumberPropsUnparse.tdml | 6 +-
.../text_number_props/TextStandardBase.tdml | 2 +-
.../org/apache/daffodil/section13/zoned/pv.tdml | 4 +-
.../org/apache/daffodil/section13/zoned/zoned.tdml | 2 +-
.../section14/occursCountKind/ockImplicit.tdml | 2 +-
.../section14/sequence_groups/SequenceGroup.tdml | 50 ++++-----
.../sequence_groups/SequenceGroupDelimiters.tdml | 16 +--
.../SequenceGroupInitiatedContent.tdml | 4 +-
.../sequence_groups/SequenceGroupNestedArray.tdml | 2 +-
.../sequence_groups/SequenceGroupUnparse.tdml | 2 +-
.../SequencesWithHiddenRefs.dfdl.xsd | 2 +-
.../SequencesWithHiddenRefsInvalid.dfdl.xsd | 2 +-
.../SimilarModelGroupElement1.dfdl.xsd | 2 +-
.../SimilarModelGroupElement2.dfdl.xsd | 2 +-
.../sequence_groups/SimilarModelGroupRoot.dfdl.xsd | 2 +-
.../sequenceWithComplexType.dfdl.xsd | 2 +-
.../section14/unordered_sequences/BE.dfdl.xsd | 2 +-
.../unordered_sequences/UnorderedSequences.tdml | 28 ++---
.../unordered_namespaces_01.dfdl.xsd | 2 +-
.../unordered_namespaces_02.dfdl.xsd | 2 +-
.../unordered_namespaces_03.dfdl.xsd | 2 +-
.../choice_groups/ChoiceGroupInitiatedContent.tdml | 10 +-
.../choice_groups/ChoiceLengthExplicit.tdml | 4 +-
.../choice_groups/ChoicesInHiddenContexts.dfdl.xsd | 2 +-
.../choice_groups/SharedGroupTestSchema.dfdl.xsd | 2 +-
.../section15/choice_groups/choice-unparse.tdml | 2 +-
.../section15/choice_groups/choice-unparse2.tdml | 6 +-
.../section15/choice_groups/choice.dfdl.xsd | 2 +-
.../daffodil/section15/choice_groups/choice.tdml | 32 +++---
.../section15/choice_groups/choice1765.tdml | 2 +-
.../section15/choice_groups/choice1773.tdml | 2 +-
.../section15/choice_groups/choice2162.tdml | 2 +-
.../section15/choice_groups/choiceNests.tdml | 2 +-
.../section16/array_optional_elem/ArrayComb.tdml | 2 +-
.../array_optional_elem/ArrayOptionalElem.tdml | 22 ++--
.../UnparseArrayDelimitedOptionalElem.tdml | 2 +-
.../UnparseArrayExpressionConstant.tdml | 2 +-
.../UnparseArrayFixedOptionalElem.tdml | 2 +-
.../UnparseArrayImplicitOptionalElem.tdml | 2 +-
.../UnparseArrayParsedOptionalElem.tdml | 2 +-
.../arrays_optional_elements.dfdl.xsd | 2 +-
.../array_optional_elem/backtracking.tdml | 2 +-
.../section17/calc_value_properties/AA.tdml | 8 +-
.../section17/calc_value_properties/AQ.tdml | 2 +-
.../section17/calc_value_properties/AR.tdml | 2 +-
.../computedLengthFields.tdml | 8 +-
.../calc_value_properties/inputValueCalc.tdml | 4 +-
.../calc_value_properties/outputValueCalc.tdml | 2 +-
.../calc_value_properties/outputValueCalc2.tdml | 8 +-
.../calc_value_properties/outputValueCalc3.tdml | 2 +-
.../dfdl_expressions/expression_fail.tdml | 2 +-
.../section23/dfdl_expressions/expressions.tdml | 58 +++++-----
.../section23/dfdl_expressions/expressions2.tdml | 8 +-
.../section23/dfdl_expressions/expressions3.tdml | 14 +--
.../expressions_unused_path_no_context.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/functions.tdml | 4 +-
.../section23/dfdl_expressions/s1.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/setVar.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/valueLength.tdml | 4 +-
.../section23/dfdl_functions/BitFunctions.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsAnd.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsNot.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsOr.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsXor.tdml | 2 +-
.../section23/dfdl_functions/Functions-neg.tdml | 2 +-
.../section23/dfdl_functions/Functions.tdml | 16 +--
.../section23/dfdl_functions/Functions_UTF8.tdml | 2 +-
.../section23/dfdl_functions/first_schema.dfdl.xsd | 4 +-
.../section23/dfdl_functions/home_schema.dfdl.xsd | 4 +-
.../dfdl_functions/second_schema.dfdl.xsd | 2 +-
.../runtime_properties/dynamicSeparator.tdml | 2 +-
.../runtime_properties/runtime-properties.tdml | 2 +-
.../regular_expressions/RegularExpressions.tdml | 2 +-
.../section31/escape_characters/Escapes.tdml | 2 +-
.../resources/org/apache/daffodil/udf/udfs.tdml | 2 +-
.../apache/daffodil/unparser/OVCAndLengthTest.tdml | 4 +-
.../apache/daffodil/unparser/envelopePayload.tdml | 6 +-
.../daffodil/unparser/parseUnparseMode.dfdl.xsd | 2 +-
.../unparser/parseUnparseModeTest.dfdl.xsd | 2 +-
.../daffodil/unparser/unparseNegInfosetTest.tdml | 2 +-
.../org/apache/daffodil/usertests/Book2.dfdl.xsd | 2 +-
.../org/apache/daffodil/usertests/SepTests.tdml | 12 +-
.../daffodil/usertests/UserSubmittedTests.tdml | 6 +-
.../org/apache/daffodil/usertests/leaks.tdml | 2 +-
.../apache/daffodil/usertests/nameDOB_test.tdml | 2 +-
.../org/apache/daffodil/usertests/test-csv.tdml | 2 +-
.../usertests/testSSPNeverDiagnostic.tdml.xml | 2 +-
.../src/test/resources/test space/A B.dfdl.xsd | 2 +-
.../test space/test 1/multi_base_05_nons.dfdl.xsd | 2 +-
.../resources/test space/test 1/namespaces.tdml | 10 +-
.../test space/test 3/multi_B_05_nons.dfdl.xsd | 2 +-
.../section00/general/TestDisallowDocType.scala | 2 +-
.../section06/namespaces/TestNamespaces.scala | 4 +
.../section07/variables/TestVariables.scala | 4 +-
.../section13/validation_errors/PadCharacter.scala | 6 +-
.../org/apache/daffodil/udf/genericUdfSchema.xsd | 2 +-
.../main/resources/org1/xsd/innerEnvelope.dfdl.xsd | 4 +-
.../main/resources/org1/xsd/outerEnvelope.dfdl.xsd | 2 +-
.../src/main/resources/org2/xsd/formats.dfdl.xsd | 2 +-
.../src/test/resources/org1/xsd/testInner.dfdl.xsd | 4 +-
.../test/resources/org2/testEmbeddedSchema.tdml | 8 +-
.../test/resources/org2/xsd/testPayload.dfdl.xsd | 4 +-
.../src/main/resources/bitorder.tutorial.tdml.xml | 18 +--
.../src/main/resources/bugReportTemplate.tdml.xml | 4 +-
tutorials/src/main/resources/tdmlTutorial.tdml.xml | 4 +-
.../testTDMLTutorialFile2.tutorial.tdml.xml | 4 +-
507 files changed, 1563 insertions(+), 1457 deletions(-)
delete mode 100644 daffodil-lib/src/main/resources/edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd
[daffodil] 02/02: Update schemaLocations to be absolute where needed
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
commit 531e9a6165247e7a480bcf36f8754ea867471903
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Aug 11 08:37:36 2023 -0400
Update schemaLocations to be absolute where needed
This removes deprecated import/include schemaLocations and associated
warnings.
DAFFODIL-2828
---
.../apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd | 2 +-
.../apache/daffodil/cli/blob_backtracking.dfdl.xsd | 2 +-
.../apache/daffodil/cli/charClassEntities.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema_02.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/cli_schema_03.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/complex_types.dfdl.xsd | 2 +-
.../apache/daffodil/cli/global_element.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/large_blob.dfdl.xsd | 2 +-
.../apache/daffodil/cli/prefixed_length.dfdl.xsd | 2 +-
.../org/apache/daffodil/cli/single.dfdl.xsd | 2 +-
.../apache/daffodil/cli/suppressWarnTest.dfdl.xsd | 4 +-
.../cli/testNonCompatibleImplementation.tdml | 2 +-
.../org/apache/daffodil/cli/trace_input.dfdl.xsd | 2 +-
.../daffodil/cli/unqualified_path_step.dfdl.xsd | 2 +-
.../org/apache/daffodil/layers/buggy.dfdl.xsd | 4 +-
.../apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd | 2 +-
.../test/resources/test/cli/fixedLength.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/ex_nums.tdml | 2 +-
.../org/apache/daffodil/codegen/c/nested.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/padtest.dfdl.xsd | 2 +-
.../org/apache/daffodil/codegen/c/simple.dfdl.xsd | 2 +-
.../apache/daffodil/codegen/c/variablelen.dfdl.xsd | 2 +-
.../test/example-of-most-dfdl-constructs.dfdl.xml | 2 +-
...xample_a02_targetnamespace_unqualified.dfdl.xsd | 2 +-
.../example_c02_targetnamespace_qualified.dfdl.xsd | 2 +-
.../example_nested_namespaces_qualified.dfdl.xsd | 2 +-
...sted_namespaces_qualified_with_default.dfdl.xsd | 2 +-
.../example_nested_namespaces_unqualified.dfdl.xsd | 2 +-
.../test/example_no_targetnamespace.dfdl.xsd | 2 +-
.../org/apache/daffodil/core/api/TestAPI.scala | 4 +-
.../org/apache/daffodil/core/api/TestAPI1.scala | 72 ++++++++++-----------
.../daffodil/core/api/TestDsomCompiler3.scala | 2 +-
.../apache/daffodil/core/api/TestForHeapDump.scala | 2 +-
.../core/api/TestParseIndividualMessages.scala | 4 +-
.../core/dpath/TestDFDLExpressionEvaluation.scala | 12 ++--
.../core/dpath/TestDFDLExpressionTree.scala | 8 +--
.../org/apache/daffodil/core/dpath/TestDPath.scala | 6 +-
.../daffodil/core/dsom/TestAppinfoSyntax.scala | 10 +--
.../daffodil/core/dsom/TestDsomCompiler.scala | 52 +++++++--------
.../core/dsom/TestDsomCompilerUnparse1.scala | 10 +--
.../daffodil/core/dsom/TestExternalVariables.scala | 10 +--
.../daffodil/core/dsom/TestInputValueCalc.scala | 6 +-
.../dsom/TestInteriorAlignmentElimination.scala | 2 +-
.../daffodil/core/dsom/TestIsScannable.scala | 6 +-
.../core/dsom/TestMiddleEndAttributes.scala | 12 ++--
.../core/dsom/TestMiddleEndAttributes2.scala | 2 +-
.../core/dsom/TestMiddleEndAttributes3.scala | 4 +-
.../TestPolymorphicUpwardRelativeExpressions.scala | 4 +-
.../org/apache/daffodil/core/dsom/TestRefMap.scala | 32 ++++-----
.../daffodil/core/dsom/TestSimpleTypeUnions.scala | 6 +-
.../daffodil/core/dsom/walker/TestDSOMWalker.scala | 6 +-
.../daffodil/core/general/TestPrimitives.scala | 20 +++---
.../daffodil/core/general/TestPrimitives2.scala | 4 +-
.../core/general/TestRuntimeProperties.scala | 8 +--
.../daffodil/core/general/TestTunables.scala | 2 +-
.../apache/daffodil/core/infoset/TestInfoset.scala | 18 +++---
.../daffodil/core/infoset/TestInfoset2.scala | 2 +-
.../daffodil/core/infoset/TestInfosetCursor.scala | 22 +++----
.../daffodil/core/infoset/TestInfosetCursor1.scala | 8 +--
.../core/infoset/TestInfosetCursorFromReader.scala | 24 +++----
.../infoset/TestInfosetCursorFromReader2.scala | 2 +-
.../daffodil/core/infoset/TestInfosetFree.scala | 10 +--
.../apache/daffodil/core/layers/TestLayers.scala | 18 +++---
.../TestOutputValueCalcAndAlignment.scala | 6 +-
.../TestOutputValueCalcForwardReference.scala | 14 ++--
.../daffodil/core/processor/TestSAXUtils.scala | 2 +-
.../core/processor/TestSerialization.scala | 2 +-
.../runtime1/TestDelimiterFinalBacktracking.scala | 2 +-
.../daffodil/core/runtime1/TestUnparseHidden.scala | 14 ++--
.../org/apache/daffodil/core/util/TestUtils.scala | 4 +-
.../src/test/resources/test/japi/TopLevel.dfdl.xsd | 2 +-
.../resources/test/japi/alwaysInvalid.dfdl.xsd | 2 +-
.../test/resources/test/japi/ambig_elt.dfdl.xsd | 2 +-
.../src/test/resources/test/japi/blob.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema5.dfdl.xsd | 2 +-
.../test/resources/test/japi/mySchema6.dfdl.xsd | 2 +-
.../resources/test/japi/mySchemaCDATA.dfdl.xsd | 2 +-
.../test/japi/mySchemaWithComplexVars1.dfdl.xsd | 2 +-
.../resources/test/japi/mySchemaWithVars.dfdl.xsd | 2 +-
.../resources/test/validation/testSchema1.dfdl.xsd | 2 +-
.../apache/daffodil/lib/util/TestSchemaUtils.scala | 2 +-
.../daffodil/lib/xml/test/unit/TestXMLLoader.scala | 4 +-
.../src/test/resources/test/sapi/TopLevel.dfdl.xsd | 2 +-
.../test/resources/test/sapi/ambig_elt.dfdl.xsd | 2 +-
.../src/test/resources/test/sapi/blob.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema1.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema2.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema3.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema4.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema5.dfdl.xsd | 2 +-
.../test/resources/test/sapi/mySchema6.dfdl.xsd | 2 +-
.../resources/test/sapi/mySchemaCDATA.dfdl.xsd | 2 +-
.../test/sapi/mySchemaWithComplexVars1.dfdl.xsd | 2 +-
.../resources/test/sapi/mySchemaWithVars.dfdl.xsd | 2 +-
.../src/test/resources/xsd/always-fails-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-2.dfdl.xsd | 2 +-
.../src/test/resources/xsd/embedded-3.dfdl.xsd | 2 +-
.../src/test/resources/xsd/extends-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/never-fails-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/string.dfdl.xsd | 2 +-
.../src/test/resources/xsd/unit_price.dfdl.xsd | 2 +-
.../src/test/resources/xsd/uuid.dfdl.xsd | 2 +-
.../src/test/resources/xsd/with-ns-1.dfdl.xsd | 2 +-
.../src/test/resources/xsd/without-ns-1.dfdl.xsd | 2 +-
.../org/apache/daffodil/tdml/genericTdml.tdml | 2 +-
.../org/apache/daffodil/tdml/testExtVars1.tdml | 2 +-
.../test/resources/test/tdml/tdmlNamespaces.tdml | 2 +-
.../src/test/resources/test/tdml/tdmlQuoting.tdml | 4 +-
.../src/test/resources/test/tdml/testWarnings.tdml | 2 +-
.../daffodil/processor/tdml/TestDaffodilC.scala | 2 +-
.../processor/tdml/TestTDMLCrossTest.scala | 2 +-
.../processor/tdml/TestTDMLRoundTrips.scala | 14 ++--
.../daffodil/processor/tdml/TestTDMLRunner.scala | 56 ++++++++--------
.../daffodil/processor/tdml/TestTDMLRunner2.scala | 22 +++----
.../tdml/TestTDMLRunnerCommentSyntax.scala | 2 +-
.../processor/tdml/TestTDMLRunnerConfig.scala | 12 ++--
.../processor/tdml/TestTDMLRunnerTutorial.scala | 4 +-
.../processor/tdml/TestTDMLRunnerWarnings.scala | 8 +--
.../processor/tdml/TestTDMLUnparseCases.scala | 2 +-
.../ibm-contributed/delimiter_12.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelmulcho_01.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelone107_05.dfdl.xsd | 2 +-
.../ibm-contributed/dpadelonearr_12.dfdl.xsd | 2 +-
.../ibm-contributed/dpaextdeltxt101-err.dfdl.xsd | 2 +-
.../ibm-contributed/dpaextdeltxt101.dfdl.xsd | 2 +-
.../ibm-contributed/dpaflsenc101_04_01.dfdl.xsd | 2 +-
.../ibm-contributed/dpaflsmbyfrm41.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc121_02.dfdl.xsd | 2 +-
.../test-suite/ibm-contributed/dpaspc7131.dfdl.xsd | 2 +-
.../test-suite/ibm-contributed/dpaspc7132.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc7132_2.dfdl.xsd | 2 +-
.../ibm-contributed/dpaspc7133_01.dfdl.xsd | 2 +-
.../ibm-contributed/length_explicit_12.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AB.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AF.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AG.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AH.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AM.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AP.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AU.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AV.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AW.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AX.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AY.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/AZ.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BA.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BB.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BC.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BD.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BE.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BF.dfdl.xsd | 2 +-
.../test-suite/tresys-contributed/BG.dfdl.xsd | 2 +-
.../tresys-contributed/bitFlagExpression.tdml | 2 +-
.../tresys-contributed/delimTests.dfdl.xsd | 2 +-
.../tresys-contributed/mixed-binary-text.tdml | 2 +-
.../tresys-contributed/multiple-diagnostics.tdml | 4 +-
.../nested-separator-delimited.tdml | 14 ++--
.../tresys-contributed/nested_group_ref.tdml | 2 +-
.../test-suite/tresys-contributed/nilled.tdml | 2 +-
.../tresys-contributed/runtime-diagnostics.tdml | 2 +-
.../tresys-contributed/sepSuppression.tdml | 8 +--
.../tresys-contributed/sepSuppression2.tdml | 6 +-
.../test-suite/tresys-contributed/sequence.tdml | 2 +-
.../test-suite/tresys-contributed/unseparated.tdml | 2 +-
.../anotherChildDir/include01_01_03.dfdl.xsd | 2 +-
.../charsets/TestBitsCharsetDefinition.dfdl.xsd | 2 +-
.../apache/daffodil/codegen/c/collisions.dfdl.xsd | 2 +-
.../choiceBranchRanges/choiceBranchKeyRanges.tdml | 2 +-
.../daffodil/extensions/enum/enumInvalid.tdml | 2 +-
.../org/apache/daffodil/extensions/enum/enums.tdml | 4 +-
.../daffodil/extensions/lookAhead/lookAhead.tdml | 2 +-
.../extensions/type_calc/inputTypeCalc.tdml | 4 +-
.../type_calc/inputTypeCalcExpression.tdml | 2 +-
.../type_calc/typeCalcFunctionErrors.tdml | 6 +-
.../extensions/type_calc/typeCalcFunctions.tdml | 2 +-
.../stringAsXml/namespaced/xsd/binMessage.dfdl.xsd | 2 +-
.../nonamespace/xsd/binMessage.dfdl.xsd | 2 +-
.../org/apache/daffodil/layers/IPv4.dfdl.xsd | 4 +-
.../resources/org/apache/daffodil/layers/ais.tdml | 2 +-
.../org/apache/daffodil/layers/checkDigit.dfdl.xsd | 4 +-
.../org/apache/daffodil/layers/layers.tdml | 10 +--
.../daffodil/layers/xsd/checkDigitLayer.dfdl.xsd | 2 +-
.../general/dfdlFormatPrefixedAttributesSDE.tdml | 2 +-
.../section00/general/disallowDocTypes.tdml | 2 +-
.../general/elementFormDefaultQualified.dfdl.xsd | 2 +-
.../general/elementFormDefaultUnqualified.dfdl.xsd | 2 +-
.../apache/daffodil/section00/general/general.tdml | 8 +--
.../section00/general/generalSchema.dfdl.xsd | 2 +-
.../daffodil/section00/general/infosetWalker.tdml | 2 +-
.../daffodil/section00/general/largeInput.tdml | 2 +-
.../section00/general/parseUnparsePolicy.tdml | 2 +-
.../general/schemaWithOtherAnnotations.dfdl.xsd | 2 +-
.../section00/general/testElementFormDefault.tdml | 6 +-
.../general/testExpressionPropertyWarnings.tdml | 2 +-
.../daffodil/section00/general/testTextBidi.tdml | 2 +-
.../section00/general/testUnparserBitOrderOVC.tdml | 2 +-
.../general/testUnparserFileBuffering.tdml | 8 +--
.../section00/general/testUnparserGeneral.tdml | 8 +--
.../section00/general/testUnparserSAX.tdml | 2 +-
.../daffodil/section00/general/tunables.tdml | 18 +++---
.../processing_errors/ProcessingErrors.tdml | 4 +-
.../processing_errors/ProcessingErrorsUnparse.tdml | 6 +-
.../dfdl-schema-validation-diagnostics.tdml | 6 +-
.../AttributeFormDefault.dfdl.xsd | 2 +-
.../MissingAppinfoSource.dfdl.xsd | 2 +-
.../MissingAppinfoSourceNonDfdl.dfdl.xsd | 2 +-
.../MissingClosingTag.dfdl.xsd | 2 +-
.../SchemaDefinitionErrors.tdml | 4 +-
.../schema_definition_errors/lineNumber.dfdl.xsd | 2 +-
.../section02/validation_errors/Validation.tdml | 16 ++---
.../section05/dfdl_xsdl_subset/DFDLSubset.tdml | 8 +--
.../apache/daffodil/section05/facets/Facets.tdml | 56 ++++++++--------
.../apache/daffodil/section05/facets/NulChars.tdml | 2 +-
.../daffodil/section05/facets/PatternRanges.tdml | 2 +-
.../daffodil/section05/facets/testBinary.dfdl.xsd | 2 +-
.../apache/daffodil/section05/simple_types/AJ.tdml | 2 +-
.../daffodil/section05/simple_types/AK.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/AL.dfdl.xsd | 2 +-
.../daffodil/section05/simple_types/BitOrder.tdml | 14 ++--
.../section05/simple_types/BitOrderInvalid.tdml | 2 +-
.../daffodil/section05/simple_types/Blobs.tdml | 2 +-
.../daffodil/section05/simple_types/Boolean.tdml | 2 +-
.../daffodil/section05/simple_types/Encodings.tdml | 2 +-
.../simple_types/RuntimeCalendarLanguage.tdml | 6 +-
.../section05/simple_types/SimpleTypes.tdml | 18 +++---
.../section05/simple_types/SimpleTypes2.tdml | 2 +-
.../section05/simple_types/SimpleTypesUnparse.tdml | 2 +-
.../section05/simple_types/WhiteSpace.tdml | 6 +-
.../simple_types/nonNegativeInteger.dfdl.xsd | 2 +-
.../section05/simple_types/simple-type-bases.tdml | 2 +-
.../daffodil/section05/simple_types/unions.tdml | 2 +-
.../section06/entities/DefaultProperties.dfdl.xsd | 2 +-
.../daffodil/section06/entities/Entities.tdml | 24 +++----
.../section06/entities/InvalidEntities.tdml | 2 +-
.../section06/entities/charClassEntities.dfdl.xsd | 2 +-
.../daffodil/section06/entities/entities_01.tdml | 12 ++--
.../section06/entities/utf16schema.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/ABC_IBM.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_IBM_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/ABC_invalid_2.dfdl.xsd | 2 +-
.../namespaces/address_namespace.dfdl.xsd | 2 +-
.../namespaces/address_no_namespace.dfdl.xsd | 2 +-
.../namespaces/charClassEntities.dfdl.xsd | 2 +-
.../namespaces/customer_namespace.dfdl.xsd | 4 +-
.../namespaces/customer_no_namespace.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_base.dfdl.xsd | 4 +-
.../section06/namespaces/cycle_step.dfdl.xsd | 4 +-
.../namespaces/ibm_format_compat.dfdl.xsd | 2 +-
.../namespaces/ibm_format_compat_2.dfdl.xsd | 2 +-
.../section06/namespaces/include01.dfdl.xsd | 2 +-
.../section06/namespaces/include02.dfdl.xsd | 2 +-
.../section06/namespaces/includeImport.tdml | 2 +-
.../section06/namespaces/multi_A_01.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_03.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_11_nons.dfdl.xsd | 4 +-
.../namespaces/multi_A_11_nons_valid.dfdl.xsd | 4 +-
.../section06/namespaces/multi_A_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_20.dfdl.xsd | 2 +-
.../section06/namespaces/multi_A_21.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_01.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_02.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_04.dfdl.xsd | 4 +-
.../namespaces/multi_B_04_invalid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_05_nons.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_06.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_06_valid.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_08.dfdl.xsd | 4 +-
.../section06/namespaces/multi_B_11.dfdl.xsd | 2 +-
.../section06/namespaces/multi_B_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_02.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_C_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_D_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_E_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_01.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_02.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_03.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_04.dfdl.xsd | 6 +-
.../namespaces/multi_base_04_invalid.dfdl.xsd | 4 +-
.../namespaces/multi_base_04_invalid2.dfdl.xsd | 4 +-
.../namespaces/multi_base_05_nons.dfdl.xsd | 4 +-
.../namespaces/multi_base_05_nons_with_A.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_06.dfdl.xsd | 8 +--
.../namespaces/multi_base_06_valid.dfdl.xsd | 8 +--
.../namespaces/multi_base_07_failure.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_08.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_09.dfdl.xsd | Bin 7630 -> 7634 bytes
.../section06/namespaces/multi_base_10.dfdl.xsd | 8 +--
.../section06/namespaces/multi_base_11.dfdl.xsd | 6 +-
.../namespaces/multi_base_11_valid.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_12.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_13.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_14.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_15.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_16.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_17.dfdl.xsd | 4 +-
.../section06/namespaces/multi_base_18.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_19.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_20.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_21.dfdl.xsd | 2 +-
.../section06/namespaces/multi_base_shi.dfdl.xsd | 6 +-
.../section06/namespaces/multi_base_shi2.dfdl.xsd | 6 +-
.../section06/namespaces/multi_temp.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceCharLim.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceRules.dfdl.xsd | 2 +-
.../section06/namespaces/namespaceRules2.dfdl.xsd | 2 +-
.../namespaces/namespaceSpecialChar.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/namespaces.tdml | 18 +++---
.../namespaces/predefined_format.dfdl.xsd | 2 +-
.../namespaces/primTypesPrefixes.dfdl.xsd | 2 +-
.../daffodil/section06/namespaces/qname1.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname2.dfdl.xsd | 4 +-
.../daffodil/section06/namespaces/qname3.dfdl.xsd | 2 +-
.../org/apache/daffodil/section06/namespaces/shi | 2 +-
.../namespaces/subfolder/multi_A_06_nons.dfdl.xsd | 4 +-
.../subfolder/multi_A_06_nons_valid.dfdl.xsd | 4 +-
.../namespaces/subfolder/multi_C_06_nons.dfdl.xsd | 2 +-
.../subfolder/multi_C_06_nons_valid.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test01sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test02sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch1.dfdl.xsd | 2 +-
.../section06/namespaces/test03sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test04sch2.dfdl.xsd | 2 +-
.../section06/namespaces/test05sch6.dfdl.xsd | 2 +-
.../section07/annotations/annotations.tdml | 2 +-
.../daffodil/section07/assertions/assert.tdml | 14 ++--
.../section07/defineFormat/defineFormat.dfdl.xsd | 2 +-
.../section07/defineFormat/defineFormat.tdml | 8 +--
.../defineFormat/defineFormat_withComment.dfdl.xsd | 2 +-
.../section07/discriminators/discriminator.tdml | 22 +++----
.../section07/discriminators/discriminator2.tdml | 2 +-
.../discriminators/multipleDiscriminators.tdml | 2 +-
.../discriminators/nestedChoiceDiscriminator.tdml | 2 +-
.../section07/escapeScheme/escapeScenarios.tdml | 14 ++--
.../section07/escapeScheme/escapeScheme.tdml | 26 ++++----
.../section07/escapeScheme/escapeSchemeNeg.tdml | 2 +-
.../escapeScheme/escapeSchemeUnparse.tdml | 6 +-
.../external_variables/external_variables.dfdl.xsd | 2 +-
.../external_variables/external_variables.tdml | 12 ++--
.../section07/property_syntax/PropertySyntax.tdml | 4 +-
.../property_syntax/property_syntax.dfdl.xsd | 2 +-
.../section07/variables/setVarWIthValueLength.tdml | 2 +-
.../daffodil/section07/variables/variables.tdml | 46 ++++++-------
.../section07/variables/variables_01.dfdl.xsd | 4 +-
.../property_scoping/PropertyScoping.tdml | 16 ++---
.../property_scoping/PropertyScoping_01.tdml | 14 ++--
.../property_scoping/defaultForm.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_02.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_03.dfdl.xsd | 2 +-
.../property_scoping/defaultForm_04.dfdl.xsd | 2 +-
.../representation_properties/RepProps.tdml | 2 +-
.../representation_properties/encodings.tdml | 6 +-
.../ContentFramingProps.tdml | 16 ++---
.../section12/aligned_data/Aligned_Data.tdml | 10 +--
.../section12/aligned_data/BinaryInput_01.tdml | 16 ++---
.../delimiter_properties/DelimiterProperties.tdml | 20 +++---
.../DelimiterPropertiesUnparse.tdml | 2 +-
.../delimiter_properties/testDFACreation.dfdl.xsd | 2 +-
.../testOptionalInfix.dfdl.xsd | 2 +-
.../daffodil/section12/lengthKind/AB.dfdl.xsd | 2 +-
.../apache/daffodil/section12/lengthKind/AI.tdml | 2 +-
.../apache/daffodil/section12/lengthKind/AN.tdml | 2 +-
.../section12/lengthKind/DelimitedTests.tdml | 10 +--
.../section12/lengthKind/EndOfParentTests.tdml | 2 +-
.../section12/lengthKind/ExplicitTests.tdml | 46 ++++++-------
.../section12/lengthKind/PatternTests.tdml | 14 ++--
.../section12/lengthKind/PrefixedTests.tdml | 30 ++++-----
.../daffodil/section12/lengthKind/implicit.tdml | 2 +-
.../length_properties/LengthProperties.tdml | 10 +--
.../apache/daffodil/section13/boolean/boolean.tdml | 6 +-
.../nillable/literal-character-nils-unparse.tdml | 4 +-
.../section13/nillable/literal-character-nils.tdml | 12 ++--
.../nillable/literal-value-nils-unparse.tdml | 10 +--
.../section13/nillable/literal-value-nils.tdml | 18 +++---
.../daffodil/section13/nillable/nillable.tdml | 4 +-
.../daffodil/section13/nillable/nillable2.tdml | 2 +-
.../apache/daffodil/section13/packed/packed.tdml | 28 ++++----
.../text_number_props/TextNumberProps.tdml | 4 +-
.../text_number_props/TextNumberPropsUnparse.tdml | 6 +-
.../text_number_props/TextStandardBase.tdml | 2 +-
.../org/apache/daffodil/section13/zoned/pv.tdml | 4 +-
.../org/apache/daffodil/section13/zoned/zoned.tdml | 2 +-
.../section14/occursCountKind/ockImplicit.tdml | 2 +-
.../section14/sequence_groups/SequenceGroup.tdml | 50 +++++++-------
.../sequence_groups/SequenceGroupDelimiters.tdml | 16 ++---
.../SequenceGroupInitiatedContent.tdml | 4 +-
.../sequence_groups/SequenceGroupNestedArray.tdml | 2 +-
.../sequence_groups/SequenceGroupUnparse.tdml | 2 +-
.../SequencesWithHiddenRefs.dfdl.xsd | 2 +-
.../SequencesWithHiddenRefsInvalid.dfdl.xsd | 2 +-
.../SimilarModelGroupElement1.dfdl.xsd | 2 +-
.../SimilarModelGroupElement2.dfdl.xsd | 2 +-
.../sequence_groups/SimilarModelGroupRoot.dfdl.xsd | 2 +-
.../sequenceWithComplexType.dfdl.xsd | 2 +-
.../section14/unordered_sequences/BE.dfdl.xsd | 2 +-
.../unordered_sequences/UnorderedSequences.tdml | 28 ++++----
.../unordered_namespaces_01.dfdl.xsd | 2 +-
.../unordered_namespaces_02.dfdl.xsd | 2 +-
.../unordered_namespaces_03.dfdl.xsd | 2 +-
.../choice_groups/ChoiceGroupInitiatedContent.tdml | 10 +--
.../choice_groups/ChoiceLengthExplicit.tdml | 4 +-
.../choice_groups/ChoicesInHiddenContexts.dfdl.xsd | 2 +-
.../choice_groups/SharedGroupTestSchema.dfdl.xsd | 2 +-
.../section15/choice_groups/choice-unparse.tdml | 2 +-
.../section15/choice_groups/choice-unparse2.tdml | 6 +-
.../section15/choice_groups/choice.dfdl.xsd | 2 +-
.../daffodil/section15/choice_groups/choice.tdml | 32 ++++-----
.../section15/choice_groups/choice1765.tdml | 2 +-
.../section15/choice_groups/choice1773.tdml | 2 +-
.../section15/choice_groups/choice2162.tdml | 2 +-
.../section15/choice_groups/choiceNests.tdml | 2 +-
.../section16/array_optional_elem/ArrayComb.tdml | 2 +-
.../array_optional_elem/ArrayOptionalElem.tdml | 22 +++----
.../UnparseArrayDelimitedOptionalElem.tdml | 2 +-
.../UnparseArrayExpressionConstant.tdml | 2 +-
.../UnparseArrayFixedOptionalElem.tdml | 2 +-
.../UnparseArrayImplicitOptionalElem.tdml | 2 +-
.../UnparseArrayParsedOptionalElem.tdml | 2 +-
.../arrays_optional_elements.dfdl.xsd | 2 +-
.../array_optional_elem/backtracking.tdml | 2 +-
.../section17/calc_value_properties/AA.tdml | 8 +--
.../section17/calc_value_properties/AQ.tdml | 2 +-
.../section17/calc_value_properties/AR.tdml | 2 +-
.../computedLengthFields.tdml | 8 +--
.../calc_value_properties/inputValueCalc.tdml | 4 +-
.../calc_value_properties/outputValueCalc.tdml | 2 +-
.../calc_value_properties/outputValueCalc2.tdml | 8 +--
.../calc_value_properties/outputValueCalc3.tdml | 2 +-
.../dfdl_expressions/expression_fail.tdml | 2 +-
.../section23/dfdl_expressions/expressions.tdml | 58 ++++++++---------
.../section23/dfdl_expressions/expressions2.tdml | 8 +--
.../section23/dfdl_expressions/expressions3.tdml | 14 ++--
.../expressions_unused_path_no_context.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/functions.tdml | 4 +-
.../section23/dfdl_expressions/s1.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/setVar.dfdl.xsd | 2 +-
.../section23/dfdl_expressions/valueLength.tdml | 4 +-
.../section23/dfdl_functions/BitFunctions.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsAnd.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsNot.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsOr.tdml | 2 +-
.../section23/dfdl_functions/BitFunctionsXor.tdml | 2 +-
.../section23/dfdl_functions/Functions-neg.tdml | 2 +-
.../section23/dfdl_functions/Functions.tdml | 16 ++---
.../section23/dfdl_functions/Functions_UTF8.tdml | 2 +-
.../section23/dfdl_functions/first_schema.dfdl.xsd | 4 +-
.../section23/dfdl_functions/home_schema.dfdl.xsd | 4 +-
.../dfdl_functions/second_schema.dfdl.xsd | 2 +-
.../runtime_properties/dynamicSeparator.tdml | 2 +-
.../runtime_properties/runtime-properties.tdml | 2 +-
.../regular_expressions/RegularExpressions.tdml | 2 +-
.../section31/escape_characters/Escapes.tdml | 2 +-
.../resources/org/apache/daffodil/udf/udfs.tdml | 2 +-
.../apache/daffodil/unparser/OVCAndLengthTest.tdml | 4 +-
.../apache/daffodil/unparser/envelopePayload.tdml | 6 +-
.../daffodil/unparser/parseUnparseMode.dfdl.xsd | 2 +-
.../unparser/parseUnparseModeTest.dfdl.xsd | 2 +-
.../daffodil/unparser/unparseNegInfosetTest.tdml | 2 +-
.../org/apache/daffodil/usertests/Book2.dfdl.xsd | 2 +-
.../org/apache/daffodil/usertests/SepTests.tdml | 12 ++--
.../daffodil/usertests/UserSubmittedTests.tdml | 6 +-
.../org/apache/daffodil/usertests/leaks.tdml | 2 +-
.../apache/daffodil/usertests/nameDOB_test.tdml | 2 +-
.../org/apache/daffodil/usertests/test-csv.tdml | 2 +-
.../usertests/testSSPNeverDiagnostic.tdml.xml | 2 +-
.../src/test/resources/test space/A B.dfdl.xsd | 2 +-
.../test space/test 1/multi_base_05_nons.dfdl.xsd | 2 +-
.../resources/test space/test 1/namespaces.tdml | 10 +--
.../test space/test 3/multi_B_05_nons.dfdl.xsd | 2 +-
.../section00/general/TestDisallowDocType.scala | 2 +-
.../section07/variables/TestVariables.scala | 4 +-
.../section13/validation_errors/PadCharacter.scala | 6 +-
.../org/apache/daffodil/udf/genericUdfSchema.xsd | 2 +-
.../main/resources/org1/xsd/innerEnvelope.dfdl.xsd | 4 +-
.../main/resources/org1/xsd/outerEnvelope.dfdl.xsd | 2 +-
.../src/main/resources/org2/xsd/formats.dfdl.xsd | 2 +-
.../src/test/resources/org1/xsd/testInner.dfdl.xsd | 4 +-
.../test/resources/org2/testEmbeddedSchema.tdml | 8 +--
.../test/resources/org2/xsd/testPayload.dfdl.xsd | 4 +-
.../src/main/resources/bitorder.tutorial.tdml.xml | 18 +++---
.../src/main/resources/bugReportTemplate.tdml.xml | 4 +-
tutorials/src/main/resources/tdmlTutorial.tdml.xml | 4 +-
.../testTDMLTutorialFile2.tutorial.tdml.xml | 4 +-
499 files changed, 1278 insertions(+), 1278 deletions(-)
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd
index fe627afca..9f1afd92b 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/ABC_IBM_invalid.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:ibmSchExtn="http://www.ibm.com/schema/extensions"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:element dfdl:terminator="%NL;" name="ABC">
<xsd:complexType>
<xsd:sequence dfdl:separator="">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/blob_backtracking.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/blob_backtracking.dfdl.xsd
index 4bc3c2f2e..ce71e0e4a 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/blob_backtracking.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/blob_backtracking.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/charClassEntities.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/charClassEntities.dfdl.xsd
index 8128a30cf..297ffbae0 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/charClassEntities.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/charClassEntities.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema.dfdl.xsd
index 70fcbd3b6..92cf9d620 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_02.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_02.dfdl.xsd
index 4500f5e30..f6dece71e 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_02.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_02.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_03.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_03.dfdl.xsd
index c9f81161c..2b31cb8a6 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_03.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/cli_schema_03.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:ex="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/complex_types.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/complex_types.dfdl.xsd
index c0ada62b0..e175a2901 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/complex_types.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/complex_types.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tns="http://complexSchema.com"
targetNamespace="http://complexSchema.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="tns:GeneralFormat" separator=""
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/global_element.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/global_element.dfdl.xsd
index a6975fd5f..6836b6f96 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/global_element.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/global_element.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tns="http://baseSchema.com"
targetNamespace="http://baseSchema.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/large_blob.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/large_blob.dfdl.xsd
index 6746f736b..3df6bcc79 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/large_blob.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/large_blob.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/prefixed_length.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/prefixed_length.dfdl.xsd
index f778689cc..163a496a5 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/prefixed_length.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/prefixed_length.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/single.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/single.dfdl.xsd
index c8a517d5c..f7953f846 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/single.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/single.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:tns="http://example.com"
targetNamespace="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="ex:GeneralFormat"/>
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/suppressWarnTest.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/suppressWarnTest.dfdl.xsd
index 17e199ae5..a2d024438 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/suppressWarnTest.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/suppressWarnTest.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:ex="http://example.com"
elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
@@ -32,7 +32,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<!-- Generates a warning unless it is suppressed by way of the tunable -->
<xs:element name="e1" dfdl:lengthKind="implicit">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/testNonCompatibleImplementation.tdml b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/testNonCompatibleImplementation.tdml
index 26b3c1a08..38c7f4a17 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/testNonCompatibleImplementation.tdml
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/testNonCompatibleImplementation.tdml
@@ -25,7 +25,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema">
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"/>
<xs:element name="e1" type="xs:int"/>
</tdml:defineSchema>
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/trace_input.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/trace_input.dfdl.xsd
index 559acd6d6..a954a151a 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/trace_input.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/trace_input.dfdl.xsd
@@ -26,7 +26,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/unqualified_path_step.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/unqualified_path_step.dfdl.xsd
index 89f565194..8fbff04bf 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/cli/unqualified_path_step.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/cli/unqualified_path_step.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns="http://example.com"
elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/layers/buggy.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/layers/buggy.dfdl.xsd
index e100e9196..eb67855fc 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/layers/buggy.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/layers/buggy.dfdl.xsd
@@ -28,11 +28,11 @@
xmlns:tns="http://example.com"
targetNamespace="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<import
namespace="urn:org.apache.daffodil.layers.buggy"
- schemaLocation="org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd"/>
+ schemaLocation="/org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd b/daffodil-cli/src/test/resources/org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd
index 83b4ac4e9..7ddbe4bce 100644
--- a/daffodil-cli/src/test/resources/org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/org/apache/daffodil/layers/xsd/buggyLayer.dfdl.xsd
@@ -26,7 +26,7 @@
targetNamespace="urn:org.apache.daffodil.layers.buggy"
elementFormDefault="unqualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd b/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
index 7ee50ae71..1e70c9342 100644
--- a/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
+++ b/daffodil-cli/src/test/resources/test/cli/fixedLength.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns:tns="http://www.example.org/example1/"
targetNamespace="http://www.example.org/example1/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd
index eecf2827d..33d3af54d 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.dfdl.xsd
@@ -25,7 +25,7 @@
<!-- Representation property bindings -->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.tdml b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.tdml
index 419d5ef7a..eea3f18e7 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.tdml
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/ex_nums.tdml
@@ -59,7 +59,7 @@
-->
<tdml:defineSchema name="length">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="GeneralFormat" representation="binary"/>
<xs:element name="e1">
<xs:complexType>
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/nested.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/nested.dfdl.xsd
index 640c32294..af54c1a93 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/nested.dfdl.xsd
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/nested.dfdl.xsd
@@ -24,7 +24,7 @@
<!-- Representation property bindings -->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/padtest.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/padtest.dfdl.xsd
index fcd18daad..2b7885d53 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/padtest.dfdl.xsd
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/padtest.dfdl.xsd
@@ -25,7 +25,7 @@
<!-- Binary representation properties -->
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/simple.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/simple.dfdl.xsd
index 6c74fe040..3f75517be 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/simple.dfdl.xsd
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/simple.dfdl.xsd
@@ -25,7 +25,7 @@
<!-- Binary representation properties -->
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format
diff --git a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/variablelen.dfdl.xsd b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/variablelen.dfdl.xsd
index 45496ec6a..39f59a70d 100644
--- a/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/variablelen.dfdl.xsd
+++ b/daffodil-codegen-c/src/test/resources/org/apache/daffodil/codegen/c/variablelen.dfdl.xsd
@@ -25,7 +25,7 @@
<!-- Binary representation properties -->
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format
diff --git a/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml b/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
index b328c6147..ed1717e2e 100644
--- a/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
+++ b/daffodil-core/src/test/resources/test/example-of-most-dfdl-constructs.dfdl.xml
@@ -23,7 +23,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<documentation>
diff --git a/daffodil-core/src/test/resources/test/example_a02_targetnamespace_unqualified.dfdl.xsd b/daffodil-core/src/test/resources/test/example_a02_targetnamespace_unqualified.dfdl.xsd
index 1e6b9809b..04f86aff5 100644
--- a/daffodil-core/src/test/resources/test/example_a02_targetnamespace_unqualified.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_a02_targetnamespace_unqualified.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/resources/test/example_c02_targetnamespace_qualified.dfdl.xsd b/daffodil-core/src/test/resources/test/example_c02_targetnamespace_qualified.dfdl.xsd
index b3de514f8..aa8a28cbe 100644
--- a/daffodil-core/src/test/resources/test/example_c02_targetnamespace_qualified.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_c02_targetnamespace_qualified.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified.dfdl.xsd b/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified.dfdl.xsd
index 9ea495242..6e404a9d8 100644
--- a/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:b02="http://b02.com"
elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified_with_default.dfdl.xsd b/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified_with_default.dfdl.xsd
index 8829d982f..11eca3d04 100644
--- a/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified_with_default.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_nested_namespaces_qualified_with_default.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns:b02="http://b02.com"
elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/resources/test/example_nested_namespaces_unqualified.dfdl.xsd b/daffodil-core/src/test/resources/test/example_nested_namespaces_unqualified.dfdl.xsd
index 2595695fe..4e780638e 100644
--- a/daffodil-core/src/test/resources/test/example_nested_namespaces_unqualified.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_nested_namespaces_unqualified.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:c02="http://c02.com"
xmlns:b02="http://b02.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/resources/test/example_no_targetnamespace.dfdl.xsd b/daffodil-core/src/test/resources/test/example_no_targetnamespace.dfdl.xsd
index d43916d2f..535c9e745 100644
--- a/daffodil-core/src/test/resources/test/example_no_targetnamespace.dfdl.xsd
+++ b/daffodil-core/src/test/resources/test/example_no_targetnamespace.dfdl.xsd
@@ -20,7 +20,7 @@
we decided to copy it instead of trying to go the dependency route-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI.scala
index 8cef552e5..a27aa359c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI.scala
@@ -28,7 +28,7 @@ class TestDFDLParser_New {
@Test def testParseOccursCountKindOfParsedDelimitedBySeparatorImplicitWithMaxOccurs()
: Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:terminator=".">
<xs:complexType>
@@ -46,7 +46,7 @@ class TestDFDLParser_New {
@Test def testParseOccursCountKindOfParsedDelimitedBySeparatorImplicitWithMaxOccurs2()
: Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:terminator=".">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala
index ba9537c6a..3120ffa14 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestAPI1.scala
@@ -30,7 +30,7 @@ class TestDFDLParser {
@Test def testParseSimple1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 4 }"/>,
)
@@ -41,7 +41,7 @@ class TestDFDLParser {
@Test def testParseSequenceOfJustOneScalar(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -58,7 +58,7 @@ class TestDFDLParser {
@Test def testParseSequence1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -76,7 +76,7 @@ class TestDFDLParser {
@Test def testParseSequence2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1">
<xs:complexType>
@@ -93,7 +93,7 @@ class TestDFDLParser {
@Test def testParseSequence3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format separatorSuppressionPolicy="never" separatorPosition="infix" ref="tns:GeneralFormat"/>,
<xs:element name="e1">
<xs:complexType>
@@ -110,7 +110,7 @@ class TestDFDLParser {
@Test def testInt1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -127,7 +127,7 @@ class TestDFDLParser {
@Test def testInt2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -146,7 +146,7 @@ class TestDFDLParser {
@Test def testShort1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -163,7 +163,7 @@ class TestDFDLParser {
@Test def testShort2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -181,7 +181,7 @@ class TestDFDLParser {
@Test def testByte1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -198,7 +198,7 @@ class TestDFDLParser {
@Test def testNumber1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -220,7 +220,7 @@ class TestDFDLParser {
@Test def testNumber2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="mersenne" type="xs:byte" dfdl:lengthKind="explicit" dfdl:length="{ 4 }"/>,
)
@@ -230,7 +230,7 @@ class TestDFDLParser {
@Test def testNumber3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="perfect" type="xs:byte" dfdl:textNumberPattern="+0" dfdl:lengthKind="explicit" dfdl:length="{ 2 }"/>,
)
@@ -240,7 +240,7 @@ class TestDFDLParser {
@Test def testUnsignedLong1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="needs-square-root" type="xs:unsignedLong" dfdl:lengthKind="explicit" dfdl:length="{ 2 }"/>,
)
@@ -252,7 +252,7 @@ class TestDFDLParser {
@Test def testUnsignedInt1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="world-population" type="xs:unsignedInt" dfdl:lengthKind="explicit" dfdl:length="{ 13 }"/>,
)
@@ -265,7 +265,7 @@ class TestDFDLParser {
@Test def testUnsignedShort1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="last-element-indicator" type="xs:unsignedShort" dfdl:lengthKind="explicit" dfdl:length="{ 2 }"/>,
)
@@ -277,7 +277,7 @@ class TestDFDLParser {
@Test def testUnsignedByte1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bits" type="xs:unsignedByte" dfdl:lengthKind="explicit" dfdl:length="{ 3 }"/>,
)
@@ -289,7 +289,7 @@ class TestDFDLParser {
@Test def testIntTooLong(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -307,7 +307,7 @@ class TestDFDLParser {
@Test def testParseSequenceInt(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format separatorSuppressionPolicy="never" separatorPosition="infix" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:initiator="[[" dfdl:terminator="]]">
<xs:complexType>
@@ -324,7 +324,7 @@ class TestDFDLParser {
@Test def testParseSequenceInt3Operands(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format separatorSuppressionPolicy="never" separatorPosition="infix" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:initiator="[[" dfdl:terminator="]]">
<xs:complexType>
@@ -341,7 +341,7 @@ class TestDFDLParser {
@Test def testBadInt(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ 1 }"/>,
)
@@ -353,7 +353,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsed(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -371,7 +371,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsedWithTerminator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -389,7 +389,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsedDelimitedByTerminator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -408,7 +408,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsedDelimitedByTerminator2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:terminator=".">
<xs:complexType>
@@ -426,7 +426,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsedDelimitedBySeparator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:terminator=".">
<xs:complexType>
@@ -445,7 +445,7 @@ class TestDFDLParser {
@Test def testParseOccursCountKindOfParsedDelimitedBySeparator3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:terminator=".">
<xs:complexType>
@@ -464,7 +464,7 @@ class TestDFDLParser {
@Test def testBinaryIntMinusOne(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -481,7 +481,7 @@ class TestDFDLParser {
@Test def testBinaryInts(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -501,7 +501,7 @@ class TestDFDLParser {
@Test def testBinaryDoubleOne(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" binaryFloatRep="ieee" ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:double" dfdl:lengthKind="implicit"/>,
)
@@ -512,7 +512,7 @@ class TestDFDLParser {
@Test def testBinaryDoubleMinusOne(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" binaryFloatRep="ieee" ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:double" dfdl:lengthKind="implicit"/>,
)
@@ -523,7 +523,7 @@ class TestDFDLParser {
@Test def testBinaryDoubleLSB(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" binaryFloatRep="ieee" ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:double" dfdl:lengthKind="implicit"/>,
)
@@ -534,7 +534,7 @@ class TestDFDLParser {
@Test def testBinaryDoubles(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" binaryFloatRep="ieee" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -556,7 +556,7 @@ class TestDFDLParser {
@Test def testTextDoubles(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -576,7 +576,7 @@ class TestDFDLParser {
@Test def testBinaryFloats(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" binaryFloatRep="ieee" ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -596,7 +596,7 @@ class TestDFDLParser {
@Test def testTextFloats(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestDsomCompiler3.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestDsomCompiler3.scala
index 29005ae2e..e3eb7d036 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestDsomCompiler3.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestDsomCompiler3.scala
@@ -39,7 +39,7 @@ class TestDsomCompiler3 {
@Test def testTmpDirProvided(): Unit = {
val sc = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1">
<xs:annotation>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala
index c43341e77..e0ddf4f59 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestForHeapDump.scala
@@ -54,7 +54,7 @@ class TestForHeapDump {
*/
def getDataProcWithInclude() = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
rootElem,
elementFormDefault = "unqualified",
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala
index 31371299c..2475c7953 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/api/TestParseIndividualMessages.scala
@@ -47,7 +47,7 @@ class TestParseIndividualMessages {
// DFDL schema for element e1 which occupies exactly 4 bytes.
//
val exactly4ByteSch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" byteOrder="bigEndian" binaryNumberRep="binary" ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="4"/>,
)
@@ -88,7 +88,7 @@ class TestParseIndividualMessages {
// DFDL schema for delimited element.
//
private def delimitedSchema(term: String) = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="text" ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="delimited"
dfdl:terminator={term} />,
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
index 123f969c8..722e30ffe 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionEvaluation.scala
@@ -73,7 +73,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_a() = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="a" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(5) }"/>,
)
@@ -86,7 +86,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_ba(): Unit = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
@@ -105,7 +105,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_arrayCount1(): Unit = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
@@ -123,7 +123,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_arrayIndex1(): Unit = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
@@ -141,7 +141,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_absPathWithArrayIndex1(): Unit = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
@@ -159,7 +159,7 @@ class TestDFDLExpressionEvaluation extends Parsers {
@Test def test_ivc1(): Unit = {
val schema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
index 51138bfa5..a3d979c98 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDFDLExpressionTree.scala
@@ -36,7 +36,7 @@ class TestDFDLExpressionTree extends Parsers {
val qn = GlobalQName(Some("daf"), "testExpr", XMLUtils.dafintURI)
val dummySchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="title" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(5) }"/>,
)
@@ -85,7 +85,7 @@ class TestDFDLExpressionTree extends Parsers {
}
val testSchema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bookstore">
<xs:complexType>
@@ -103,7 +103,7 @@ class TestDFDLExpressionTree extends Parsers {
)
val aSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="a" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ xs:string(xs:unsignedInt(5)) }"/>,
)
@@ -130,7 +130,7 @@ class TestDFDLExpressionTree extends Parsers {
}
val bSchema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
index 9eb8a3572..44235f1da 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dpath/TestDPath.scala
@@ -26,7 +26,7 @@ import org.apache.daffodil.lib.util.SchemaUtils
class TestDPath {
val testSchemaNoRef = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="binary" binaryNumberRep="binary" lengthUnits="bytes"/>,
<xs:element name="a">
<xs:complexType>
@@ -49,7 +49,7 @@ class TestDPath {
}
val testSchema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="binary" binaryNumberRep="binary" lengthUnits="bytes"/>,
<xs:element name="a">
<xs:complexType>
@@ -73,7 +73,7 @@ class TestDPath {
}
val testSchema2 = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="binary" binaryNumberRep="binary" lengthUnits="bytes"/>,
<xs:element name="a">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
index 04b6bea03..277459659 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestAppinfoSyntax.scala
@@ -45,7 +45,7 @@ class TestAppinfoSyntax {
val sc = <xs:schema xmlns:xs={
xsd
} xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo={nnURI}>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source={dfdl} foo:nonNativeAttribute1={expected}>
<dfdl:format ref="GeneralFormat"/>
@@ -81,7 +81,7 @@ class TestAppinfoSyntax {
val sc = <xs:schema xmlns:xs={
xsd
} xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo={nnURI}>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source={dfdl} foo:nonNativeAttribute1={expected}>
<dfdl:format ref="GeneralFormat"/>
@@ -128,7 +128,7 @@ class TestAppinfoSyntax {
val sc = <xs:schema xmlns:xs={
xsd
} xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo={nnURI}>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source={dfdl} foo:nonNativeAttribute1={expected}>
<dfdl:format ref="GeneralFormat"/>
@@ -166,7 +166,7 @@ class TestAppinfoSyntax {
val sc = <xs:schema xmlns:xs={
xsd
} xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo={nnURI} xmlns:bar={nnURI2}>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source={nnURI} foo:nonNativeAttribute1={expected}>
<!-- since the source is not DFDL's, this should be completely ignored. -->
@@ -212,7 +212,7 @@ class TestAppinfoSyntax {
xsd
} xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo={nnURI}>
<!-- This is a comment -->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!-- This is a comment -->
<xs:annotation>
<!-- This is a comment -->
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
index 3e3db1096..26830d58f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompiler.scala
@@ -63,7 +63,7 @@ class TestDsomCompiler {
@Test def testHasProps(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -85,7 +85,7 @@ class TestDsomCompiler {
@Test def testSchemaValidationSubset(): Unit = {
val sch: Node = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list">
<xs:complexType>
@@ -112,7 +112,7 @@ class TestDsomCompiler {
// are supposed to anyway.
@Test def testTypeReferentialError(): Unit = {
val sch: Node = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="typeDoesNotExist"/>,
)
@@ -141,7 +141,7 @@ class TestDsomCompiler {
@Test def testSchemaValidationPropertyChecking(): Unit = {
val s: Node = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list">
<xs:complexType>
@@ -163,7 +163,7 @@ class TestDsomCompiler {
@Test def test2(): Unit = {
val sc = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1">
<xs:annotation>
@@ -193,7 +193,7 @@ class TestDsomCompiler {
@Test def testSequence1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1">
<xs:annotation>
@@ -585,7 +585,7 @@ class TestDsomCompiler {
@Test def testDfdlRef(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:defineFormat name="ref1"> <dfdl:format initiator=":"/> </dfdl:defineFormat>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:ref="tns:ref1" type="xs:string">
</xs:element>,
@@ -602,7 +602,7 @@ class TestDsomCompiler {
@Test def testGetQName() = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:defineFormat name="ref1">
<dfdl:format initiator=":" alignmentUnits="bits"/>
</dfdl:defineFormat>,
@@ -635,7 +635,7 @@ class TestDsomCompiler {
@Test def test_escapeSchemeOverride() = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" separator="" initiator="" terminator="" emptyValueDelimiterPolicy="none" textNumberRep="standard" representation="text" occursStopValue="-1" occursCountKind="expression" escapeSchemeRef="pound"/>
<dfdl:defineEscapeScheme name="pound">
<dfdl:escapeScheme escapeCharacter='#' escapeKind="escapeCharacter"/>
@@ -704,7 +704,7 @@ class TestDsomCompiler {
@Test def testPathWithIndexes(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="tns:myType"/>
<xs:complexType name="myType">
@@ -745,7 +745,7 @@ class TestDsomCompiler {
@Test def testInitiator(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:string" dfdl:initiator="*" dfdl:lengthKind="explicit" dfdl:length="{ 4 }"/>,
)
@@ -760,7 +760,7 @@ class TestDsomCompiler {
@Test def testTerminator(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:string" dfdl:terminator="!" dfdl:lengthKind="explicit" dfdl:length="{ 2 }"/>,
)
@@ -775,7 +775,7 @@ class TestDsomCompiler {
@Test def testDelims(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:string" dfdl:initiator="*" dfdl:terminator="! $" dfdl:lengthKind="explicit" dfdl:length="{ 2 }"/>,
)
@@ -790,7 +790,7 @@ class TestDsomCompiler {
// @Test def testUnparseMultiElem1() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -819,7 +819,7 @@ class TestDsomCompiler {
@Test def testUnparseMultiElem2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1">
<xs:annotation>
@@ -849,7 +849,7 @@ class TestDsomCompiler {
// @Test def testUnparseNested() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -887,7 +887,7 @@ class TestDsomCompiler {
// // @Test def testUnparseNestedChildren() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -925,7 +925,7 @@ class TestDsomCompiler {
// @Test def testUnparseDelimited() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -954,7 +954,7 @@ class TestDsomCompiler {
// @Test def testUnparseAlignmentBits() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -979,7 +979,7 @@ class TestDsomCompiler {
// @Test def testUnparseChoice1() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -1014,7 +1014,7 @@ class TestDsomCompiler {
// @Test def testUnparseChoice2() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -1049,7 +1049,7 @@ class TestDsomCompiler {
@Test def testUnparseBinaryIntBE(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:int" dfdl:representation="binary"/>,
)
@@ -1065,7 +1065,7 @@ class TestDsomCompiler {
@Test def testUnparseBinaryIntLE(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:int" dfdl:representation="binary" dfdl:byteOrder='littleEndian'/>,
)
@@ -1081,7 +1081,7 @@ class TestDsomCompiler {
// @Test def testUnparseBinary1() {
// val testSchema = SchemaUtils.dfdlTestSchema(
- // <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ // <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
// <dfdl:format ref="tns:GeneralFormat"/>,
//
// <xs:element name="list" type="tns:example1">
@@ -1106,7 +1106,7 @@ class TestDsomCompiler {
@Test def testHasPatternFacets(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="tns:st1" dfdl:lengthKind="explicit" dfdl:length="1"/>
<xs:simpleType name="st1">
@@ -1132,7 +1132,7 @@ class TestDsomCompiler {
@Test def testPatternFacetsInheritance(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" type="tns:st1" dfdl:lengthKind="explicit" dfdl:length="1"/>
<xs:simpleType name="st1">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
index 7565b62ac..64357ef65 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestDsomCompilerUnparse1.scala
@@ -33,7 +33,7 @@ class TestDsomCompilerUnparse1 {
@Test def testUnparse1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -55,7 +55,7 @@ class TestDsomCompilerUnparse1 {
*/
@Test def testUnparse2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -76,7 +76,7 @@ class TestDsomCompilerUnparse1 {
*/
@Test def testUnparse3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -97,7 +97,7 @@ class TestDsomCompilerUnparse1 {
*/
@Test def testUnparse4(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;" truncateSpecifiedLengthString="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:initiator="!#" dfdl:terminator="#!">
<xs:complexType>
@@ -125,7 +125,7 @@ class TestDsomCompilerUnparse1 {
*/
@Test def testUnparse5(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
<dfdl:defineEscapeScheme name="pound">
<dfdl:escapeScheme escapeCharacter='#' escapeKind="escapeCharacter" escapeEscapeCharacter="" extraEscapedCharacters="" generateEscapeBlock="whenNeeded"/>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
index 0ea16fde9..5590fa2b9 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestExternalVariables.scala
@@ -53,7 +53,7 @@ class TestExternalVariables {
def generateSD(topLevelAnnotations: Seq[Node] = <dfdl:format ref="tns:GeneralFormat"/>) = {
lazy val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
topLevelAnnotations,
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="fake2" type="tns:fakeCT"/>
@@ -77,7 +77,7 @@ class TestExternalVariables {
def generateTestSchema(topLevelAnnotations: Seq[Node]) = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
topLevelAnnotations,
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="fake2" type="tns:fakeCT"/>
@@ -103,7 +103,7 @@ class TestExternalVariables {
hasDefaultNamespace: Boolean = true,
) = {
val sch = SchemaUtils.dfdlTestSchemaWithTarget(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
topLevelAnnotations,
<xs:import schemaLocation={importSchemaLocation} namespace=""/>
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"/>
@@ -127,7 +127,7 @@ class TestExternalVariables {
def generateTestSchemaNoTarget(topLevelAnnotations: Seq[Node]) = {
val sch = SchemaUtils.dfdlTestSchemaWithTarget(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
topLevelAnnotations,
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="fake2" type="fakeCT"/>
@@ -149,7 +149,7 @@ class TestExternalVariables {
def generateTestSchemaVmap(topLevelAnnotations: Seq[Node], theTargetNS: String) = {
val sch = SchemaUtils.dfdlTestSchemaWithTarget(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
topLevelAnnotations,
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"
dfdl:inputValueCalc="{ $ex:var1 }" />,
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala
index f06205181..becb5a2d6 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInputValueCalc.scala
@@ -29,7 +29,7 @@ class TestInputValueCalc {
// @Test
@Test def testInputValueCalc1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:string" dfdl:inputValueCalc="{ xs:string(42) }" />,
)
@@ -41,7 +41,7 @@ class TestInputValueCalc {
// @Test
@Test def testInputValueCalcString2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii"/>,
<xs:element name="data">
<xs:complexType>
@@ -61,7 +61,7 @@ class TestInputValueCalc {
// @Test
@Test def testInputValueCalcInt3(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii"/>,
<xs:element name="data">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala
index ee99a1924..488337bec 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestInteriorAlignmentElimination.scala
@@ -37,7 +37,7 @@ class TestInteriorAlignmentElimination {
*/
@Test def testInteriorAlign1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="binary" lengthKind="implicit" lengthUnits="bytes" alignmentUnits="bytes"/>,
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala
index 6a3d810dc..7fe1ad62d 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestIsScannable.scala
@@ -34,7 +34,7 @@ class TestIsScannable {
@Test def testIsScannableAllText1(): Unit = {
val sc = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="utf-8"/>,
<xs:element name="list">
<xs:complexType>
@@ -65,7 +65,7 @@ class TestIsScannable {
@Test def testIsScannableHasBinary1(): Unit = {
val sc = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list">
<xs:complexType>
@@ -100,7 +100,7 @@ class TestIsScannable {
@Test def testIsScannableDifferentEncodings1(): Unit = {
val sc = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="utf-8"/>,
<xs:element name="list">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes.scala
index 90701b093..e195d6f61 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes.scala
@@ -31,7 +31,7 @@ class TestMiddleEndAttributes {
@Test def test_hasStaticallyRequiredOccurrencesInDataRepresentation_1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -58,7 +58,7 @@ class TestMiddleEndAttributes {
@Test def test_hasStaticallyRequiredOccurrencesInDataRepresentation_2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="text" occursCountKind="parsed" lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -85,7 +85,7 @@ class TestMiddleEndAttributes {
@Test def testRequiredSiblings(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="text" occursCountKind="parsed" lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -118,7 +118,7 @@ class TestMiddleEndAttributes {
@Test def testStaticallyFirstWithChoice(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="text" occursCountKind="parsed" lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator="" separator="" ignoreCase="no"
alignment="1" alignmentUnits="bytes" leadingSkip="0" trailingSkip="0"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
@@ -156,7 +156,7 @@ class TestMiddleEndAttributes {
@Test def testNearestEnclosingSequenceElementRef(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" occursCountKind="parsed" lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator="" separator="" ignoreCase="no" initiatedContent="no"/>,
<xs:element name="e1" dfdl:lengthKind="explicit" dfdl:length="{ 1 }"/>
<xs:element name="e2" dfdl:lengthKind="implicit">
@@ -185,7 +185,7 @@ class TestMiddleEndAttributes {
@Test def testImmediatelyEnclosingModelGroup1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="doc">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes2.scala
index e15a0e809..5953e5b32 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes2.scala
@@ -26,7 +26,7 @@ class TestMiddleEndAttributes2 {
@Test def testNestedSequencePrefixSep() = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" encoding="US-ASCII"/>,
<xs:element name="e1">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes3.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes3.scala
index 1ac5c9a2a..880e1b895 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes3.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestMiddleEndAttributes3.scala
@@ -26,7 +26,7 @@ class TestMiddleEndAttributes3 {
@Test def testNextParentElements() = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" encoding="US-ASCII"/>,
<xs:group name="IPSrcGrp">
<xs:sequence>
@@ -71,7 +71,7 @@ class TestMiddleEndAttributes3 {
@Test def testNextParentElements2() = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" encoding="US-ASCII"/>,
<xs:group name="IPSrcGrp">
<xs:sequence>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
index c8e51c4fe..95ee4cc14 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestPolymorphicUpwardRelativeExpressions.scala
@@ -39,7 +39,7 @@ class TestPolymorphicUpwardRelativeExpressions {
*/
@Test def testPoly1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -156,7 +156,7 @@ class TestPolymorphicUpwardRelativeExpressions {
@Test def testPoly2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestRefMap.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestRefMap.scala
index 509ad93b9..580aa2282 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestRefMap.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestRefMap.scala
@@ -33,7 +33,7 @@ class TestRefMap {
@Test def testRefMapEmpty(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="xs:int" dfdl:length="1" dfdl:lengthKind="explicit"/>,
)
@@ -51,7 +51,7 @@ class TestRefMap {
@Test def testRefMapComplex1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -77,7 +77,7 @@ class TestRefMap {
@Test def testRefMapGroupRefSeq1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -112,7 +112,7 @@ class TestRefMap {
@Test def testRefMapGroupRefChoice1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -148,7 +148,7 @@ class TestRefMap {
@Test def testRefMapGroupRefNest1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -195,7 +195,7 @@ class TestRefMap {
@Test def testRefMapNonExplosion1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -245,7 +245,7 @@ class TestRefMap {
@Test def testRefMapExplosion2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -297,7 +297,7 @@ class TestRefMap {
@Test def testRefMapExplosion3(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="r">
<xs:complexType>
@@ -351,7 +351,7 @@ class TestRefMap {
@Test def testRefMapExplosion4(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e5">
<xs:complexType>
@@ -413,7 +413,7 @@ class TestRefMap {
@Test def testRefMapExplosion5(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e6">
<xs:complexType>
@@ -483,7 +483,7 @@ class TestRefMap {
@Test def testRefMapExplosion6(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e7">
<xs:complexType>
@@ -561,7 +561,7 @@ class TestRefMap {
@Test def testRefMapExplosion7(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e8">
<xs:complexType>
@@ -657,7 +657,7 @@ class TestRefMap {
*/
@Test def testUnusedGroup1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="r" type="ex:ct"/>
<xs:complexType name="ct">
@@ -703,7 +703,7 @@ class TestRefMap {
}
lazy val testRootPathsSchema1 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
//
// note that the first element below will be the root element.
@@ -813,7 +813,7 @@ class TestRefMap {
}
lazy val testRootPathsSchema2 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
//
// note that the first element below will be the root element.
@@ -851,7 +851,7 @@ class TestRefMap {
}
lazy val testRootPathsSchema3 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
//
// note that the first element below will be the root element.
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala
index 1c5271ffc..a62fdf0fe 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/TestSimpleTypeUnions.scala
@@ -36,7 +36,7 @@ class TestSimpleTypeUnions {
val example = XMLUtils.EXAMPLE_NAMESPACE
val testSchema1 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="GeneralFormat"/>,
<xs:simpleType name="int1Type">
<xs:restriction base="xs:int">
@@ -159,7 +159,7 @@ class TestSimpleTypeUnions {
}
val testSchema2 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="GeneralFormat"/>,
<xs:simpleType name="int19Type">
<xs:restriction base="xs:int">
@@ -300,7 +300,7 @@ class TestSimpleTypeUnions {
}
val testSchema3 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="GeneralFormat"/>,
<xs:simpleType name="fooXbar">
<xs:restriction base="xs:string">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala
index ae9de30b9..1af814504 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/dsom/walker/TestDSOMWalker.scala
@@ -28,7 +28,7 @@ class TestDSOMWalker {
@Test def testComplexTypesAndEndEvents(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="ex:GeneralFormat"
alignment="implicit" alignmentUnits="bits" occursCountKind="implicit"
lengthKind="delimited" encoding="ASCII"/>,
@@ -144,7 +144,7 @@ class TestDSOMWalker {
@Test def testAllSimpleTypes(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="ex:GeneralFormat"
alignment="implicit" alignmentUnits="bits" occursCountKind="implicit"
lengthKind="implicit" encoding="ASCII"/>,
@@ -244,7 +244,7 @@ class TestDSOMWalker {
@Test def testOptionalField(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="ex:GeneralFormat"
alignment="implicit" alignmentUnits="bits" occursCountKind="implicit"
lengthKind="delimited" encoding="ASCII"/>,
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
index 7b96c0de0..20016522e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives.scala
@@ -29,7 +29,7 @@ class TestPrimitives {
@Test def testInitiator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" terminator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 4 }" dfdl:initiator="abcd">
</xs:element>,
@@ -42,7 +42,7 @@ class TestPrimitives {
@Test def testTerminator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 4 }" dfdl:terminator="efgh">
</xs:element>,
@@ -55,7 +55,7 @@ class TestPrimitives {
@Test def testSeparator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" terminator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -74,7 +74,7 @@ class TestPrimitives {
@Test def testLengthKindDelimited(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" terminator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="delimited">
<xs:complexType>
@@ -93,7 +93,7 @@ class TestPrimitives {
@Test def testLengthKindDelimited2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" terminator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="delimited">
<xs:complexType>
@@ -111,7 +111,7 @@ class TestPrimitives {
@Test def testLengthKindDelimited3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" terminator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="delimited">
<xs:complexType>
@@ -137,7 +137,7 @@ class TestPrimitives {
@Test def testDelimiterInheritance(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:defineFormat name="config">
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" truncateSpecifiedLengthString="no" textBidi="no" floating="no" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="implicit" lengthUnits="bytes" initiatedContent="no" sequenceKind="ordered" ignoreCase="no" textPadKind="none" textTrimKind="none" textStandardBase="10" textNumberJustification="right" separatorPosition="infix" separatorSuppressionPolic [...]
</dfdl:defineFormat>
@@ -177,7 +177,7 @@ class TestPrimitives {
@Test def testEntityReplacementSeparator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" terminator="" ignoreCase="no"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -196,7 +196,7 @@ class TestPrimitives {
@Test def testEntityReplacementInitiator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" terminator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 4 }" dfdl:initiator="%NUL;">
</xs:element>,
@@ -208,7 +208,7 @@ class TestPrimitives {
@Test def testEntityReplacementTerminator(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" representation="text" lengthUnits="bytes" encoding="US-ASCII" initiator="" separator="" ignoreCase="no"/>,
<xs:element name="e1" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 4 }" dfdl:terminator="%NUL;">
</xs:element>,
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives2.scala
index 3f15965a3..5e9c45884 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestPrimitives2.scala
@@ -32,7 +32,7 @@ class TestPrimitives2 {
@Test def testUnparseNilValueEntities(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" nillable="true" dfdl:nilKind="literalValue" dfdl:lengthKind="delimited" type="xs:string" dfdl:nilValue="%WSP;nil%NL; foobar" dfdl:outputNewLine="%LF;"/>,
elementFormDefault = "unqualified",
@@ -45,7 +45,7 @@ class TestPrimitives2 {
@Test def testUnparseNilValueEntities2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" dfdl:nilValue="start%WSP;bla%%WSP;;;;foo%WSP*;bar%WSP+;baz%ES;quux%NL;boo%%baz%%NL;end" dfdl:outputNewLine="%LF;" nillable="true" dfdl:nilKind="literalValue" dfdl:lengthKind="delimited" type="xs:string"/>,
elementFormDefault = "unqualified",
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
index eacd80282..cd0083e14 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestRuntimeProperties.scala
@@ -84,7 +84,7 @@ class RedactingScalaXMLInfosetInputter(rootNode: scala.xml.Node)
class TestRuntimeProperties {
val testSchema1 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="root">
<xs:complexType>
@@ -138,7 +138,7 @@ class TestRuntimeProperties {
}
val testSchemaBad1 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="root" dfdlx:runtimeProperties="redact=foo,baz">
<xs:complexType>
@@ -162,7 +162,7 @@ class TestRuntimeProperties {
}
val testSchemaBad2 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="root">
<xs:complexType>
@@ -186,7 +186,7 @@ class TestRuntimeProperties {
}
val testSchema2 = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="root">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestTunables.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestTunables.scala
index 7ccf0ea25..a2ab193e7 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestTunables.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/general/TestTunables.scala
@@ -46,7 +46,7 @@ class TestTunables {
@Test def testTunableCopy(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
index a8db59766..2c3944331 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset.scala
@@ -115,7 +115,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -139,7 +139,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -169,7 +169,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset2a(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -199,7 +199,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset3(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -238,7 +238,7 @@ class TestInfoset1 {
@Test def testXMLToInfosetNil1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list">
<xs:complexType>
@@ -270,7 +270,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset4(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -304,7 +304,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset5(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -352,7 +352,7 @@ class TestInfoset1 {
@Test def testXMLToInfoset6(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
@@ -412,7 +412,7 @@ class TestInfoset1 {
*/
@Test def testXMLToInfoset7(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>,
<xs:element name="root" type="tns:example1"/>
<xs:complexType name="example1">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
index a21cd2040..b922fe8d4 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfoset2.scala
@@ -35,7 +35,7 @@ class TestInfoset2 {
@Test def testXMLToInfoset1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchemaUnqualified(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="b">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala
index 8ccd19e0d..2e04ee8eb 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor.scala
@@ -103,7 +103,7 @@ class TestInfosetInputter {
@Test def testInfosetInputterFromSimpleValue1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -131,7 +131,7 @@ class TestInfosetInputter {
@Test def testInfosetInputterFromTreeNil(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element nillable="true" dfdl:nilValue="nil" dfdl:nilKind="literalValue" name="foo" dfdl:lengthKind="explicit" dfdl:length="3" type="xs:string"/>,
)
@@ -161,7 +161,7 @@ class TestInfosetInputter {
@Test def testInfosetInputterFromTreeComplex1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -214,7 +214,7 @@ class TestInfosetInputter {
@Test def testInfosetComplex2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -259,7 +259,7 @@ class TestInfosetInputter {
@Test def testInfosetComplex3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="quux">
<xs:complexType>
@@ -345,7 +345,7 @@ class TestInfosetInputter {
@Test def testInfosetArray1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -390,7 +390,7 @@ class TestInfosetInputter {
@Test def testInfosetArray2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -441,7 +441,7 @@ class TestInfosetInputter {
@Test def testInfosetArray3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -494,7 +494,7 @@ class TestInfosetInputter {
@Test def testInfosetArray4(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -550,7 +550,7 @@ class TestInfosetInputter {
@Test def testInfosetComplexPeek1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -595,7 +595,7 @@ class TestInfosetInputter {
@Test def testInfosetArrayComplex1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
index 9c3b3ce31..1e802682f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursor1.scala
@@ -57,7 +57,7 @@ class TestInfosetInputter1 {
@Test def testInfosetInputterOnBadData(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -74,7 +74,7 @@ class TestInfosetInputter1 {
@Test def testInfosetInputterOnBadData2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -92,7 +92,7 @@ class TestInfosetInputter1 {
@Test def testInfosetInputterOnBadData3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -109,7 +109,7 @@ class TestInfosetInputter1 {
}
private val rootFoo = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="root">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
index 39ebed622..bb24b3d1c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader.scala
@@ -67,7 +67,7 @@ class TestInfosetInputterFromReader {
@Test def testUnparseFixedLengthString1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -77,7 +77,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetInputter1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="foo" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>,
)
@@ -92,7 +92,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetInputterNil1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element nillable="true" dfdl:nilValue="nil" dfdl:nilKind="literalValue" name="foo" dfdl:lengthKind="explicit" dfdl:length="3" type="xs:string"/>,
)
@@ -108,7 +108,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetComplex1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -139,7 +139,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetComplex2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -176,7 +176,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetComplex3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="quux">
<xs:complexType>
@@ -278,7 +278,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetArray1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -323,7 +323,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetArray2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -376,7 +376,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetArray3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -429,7 +429,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetArray4(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -479,7 +479,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetComplexPeek1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -519,7 +519,7 @@ class TestInfosetInputterFromReader {
@Test def testInfosetArrayComplex1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
index e889bc97d..56837a669 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetCursorFromReader2.scala
@@ -37,7 +37,7 @@ class TestInfosetInputterFromReader2 {
def infosetUnlimitedSource(size: Int) = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
index 976104ef0..2ef45f883 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/infoset/TestInfosetFree.scala
@@ -119,7 +119,7 @@ class TestInfosetFree {
@Test def testInfosetFree1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
<dfdl:format ref="tns:GeneralFormat" />,
<xs:element name="root">
<xs:complexType>
@@ -146,7 +146,7 @@ class TestInfosetFree {
@Test def testInfosetFree2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
<dfdl:format ref="tns:GeneralFormat" />,
<xs:group name="hidden">
<xs:sequence>
@@ -176,7 +176,7 @@ class TestInfosetFree {
@Test def testInfosetFree3(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
<dfdl:format ref="tns:GeneralFormat" />,
<xs:element name="root">
<xs:complexType>
@@ -205,7 +205,7 @@ class TestInfosetFree {
@Test def testInfosetFree4(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
<dfdl:format ref="tns:GeneralFormat" />,
<xs:element name="root">
<xs:complexType>
@@ -241,7 +241,7 @@ class TestInfosetFree {
@Test def testInfosetFree5(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />,
<dfdl:format ref="tns:GeneralFormat" />,
<xs:element name="root">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestLayers.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestLayers.scala
index bce117c1b..18c9d130c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestLayers.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/layers/TestLayers.scala
@@ -37,7 +37,7 @@ class TestLayers {
val B64Layer1Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -62,7 +62,7 @@ class TestLayers {
val B64Layer2Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind='delimited'/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -87,7 +87,7 @@ class TestLayers {
val B64Layer3Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind='delimited'/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -143,7 +143,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
val GZIPLayer1Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" dfdlx:layerLengthUnits="bytes" representation="binary"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -189,7 +189,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
}
def makeB64GZIPSchema(term: String, layerTerm: String) = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" dfdlx:layerLengthUnits="bytes" representation="binary" dfdlx:layerEncoding="iso-8859-1"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -267,7 +267,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
val lineFoldLayer1Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -314,7 +314,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
val lineFoldLayer2Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -365,7 +365,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
*/
val lineFoldLayer3Schema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="e1" dfdl:lengthKind="explicit" dfdl:length="100">
<xs:complexType>
@@ -417,7 +417,7 @@ a few lines of pointless text like this.""".replace("\r\n", "\n").replace("\n",
val le32BitSchema =
SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" bitOrder="leastSignificantBitFirst"
byteOrder="littleEndian" alignmentUnits="bits" alignment="1"
lengthKind="explicit" lengthUnits="bits"/>,
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcAndAlignment.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcAndAlignment.scala
index 2b8744f24..d603fc825 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcAndAlignment.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcAndAlignment.scala
@@ -42,7 +42,7 @@ class TestOutputValueCalcAndAlignment {
*/
@Test def testOutputValueCalcAlignmentFixed(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" alignmentUnits="bytes" fillByte="X"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -67,7 +67,7 @@ class TestOutputValueCalcAndAlignment {
*/
@Test def testOutputValueCalcVariableLengthThenAlignment(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" alignmentUnits="bytes" fillByte="X"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -108,7 +108,7 @@ class TestOutputValueCalcAndAlignment {
*/
@Test def testOutputValueCalcVariableLengthThenAlignmentDeadlock(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" alignmentUnits="bytes" fillByte="X"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
index 53de04af5..f07b4ea7f 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/outputValueCalc/TestOutputValueCalcForwardReference.scala
@@ -39,7 +39,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcForwardReference1(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -58,7 +58,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcForwardReference2(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes" textTrimKind="padChar" textStringPadCharacter="%SP;"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -78,7 +78,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcForwardReference3(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -98,7 +98,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcDeadlock(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" encoding="ascii" lengthUnits="bytes"/>,
<xs:element name="e1" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -129,7 +129,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcConstant(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -148,7 +148,7 @@ class TestOutputValueCalcForwardReference {
@Test def testOutputValueCalcAfterOptional(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -175,7 +175,7 @@ class TestOutputValueCalcForwardReference {
@Test def testMultipleOutputValueCalcAndDefaultablePresent(): Unit = {
val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="bar" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUtils.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUtils.scala
index 2b95135e9..71eee346b 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUtils.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSAXUtils.scala
@@ -41,7 +41,7 @@ import org.xml.sax.Locator
object TestSAXUtils {
lazy val testSchema1: Elem = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="list" type="tns:example1"/>
<xs:complexType name="example1">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSerialization.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSerialization.scala
index dc43dddf4..2d5e2e33c 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSerialization.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/processor/TestSerialization.scala
@@ -41,7 +41,7 @@ class TestSerialization {
xmlns:ex="http://example.com"
targetNamespace="http://example.com"
>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<!-- The invalid appinfo source generates a warning -->
<appinfo source="http://www.ogf.org/dfdl/WRONG">
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestDelimiterFinalBacktracking.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestDelimiterFinalBacktracking.scala
index 1c97e3be2..116661320 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestDelimiterFinalBacktracking.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestDelimiterFinalBacktracking.scala
@@ -58,7 +58,7 @@ class TestDelimiterFinalBacktracking {
*/
@Test def testParseTerminatorBacktrack1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
schema1,
elementFormDefault = "unqualified",
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestUnparseHidden.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestUnparseHidden.scala
index 4ee69176d..450b4860e 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestUnparseHidden.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/runtime1/TestUnparseHidden.scala
@@ -59,7 +59,7 @@ class TestUnparseHidden {
@Test def testUnparseHiddenGroupsPresenceFlags1(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema1,
elementFormDefault = "unqualified",
@@ -77,7 +77,7 @@ class TestUnparseHidden {
@Test def testUnparseHiddenGroupsPresenceFlags2(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema1,
elementFormDefault = "unqualified",
@@ -128,7 +128,7 @@ class TestUnparseHidden {
@Test def testUnparseHiddenGroupsPresenceFlags3(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema2,
elementFormDefault = "unqualified",
@@ -147,7 +147,7 @@ class TestUnparseHidden {
@Test def testUnparseHiddenGroupsPresenceFlags4(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema2,
elementFormDefault = "unqualified",
@@ -203,7 +203,7 @@ class TestUnparseHidden {
*/
@Test def testUnparseHiddenGroupsPresenceFlags5a(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema3,
elementFormDefault = "unqualified",
@@ -225,7 +225,7 @@ class TestUnparseHidden {
*/
@Test def testUnparseHiddenGroupsPresenceFlags5b(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schema3,
elementFormDefault = "unqualified",
@@ -277,7 +277,7 @@ class TestUnparseHidden {
@Test def testUnparseHiddenGroupsPresenceFlags6(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"/>,
schemaX,
elementFormDefault = "unqualified",
diff --git a/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala b/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
index 2bd873072..812a240a0 100644
--- a/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
+++ b/daffodil-core/src/test/scala/org/apache/daffodil/core/util/TestUtils.scala
@@ -264,7 +264,7 @@ object TestUtils {
}
private val defaultIncludeImports =
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
private val defaultTopLevels =
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" encoding="US-ASCII"/>
@@ -339,7 +339,7 @@ object Fakes {
class Fakes private () {
lazy val sch = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="fake" type="xs:string" dfdl:lengthKind="delimited"/>
<xs:element name="fake2" type="tns:fakeCT"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/TopLevel.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/TopLevel.dfdl.xsd
index 603b35adb..8d715d3a0 100644
--- a/daffodil-japi/src/test/resources/test/japi/TopLevel.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/TopLevel.dfdl.xsd
@@ -21,7 +21,7 @@
targetNamespace="http://example.com"
xmlns:tns="http://example.com">
- <xsd:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xsd:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:annotation>
<xsd:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-japi/src/test/resources/test/japi/alwaysInvalid.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/alwaysInvalid.dfdl.xsd
index 7610d77f7..cdce0d1b0 100644
--- a/daffodil-japi/src/test/resources/test/japi/alwaysInvalid.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/alwaysInvalid.dfdl.xsd
@@ -20,7 +20,7 @@
targetNamespace="http://example.com"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-japi/src/test/resources/test/japi/ambig_elt.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/ambig_elt.dfdl.xsd
index eb3cab1b5..51c071738 100644
--- a/daffodil-japi/src/test/resources/test/japi/ambig_elt.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/ambig_elt.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-japi/src/test/resources/test/japi/blob.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/blob.dfdl.xsd
index 842b378ef..d84e7160a 100644
--- a/daffodil-japi/src/test/resources/test/japi/blob.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/blob.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
index b2bad6cd9..933ba14a8 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema1.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
index bdeff8a66..950bd6210 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema2.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e2" dfdl:lengthKind="delimited">
<simpleType>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
index 62d02dd1c..e0c8c1718 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema3.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e3" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="1"/>
<element name="e4" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="4"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
index dbd724ed4..bd3f5abe4 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema4.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e1">
<complexType>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
index a97e2970f..354c019b4 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema5.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e1" dfdl:terminator="%NL;" type="tns:e1Type"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchema6.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchema6.dfdl.xsd
index fc21dbb9e..11c171e75 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchema6.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchema6.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e2" dfdl:lengthKind="delimited" type="tns:nonExistent"/>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchemaCDATA.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchemaCDATA.dfdl.xsd
index fad71923a..304ff1881 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchemaCDATA.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchemaCDATA.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="string" type="xsd:string" dfdl:lengthKind="delimited" dfdl:terminator="$"/>
<element name="float" type="xsd:float"
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchemaWithComplexVars1.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchemaWithComplexVars1.dfdl.xsd
index a6ef1f50e..2b1b8ada7 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchemaWithComplexVars1.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchemaWithComplexVars1.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:ex2="http://example.com/2"
targetNamespace="http://example.com/1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:import schemaLocation="mySchemaWithComplexVars2.dfdl.xsd" namespace="http://example.com/2" />
<xs:annotation>
diff --git a/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd b/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
index 51f99a4e0..4fe2d2487 100644
--- a/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
+++ b/daffodil-japi/src/test/resources/test/japi/mySchemaWithVars.dfdl.xsd
@@ -29,7 +29,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-lib/src/test/resources/test/validation/testSchema1.dfdl.xsd b/daffodil-lib/src/test/resources/test/validation/testSchema1.dfdl.xsd
index ca953b26d..7a6640c93 100644
--- a/daffodil-lib/src/test/resources/test/validation/testSchema1.dfdl.xsd
+++ b/daffodil-lib/src/test/resources/test/validation/testSchema1.dfdl.xsd
@@ -26,7 +26,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e1" dfdl:terminator="%NL;" type="tns:e1Type"/>
diff --git a/daffodil-lib/src/test/scala/org/apache/daffodil/lib/util/TestSchemaUtils.scala b/daffodil-lib/src/test/scala/org/apache/daffodil/lib/util/TestSchemaUtils.scala
index 0b81597bc..4ca3f7be1 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/lib/util/TestSchemaUtils.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/lib/util/TestSchemaUtils.scala
@@ -29,7 +29,7 @@ class TestSchemaUtils {
*/
val test1 =
<surround xmlns:ex="http://example.com" xmlns:ct="http://w3.ibm.com/xmlns/dfdl/ctInfoset" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element dfdl:lengthKind="delimited" name="intRestrict">
<xs:simpleType>
diff --git a/daffodil-lib/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala b/daffodil-lib/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
index ec6f79b27..e6bd2a35e 100644
--- a/daffodil-lib/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
+++ b/daffodil-lib/src/test/scala/org/apache/daffodil/lib/xml/test/unit/TestXMLLoader.scala
@@ -39,7 +39,7 @@ class TestXMLLoader {
|xmlns:xs="http://www.w3.org/2001/XMLSchema"
|xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- | <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ | <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
| <xs:annotation>
| <xs:appinfo source="http://www.ogf.org/dfdl/">
| <dfdl:format lengthKind="delimited" ref="ex:GeneralFormat"/>
@@ -71,7 +71,7 @@ class TestXMLLoader {
|xmlns:xs="http://www.w3.org/2001/XMLSchema"
|xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- | <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ | <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
| <xs:annotation>
| <xs:appinfo source="http://www.ogf.org/dfdl/">
| <dfdl:format lengthKind="delimited" ref="ex:GeneralFormat"/>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/TopLevel.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/TopLevel.dfdl.xsd
index 603b35adb..8d715d3a0 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/TopLevel.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/TopLevel.dfdl.xsd
@@ -21,7 +21,7 @@
targetNamespace="http://example.com"
xmlns:tns="http://example.com">
- <xsd:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xsd:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:annotation>
<xsd:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-sapi/src/test/resources/test/sapi/ambig_elt.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/ambig_elt.dfdl.xsd
index eb3cab1b5..51c071738 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/ambig_elt.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/ambig_elt.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-sapi/src/test/resources/test/sapi/blob.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/blob.dfdl.xsd
index 842b378ef..d84e7160a 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/blob.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/blob.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:dfdlx="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema1.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema1.dfdl.xsd
index b2bad6cd9..933ba14a8 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema1.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema1.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema2.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema2.dfdl.xsd
index bdeff8a66..950bd6210 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema2.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema2.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e2" dfdl:lengthKind="delimited">
<simpleType>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema3.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema3.dfdl.xsd
index 62d02dd1c..e0c8c1718 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema3.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema3.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e3" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="1"/>
<element name="e4" type="xsd:string" dfdl:lengthKind="explicit" dfdl:length="4"/>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema4.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema4.dfdl.xsd
index dbd724ed4..bd3f5abe4 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema4.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema4.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e1">
<complexType>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema5.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema5.dfdl.xsd
index a97e2970f..354c019b4 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema5.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema5.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e1" dfdl:terminator="%NL;" type="tns:e1Type"/>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchema6.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchema6.dfdl.xsd
index fc21dbb9e..11c171e75 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchema6.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchema6.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="e2" dfdl:lengthKind="delimited" type="tns:nonExistent"/>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchemaCDATA.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchemaCDATA.dfdl.xsd
index fad71923a..304ff1881 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchemaCDATA.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchemaCDATA.dfdl.xsd
@@ -27,7 +27,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<element name="string" type="xsd:string" dfdl:lengthKind="delimited" dfdl:terminator="$"/>
<element name="float" type="xsd:float"
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithComplexVars1.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithComplexVars1.dfdl.xsd
index a6ef1f50e..2b1b8ada7 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithComplexVars1.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithComplexVars1.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:ex2="http://example.com/2"
targetNamespace="http://example.com/1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:import schemaLocation="mySchemaWithComplexVars2.dfdl.xsd" namespace="http://example.com/2" />
<xs:annotation>
diff --git a/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithVars.dfdl.xsd b/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithVars.dfdl.xsd
index 51f99a4e0..4fe2d2487 100644
--- a/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithVars.dfdl.xsd
+++ b/daffodil-sapi/src/test/resources/test/sapi/mySchemaWithVars.dfdl.xsd
@@ -29,7 +29,7 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<include schemaLocation="mySchema2.dfdl.xsd"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/always-fails-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/always-fails-1.dfdl.xsd
index 639b2ae7f..a6af005fa 100644
--- a/daffodil-schematron/src/test/resources/xsd/always-fails-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/always-fails-1.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/embedded-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/embedded-1.dfdl.xsd
index b0dccaaa8..28a72ff4b 100644
--- a/daffodil-schematron/src/test/resources/xsd/embedded-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/embedded-1.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/embedded-2.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/embedded-2.dfdl.xsd
index df873c78d..c564f12bc 100644
--- a/daffodil-schematron/src/test/resources/xsd/embedded-2.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/embedded-2.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo>
<sch:ns prefix="ex" uri="http://example.com"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/embedded-3.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/embedded-3.dfdl.xsd
index 95aec0935..c4eaf3a00 100644
--- a/daffodil-schematron/src/test/resources/xsd/embedded-3.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/embedded-3.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/extends-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/extends-1.dfdl.xsd
index 91eac88c0..a7851b4a6 100644
--- a/daffodil-schematron/src/test/resources/xsd/extends-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/extends-1.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/never-fails-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/never-fails-1.dfdl.xsd
index 0f9ef8ed5..6ec226553 100644
--- a/daffodil-schematron/src/test/resources/xsd/never-fails-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/never-fails-1.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd
index 627e67133..f174a7bb6 100644
--- a/daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/string.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
index 5797659d5..9d6929df7 100644
--- a/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/unit_price.dfdl.xsd
@@ -24,7 +24,7 @@
<!-- modified from daffodil-cli/src/test/resources/org/apache/daffodil/CLI/cli_schema_03.dfdl.xsd -->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-schematron/src/test/resources/xsd/uuid.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/uuid.dfdl.xsd
index 99deae2b3..03935703b 100644
--- a/daffodil-schematron/src/test/resources/xsd/uuid.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/uuid.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/with-ns-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/with-ns-1.dfdl.xsd
index 2264375ac..247f51060 100644
--- a/daffodil-schematron/src/test/resources/xsd/with-ns-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/with-ns-1.dfdl.xsd
@@ -21,7 +21,7 @@
targetNamespace="http://foo.bar.com/v1"
xmlns:myns="http://foo.bar.com/v1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-schematron/src/test/resources/xsd/without-ns-1.dfdl.xsd b/daffodil-schematron/src/test/resources/xsd/without-ns-1.dfdl.xsd
index 94dc7f732..b404f39d4 100644
--- a/daffodil-schematron/src/test/resources/xsd/without-ns-1.dfdl.xsd
+++ b/daffodil-schematron/src/test/resources/xsd/without-ns-1.dfdl.xsd
@@ -19,7 +19,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/genericTdml.tdml b/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/genericTdml.tdml
index 7a6e227d1..d25772216 100644
--- a/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/genericTdml.tdml
+++ b/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/genericTdml.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="s1">
<xs:include
- schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" dfdl:lengthKind="explicit" dfdl:length="2"
diff --git a/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/testExtVars1.tdml b/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/testExtVars1.tdml
index d8b76125b..bc4c2b940 100644
--- a/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/testExtVars1.tdml
+++ b/daffodil-tdml-processor/src/test/resources/org/apache/daffodil/tdml/testExtVars1.tdml
@@ -37,7 +37,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="s1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
binaryNumberRep="binary"
representation="binary"
diff --git a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlNamespaces.tdml b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlNamespaces.tdml
index 8a2355022..ec0a5d9fe 100644
--- a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlNamespaces.tdml
+++ b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlNamespaces.tdml
@@ -36,7 +36,7 @@
<t:defineSchema name="s1" xmlns="http://www.w3.org/2001/XMLSchema">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<element name="e1" type="string" dfdl:lengthKind="explicit" dfdl:length="9"/>
diff --git a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
index 69faa85f0..9535492c8 100644
--- a/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
+++ b/daffodil-tdml-processor/src/test/resources/test/tdml/tdmlQuoting.tdml
@@ -24,7 +24,7 @@
<tdml:defineSchema name="quote">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian"
alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="implicit"
@@ -62,7 +62,7 @@
<tdml:defineSchema name="apostrophe">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xsd:element name="apostrophe" type="xsd:string"
diff --git a/daffodil-tdml-processor/src/test/resources/test/tdml/testWarnings.tdml b/daffodil-tdml-processor/src/test/resources/test/tdml/testWarnings.tdml
index 5c0ec2552..61ba83035 100644
--- a/daffodil-tdml-processor/src/test/resources/test/tdml/testWarnings.tdml
+++ b/daffodil-tdml-processor/src/test/resources/test/tdml/testWarnings.tdml
@@ -29,7 +29,7 @@
<tdml:defineSchema name="causesWarnings" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" occursCountKind="implicit"/>
<xs:element name="causesWarnings" dfdl:lengthKind="implicit">
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
index 192442f1f..a46097882 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
@@ -56,7 +56,7 @@ class TestDaffodilC {
// Defines a very simple DFDL test schema for all tests to use
private val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format representation="binary" ref="GeneralFormat"/>,
<xs:element name="e1">
<xs:complexType>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
index 11261d770..e099dd8c1 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLCrossTest.scala
@@ -42,7 +42,7 @@ class TestTDMLCrossTest {
tdml
} suiteName="theSuiteName" defaultImplementations="notAnImplName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="r" type="xs:string" dfdl:lengthKind="delimited"/>
</ts:defineSchema>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
index 9692b5d24..3016952e1 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRoundTrips.scala
@@ -42,7 +42,7 @@ class TestTDMLRoundTrips {
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -83,7 +83,7 @@ class TestTDMLRoundTrips {
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -120,7 +120,7 @@ class TestTDMLRoundTrips {
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -166,7 +166,7 @@ class TestTDMLRoundTrips {
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="all">
<xs:complexType>
@@ -219,7 +219,7 @@ New Line]]></bar>
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="all">
<xs:complexType>
@@ -268,7 +268,7 @@ New Line]]></bar>
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -321,7 +321,7 @@ New Line]]></bar>
fn
} xmlns:ex={example} xmlns:ts={tdml} xmlns:daf={daf} suiteName="theSuiteName">
<ts:defineSchema name="s" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" separatorSuppressionPolicy="anyEmpty"/>
<xs:element name="r" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
index 2f8d372e5..5014fc748 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
@@ -53,7 +53,7 @@ class TestTDMLRunner {
dfdl
} xmlns:tns={example}>
<defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</defineSchema>
@@ -96,7 +96,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
@@ -120,7 +120,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
@@ -143,7 +143,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
@@ -169,7 +169,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
@@ -191,7 +191,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
@@ -245,7 +245,7 @@ class TestTDMLRunner {
dfdl
} xmlns:tns={example}>
<defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</defineSchema>
@@ -297,7 +297,7 @@ class TestTDMLRunner {
@Test def testRunModelFile(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>,
)
@@ -331,7 +331,7 @@ class TestTDMLRunner {
@Test def testRunTDMLFileReferencingModelFile(): Unit = {
val testSchema = SchemaUtils.dfdlTestSchema(
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>,
<dfdl:format ref="tns:GeneralFormat"/>,
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>,
)
@@ -379,7 +379,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
@@ -421,7 +421,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:encoding="utf-8" dfdl:lengthKind="delimited" dfdl:terminator="!"/>
</tdml:defineSchema>
@@ -449,7 +449,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:encoding="utf-8" dfdl:lengthKind="delimited" dfdl:terminator=""/>
</tdml:defineSchema>
@@ -478,7 +478,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" nilKind="literalValue" nilValueDelimiterPolicy="terminator"/>
<xsd:element name="data" type="xsd:int" nillable="true" dfdl:lengthKind="delimited" dfdl:nilValue="nil" dfdl:terminator=";"/>
</tdml:defineSchema>
@@ -503,7 +503,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" nilKind="literalValue" nilValueDelimiterPolicy="terminator"/>
<xsd:element name="data" type="xsd:int" nillable="true" dfdl:lengthKind="delimited" dfdl:nilValue="nil" dfdl:terminator=";"/>
</tdml:defineSchema>
@@ -536,7 +536,7 @@ class TestTDMLRunner {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="delimited" dfdl:encoding="iso-8859-1"/>
<dfdl:format ref="tns:GeneralFormat"/>
</tdml:defineSchema>
@@ -593,7 +593,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="delimited" dfdl:encoding="iso-8859-1"/>
<dfdl:format ref="tns:GeneralFormat"/>
</tdml:defineSchema>
@@ -642,7 +642,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="4"/>
</ts:defineSchema>
@@ -668,7 +668,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="4"/>
</ts:defineSchema>
@@ -694,7 +694,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:hexBinary" dfdl:lengthKind="explicit" dfdl:length="4"/>
</ts:defineSchema>
@@ -725,7 +725,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:dateTime" dfdl:lengthKind="explicit" dfdl:length="32"
dfdl:calendarPatternKind="explicit"
@@ -751,7 +751,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:dateTime" dfdl:lengthKind="explicit" dfdl:length="32"
dfdl:calendarPatternKind="explicit"
@@ -777,7 +777,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:dateTime" dfdl:lengthKind="explicit" dfdl:length="32"
dfdl:calendarPatternKind="explicit"
@@ -803,7 +803,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:dateTime" dfdl:lengthKind="explicit" dfdl:length="32"
dfdl:calendarPatternKind="explicit"
@@ -829,7 +829,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:dateTime" dfdl:lengthKind="explicit" dfdl:length="32"
dfdl:calendarPatternKind="explicit"
@@ -886,12 +886,12 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="dupSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
<tdml:defineSchema name="dupSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
@@ -920,7 +920,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
@@ -959,7 +959,7 @@ f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
index 76f1ded40..c611f7c1a 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner2.scala
@@ -67,7 +67,7 @@ class TestTDMLRunner2 {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="parsed" truncateSpecifiedLengthString="no" ignoreCase="no" representation="text" lengthKind="delimited" nilValueDelimiterPolicy="both" emptyValueDelimiterPolicy="none" documentFinalTerminatorCanBeMissing="yes" initiatedContent="no" separatorSuppressio [...]
<xsd:element name="array" type="tns:arrayType" dfdl:lengthKind="implicit"/>
<xsd:complexType name="arrayType">
@@ -125,7 +125,7 @@ class TestTDMLRunner2 {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="parsed" truncateSpecifiedLengthString="no" ignoreCase="no" representation="text" lengthKind="delimited" nilValueDelimiterPolicy="both" emptyValueDelimiterPolicy="none" documentFinalTerminatorCanBeMissing="yes" initiatedContent="no" separatorSuppressio [...]
<xsd:element name="array" type="tns:arrayType" dfdl:lengthKind="implicit"/>
<xsd:complexType name="arrayType">
@@ -177,7 +177,7 @@ class TestTDMLRunner2 {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="parsed" truncateSpecifiedLengthString="no" ignoreCase="no" representation="text" lengthKind="delimited" nilValueDelimiterPolicy="both" emptyValueDelimiterPolicy="none" documentFinalTerminatorCanBeMissing="yes" initiatedContent="no" separatorSuppressio [...]
<xsd:element name="array" type="tns:arrayType" dfdl:lengthKind="implicit"/>
<xsd:complexType name="arrayType">
@@ -229,7 +229,7 @@ class TestTDMLRunner2 {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="parsed" truncateSpecifiedLengthString="no" ignoreCase="no" representation="text" lengthKind="delimited" nilValueDelimiterPolicy="both" emptyValueDelimiterPolicy="none" documentFinalTerminatorCanBeMissing="yes" initiatedContent="no" separatorSuppressio [...]
<xsd:element name="array" type="tns:arrayType" dfdl:lengthKind="implicit"/>
<xsd:complexType name="arrayType">
@@ -295,7 +295,7 @@ abc # a comment
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="pattern" dfdl:terminator="abcdef">
<xsd:annotation>
@@ -330,7 +330,7 @@ abc # a comment
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="delimited">
<xsd:annotation>
@@ -370,7 +370,7 @@ abc # a comment
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="delimited">
<xsd:annotation>
@@ -410,7 +410,7 @@ abc # a comment
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:string" dfdl:lengthKind="delimited">
<xsd:annotation>
@@ -457,7 +457,7 @@ abc # a comment
} xmlns:xs={xsd}>
<!-- This embedded schema has validation errors. -->
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:format ref="tns:GeneralFormat" />
<xs:element name="data" type="fn:string" dfdl:lengthKind="delimited" />
</tdml:defineSchema>
@@ -482,7 +482,7 @@ abc # a comment
xsd
} xmlns:xsi={xsi} suiteName="theSuiteName">
<ts:defineSchema name="unparseTestSchema1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:string" dfdl:lengthKind="explicit" dfdl:length="{ 9 }"/>
</ts:defineSchema>
@@ -512,7 +512,7 @@ abc # a comment
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xsd:element name="data" type="xsd:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
index 1478b2c36..f45d15d8a 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerCommentSyntax.scala
@@ -38,7 +38,7 @@ class TestTDMLRunnerCommentSyntax {
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<!-- comment -->
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!-- comment -->
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0" trailingSkip="0" textBidi="no" floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f" occursCountKind="parsed" truncateSpecifiedLengthString="no" ignoreCase="no" representation="text" lengthKind="delimited" nilValueDelimiterPolicy="both" emptyValueDelimiterPolicy="none" documentFinalTerminatorCanBeMissing="yes" initiatedContent="no" separatorSuppressio [...]
<!-- comment -->
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
index ccdf46d22..2ac520d43 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerConfig.scala
@@ -43,7 +43,7 @@ class TestTDMLRunnerConfig {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi} defaultConfig="nonsense">
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:element name="dummy" type="xs:string"/>
</tdml:defineSchema>
<tdml:parserTestCase xmlns={tdml} name="test1" root="dummy" model="mySchema">
@@ -73,7 +73,7 @@ class TestTDMLRunnerConfig {
dfdl
} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="dummy" type="xs:string" dfdl:lengthKind="delimited"/>
</tdml:defineSchema>
@@ -108,7 +108,7 @@ class TestTDMLRunnerConfig {
xsi
} defaultConfig="nonsense">
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="dummy" type="xs:string" dfdl:lengthKind="delimited"/>
</tdml:defineSchema>
@@ -145,7 +145,7 @@ class TestTDMLRunnerConfig {
tdml
} xmlns:dfdl={dfdl} xmlns:xsd={xsd} xmlns:xs={xsd} xmlns:xsi={xsi}>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format representation="binary" binaryNumberRep="binary" lengthKind="implicit" lengthUnits="bytes" alignmentUnits="bytes" alignment="implicit" leadingSkip="0" trailingSkip="0" byteOrder="bigEndian" textOutputMinLength="0" initiator="" terminator="" textPadKind="none" encoding="ascii"/>
<xs:element name="dummy" type="xs:int"/>
</tdml:defineSchema>
@@ -178,7 +178,7 @@ class TestTDMLRunnerConfig {
xsi
} defaultConfig="myConfig">
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format representation="binary" binaryNumberRep="binary" lengthKind="implicit" lengthUnits="bytes" alignmentUnits="bytes" alignment="implicit" leadingSkip="0" trailingSkip="0" byteOrder="bigEndian" textOutputMinLength="0" initiator="" terminator="" textPadKind="none" encoding="ascii"/>
<xs:element name="dummy" type="xs:int"/>
</tdml:defineSchema>
@@ -209,7 +209,7 @@ class TestTDMLRunnerConfig {
xsi
} defaultConfig="testConfigFile.xml">
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format representation="binary" binaryNumberRep="binary" lengthKind="implicit" lengthUnits="bytes" alignmentUnits="bytes" alignment="implicit" leadingSkip="0" trailingSkip="0" byteOrder="bigEndian" textOutputMinLength="0" initiator="" terminator="" textPadKind="none" encoding="ascii"/>
<xs:element name="dummy" type="xs:int"/>
</tdml:defineSchema>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala
index a8096c0c6..83d6d4280 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerTutorial.scala
@@ -41,7 +41,7 @@ class TestTDMLRunnerTutorial {
<p>1</p>
</tdml:tutorial>
<tdml:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</tdml:defineSchema>
@@ -69,7 +69,7 @@ class TestTDMLRunnerTutorial {
<p>6</p>
</tdml:tutorial>
<tdml:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="bar" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>
</tdml:defineSchema>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
index 26dbede9b..1e586fe5e 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunnerWarnings.scala
@@ -60,7 +60,7 @@ class TestTDMLRunnerWarnings {
val testSuite =
<tdml:testSuite suiteName="tdml warnings" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<tdml:defineSchema name="causesWarnings" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit"/>
<xs:element name="causesWarnings" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -112,7 +112,7 @@ class TestTDMLRunnerWarnings {
val testSuite =
<tdml:testSuite suiteName="tdml warnings" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<tdml:defineSchema name="causesWarnings" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit"/>
<xs:element name="causesWarnings" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -160,7 +160,7 @@ class TestTDMLRunnerWarnings {
val testSuite =
<tdml:testSuite suiteName="tdml warnings" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<tdml:defineSchema name="causesWarnings" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit"/>
<xs:element name="errUnparsing" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -206,7 +206,7 @@ class TestTDMLRunnerWarnings {
val testSuite =
<tdml:testSuite suiteName="tdml warnings" xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://example.com" xmlns:fn="http://www.w3.org/2005/xpath-functions">
<tdml:defineSchema name="causesWarnings" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit"/>
<xs:element name="errUnparsing" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala
index e492a9e57..c1a559e74 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLUnparseCases.scala
@@ -39,7 +39,7 @@ class TestTDMLUnparseCases {
tdml
} suiteName="theSuiteName">
<ts:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="bar" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string"/>
</ts:defineSchema>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
index 4bbc3df45..91e5c30f7 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/delimiter_12.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
elementFormDefault="qualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelmulcho_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelmulcho_01.dfdl.xsd
index cbe5d48c8..dec1cd64b 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelmulcho_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelmulcho_01.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat" initiator=""
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
index 52404e260..56eb2485f 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelone107_05.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<!--
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelonearr_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelonearr_12.dfdl.xsd
index 4eb402d2e..1e4673174 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelonearr_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpadelonearr_12.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101-err.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101-err.dfdl.xsd
index 2d40beea6..cd6ef4043 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101-err.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101-err.dfdl.xsd
@@ -29,7 +29,7 @@
specifically intended for negative testing that produce SDE, have
to be isolated from schema for tests that do not have SDEs.
-->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
index 9bf09ccad..5e1121b00 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaextdeltxt101.dfdl.xsd
@@ -24,7 +24,7 @@
attributeFormDefault="unqualified" >
<!--
-->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
index f6365b578..bf59b0169 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsenc101_04_01.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
elementFormDefault="qualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
Description: Encoding is UTF-32, lenghtUnits specified in bytes
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
index a93ece79c..4f0c911c9 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaflsmbyfrm41.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
elementFormDefault="qualified" attributeFormDefault="unqualified"
>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
Description: Encoding is UTF-32, big Endian, lenghtUnits specified in
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
index 6e358be86..ec30b2dcf 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc121_02.dfdl.xsd
@@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<!-- Defaulted property values minimum needed for a text boolean-->
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
index 1c75dc33e..6c98b8716 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7131.dfdl.xsd
@@ -26,7 +26,7 @@
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<!--
7.1.3.1 Representation Property Binding Syntax: Attribute Form spec v.40
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
index 143ba6554..e0f354dd7 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132.dfdl.xsd
@@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<!--
7.1.3.2 Representation Property Binding Syntax: Element Form spec v.40
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
index 94ad80376..2c88bbdf2 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7132_2.dfdl.xsd
@@ -25,7 +25,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<!--
7.1.3.2 Representation Property Binding Syntax: Element Form
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
index ca3f86151..95c868ad1 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/dpaspc7133_01.dfdl.xsd
@@ -26,7 +26,7 @@
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
"another example" of short form in section 7.1.4.3 dfdl spec v.39
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
index 88758db50..d040d2236 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/ibm-contributed/length_explicit_12.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
elementFormDefault="qualified" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
Description: Encoding is UTF-8, lenghtUnits specified in bytes
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AB.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AB.dfdl.xsd
index 76f12ee8d..609ddbf60 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AB.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AB.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
index 73d1260e8..726de43e4 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AF.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
index 7d33940f1..76ecb834e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AG.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AH.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AH.dfdl.xsd
index 68b8c9c3f..541904d85 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AH.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AH.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AM.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AM.dfdl.xsd
index 0e528ae94..809287601 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AM.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AM.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AP.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AP.dfdl.xsd
index 6c187143c..959adf2ba 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AP.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AP.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
index af16013fe..eb7ae5084 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AU.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
index d5fc706c5..ffb11a011 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AV.dfdl.xsd
@@ -25,7 +25,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
index ccb478e90..a4905000d 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AW.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
index c181d9c06..839d2fa1b 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AX.dfdl.xsd
@@ -46,7 +46,7 @@
</annotation>
<import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd"/>
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd"/>
<!-- Schema Escaping: escape character and escape block, fixed length -->
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
index afd8341d4..3097a87f8 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AY.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
index 8b03f304e..66a12897e 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/AZ.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BA.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BA.dfdl.xsd
index 30bed7a59..41cf3eb08 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BA.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BA.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BB.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BB.dfdl.xsd
index 65b3181ec..6b3962f34 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BB.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BB.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
index 6428ef5a2..a4c34ff47 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BC.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BD.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BD.dfdl.xsd
index 14e1d8a10..6cbe41299 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BD.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BD.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BE.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BE.dfdl.xsd
index db1decd3c..17c4922b7 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BE.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BE.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BF.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BF.dfdl.xsd
index e53cea051..e6bf0e151 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BF.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BF.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BG.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BG.dfdl.xsd
index acc0db66d..107997ee2 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BG.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/BG.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
-<include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+<include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/bitFlagExpression.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/bitFlagExpression.tdml
index 44986fa67..3cd1149e9 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/bitFlagExpression.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/bitFlagExpression.tdml
@@ -29,7 +29,7 @@
defaultImplementations="daffodil ibm">
<tdml:defineSchema name="sch1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
alignment="1" alignmentUnits="bits" byteOrder="bigEndian"
lengthUnits="bits" initiatedContent="no" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
index 4276e7966..4e7645664 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/delimTests.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:cal="http://www.saf.cal/" elementFormDefault="unqualified"
attributeFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
-->
<xs:annotation>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/mixed-binary-text.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/mixed-binary-text.tdml
index 3702f901d..d2949499f 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/mixed-binary-text.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/mixed-binary-text.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="v">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
encoding="utf-8" lengthUnits='characters'/>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/multiple-diagnostics.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/multiple-diagnostics.tdml
index 074779760..c7be7b7d3 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/multiple-diagnostics.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/multiple-diagnostics.tdml
@@ -24,7 +24,7 @@
xmlns="http://example.com">
<tdml:defineSchema name="twoMissingTypeDefs">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="err1" type="type_doesnt_exist" />
@@ -68,7 +68,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="withManyErrors2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
initiator="" leadingSkip="0" trailingSkip="0" sequenceKind="ordered" encoding="UTF-8"/>
<xs:element name="v1" type="xs:int" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
index 3a6d67a60..6a44f67f9 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested-separator-delimited.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="baseline">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
encodingErrorPolicy="error"/>
@@ -63,7 +63,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="baseline_ibm">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
encodingErrorPolicy="error"/>
@@ -107,7 +107,7 @@
<tdml:defineSchema name="basicNest">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed"
encodingErrorPolicy="error"/>
@@ -156,7 +156,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="basicNest2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
<xs:element name="e1" dfdl:lengthKind="implicit"
@@ -203,7 +203,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nest1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
<xs:element name="nest1" dfdl:lengthKind="implicit"
@@ -234,7 +234,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nest2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
<!-- test the issue of ambiguous delimiters, which requires the parser
to keep track of what's got priority over what else. (i.e., that inner
@@ -295,7 +295,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nest3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="parsed" />
<!-- test the issue of shared prefixes among the delimiters. This makes
it challenging to determine longest match, as several contenders must
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
index fdebbadb6..d7af40c9b 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nested_group_ref.tdml
@@ -27,7 +27,7 @@
defaultImplementations="ibm daffodil">
<tdml:defineSchema name="nestedGroupRefs1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
occursCountKind="parsed"
encodingErrorPolicy="error"/>
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nilled.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nilled.tdml
index c4df6976e..259eb686b 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nilled.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/nilled.tdml
@@ -47,7 +47,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="s1" elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
occursCountKind="implicit" nilValue="%ES;"
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/runtime-diagnostics.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/runtime-diagnostics.tdml
index 007f73c24..43f18184b 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/runtime-diagnostics.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/runtime-diagnostics.tdml
@@ -23,7 +23,7 @@
xmlns:ex="http://example.com" xmlns="http://example.com">
<tdml:defineSchema name="PE1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="err1" type="xs:int" dfdl:lengthKind="delimited" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression.tdml
index b611f90bc..b17609579 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression.tdml
@@ -48,7 +48,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
@@ -481,7 +481,7 @@
<tdml:defineSchema name="s2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
@@ -583,7 +583,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="s3" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
@@ -644,7 +644,7 @@
<!-- Same as s3 schema but emptyElementParsePolicy is now treatAsAbsent -->
<tdml:defineSchema name="s3_absent" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression2.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression2.tdml
index a9b5c3133..c028fd32f 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression2.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sepSuppression2.tdml
@@ -38,7 +38,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="s0">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
@@ -126,7 +126,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited"
@@ -274,7 +274,7 @@
<tdml:defineSchema name="s2" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
index bf7fabfa3..abb5b8e26 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/sequence.tdml
@@ -24,7 +24,7 @@
defaultImplementations="ibm daffodil">
<tdml:defineSchema name="seqDelim">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
encodingErrorPolicy="error" />
diff --git a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/unseparated.tdml b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/unseparated.tdml
index 5cea07788..574fa2b2c 100644
--- a/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/unseparated.tdml
+++ b/daffodil-test-ibm1/src/test/resources/test-suite/tresys-contributed/unseparated.tdml
@@ -45,7 +45,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="s1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="E">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/childDir/anotherChildDir/include01_01_03.dfdl.xsd b/daffodil-test/src/test/resources/childDir/anotherChildDir/include01_01_03.dfdl.xsd
index 8c502426d..6f3c1d994 100644
--- a/daffodil-test/src/test/resources/childDir/anotherChildDir/include01_01_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/childDir/anotherChildDir/include01_01_03.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
<!-- This one comes from the classpath - from inside the jar actually -->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:defineFormat name="myFormat">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/charsets/TestBitsCharsetDefinition.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/charsets/TestBitsCharsetDefinition.dfdl.xsd
index 7bf7a12f1..5c6ce1654 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/charsets/TestBitsCharsetDefinition.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/charsets/TestBitsCharsetDefinition.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/collisions.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/collisions.dfdl.xsd
index 7c6fdc825..ac410a87c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/collisions.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/codegen/c/collisions.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat" representation="binary"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/choiceBranchRanges/choiceBranchKeyRanges.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/choiceBranchRanges/choiceBranchKeyRanges.tdml
index 50b8dc417..8b22851c9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/choiceBranchRanges/choiceBranchKeyRanges.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/choiceBranchRanges/choiceBranchKeyRanges.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="choiceBranchKeyRanges-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
lengthUnits="bits"
emptyElementParsePolicy="treatAsEmpty"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enumInvalid.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enumInvalid.tdml
index ef0444d5c..c4226f1b8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enumInvalid.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enumInvalid.tdml
@@ -35,7 +35,7 @@
elementFormDefault="unqualified"
xmlns="http://www.w3.org/2001/XMLSchema">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"/>
<element name="r2">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enums.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enums.tdml
index 5e29bab3d..7923ae7c4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enums.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/enum/enums.tdml
@@ -35,7 +35,7 @@
elementFormDefault="unqualified"
xmlns="http://www.w3.org/2001/XMLSchema">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"/>
<element name="r1">
@@ -113,7 +113,7 @@
elementFormDefault="unqualified"
xmlns="http://www.w3.org/2001/XMLSchema">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
alignment="1" alignmentUnits="bits"
lengthUnits="bits"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/lookAhead/lookAhead.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/lookAhead/lookAhead.tdml
index 351500324..8ede6312b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/lookAhead/lookAhead.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/lookAhead/lookAhead.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="lookAhead-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
lengthUnits="bits"
emptyElementParsePolicy="treatAsEmpty"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalc.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalc.tdml
index cf83812dc..73909146a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalc.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalc.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="inputTypeCalc-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
@@ -278,7 +278,7 @@
<tdml:defineSchema name="inputTypeCalc-Inherited.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalcExpression.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalcExpression.tdml
index 679a973a8..876555553 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalcExpression.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/inputTypeCalcExpression.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="inputTypeCalc-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctionErrors.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctionErrors.tdml
index bfebb7fa7..387328adc 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctionErrors.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctionErrors.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="inputTypeCalcFunctionErrors-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
@@ -107,7 +107,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nonexistantTypeCalcType_01.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
@@ -132,7 +132,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nonexistantTypeCalcType_02.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
index 9fca63320..47cbd45e3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/extensions/type_calc/typeCalcFunctions.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="inputTypeCalc-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/xsd/binMessage.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/xsd/binMessage.dfdl.xsd
index 557d8f5de..a7d456c16 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/xsd/binMessage.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/namespaced/xsd/binMessage.dfdl.xsd
@@ -24,7 +24,7 @@
xmlns:b="urn:bin"
targetNamespace="urn:bin">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/xsd/binMessage.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/xsd/binMessage.dfdl.xsd
index 7ec2d0b9f..29cca8e6e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/xsd/binMessage.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/infoset/stringAsXml/nonamespace/xsd/binMessage.dfdl.xsd
@@ -24,7 +24,7 @@
targetNamespace="urn:bin"
elementFormDefault="qualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/IPv4.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/layers/IPv4.dfdl.xsd
index 4e8d9b4df..a147a5d87 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/IPv4.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/IPv4.dfdl.xsd
@@ -25,10 +25,10 @@
xmlns:tns="urn:org.apache.daffodil.layers.IPv4"
targetNamespace="urn:org.apache.daffodil.layers.IPv4" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:import namespace="urn:org.apache.daffodil.layers.IPv4Checksum"
- schemaLocation="org/apache/daffodil/layers/xsd/IPv4ChecksumLayer.dfdl.xsd"/>
+ schemaLocation="/org/apache/daffodil/layers/xsd/IPv4ChecksumLayer.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/ais.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/layers/ais.tdml
index affe82c13..bd185cca9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/ais.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/ais.tdml
@@ -50,7 +50,7 @@ Example Multifragment sentence:
-->
<tdml:defineSchema name="ais1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="aisText">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/checkDigit.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/layers/checkDigit.dfdl.xsd
index 745e1ccd0..3684b0f73 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/checkDigit.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/checkDigit.dfdl.xsd
@@ -28,11 +28,11 @@
xmlns:tns="http://example.com"
targetNamespace="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<import
namespace="urn:org.apache.daffodil.layers.checkDigit"
- schemaLocation="org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd"/>
+ schemaLocation="/org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/layers.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/layers/layers.tdml
index 485490c51..8f3363a8f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/layers.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/layers.tdml
@@ -23,7 +23,7 @@
xmlns:ex="http://example.com" xmlns:tns="http://example.com" defaultRoundTrip="true">
<tdml:defineSchema name="s1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="general">
<dfdl:format ref="ex:GeneralFormat" />
</dfdl:defineFormat>
@@ -94,7 +94,7 @@
<tdml:defineSchema name="s2" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="general">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" outputNewLine="%CR;%LF;" />
</dfdl:defineFormat>
@@ -174,7 +174,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="s3" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="general">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" outputNewLine="%CR;%LF;" />
</dfdl:defineFormat>
@@ -218,7 +218,7 @@
<tdml:defineSchema name="err1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="general">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" outputNewLine="%CR;%LF;" />
</dfdl:defineFormat>
@@ -251,7 +251,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s4" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="general">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" outputNewLine="%CR;%LF;" dfdlx:layerEncoding="iso-8859-1"
dfdlx:layerLengthUnits='bytes' />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd
index 6ccdd8bb0..d79ebcb15 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/layers/xsd/checkDigitLayer.dfdl.xsd
@@ -26,7 +26,7 @@
targetNamespace="urn:org.apache.daffodil.layers.checkDigit"
elementFormDefault="unqualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/dfdlFormatPrefixedAttributesSDE.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/dfdlFormatPrefixedAttributesSDE.tdml
index 142d0a444..4cde5e0da 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/dfdlFormatPrefixedAttributesSDE.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/dfdlFormatPrefixedAttributesSDE.tdml
@@ -26,7 +26,7 @@
xmlns:tns="http://example.com">
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" dfdl:lengthKind="delimited"/>
<xs:element name="root" type="xs:string"/>
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/disallowDocTypes.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/disallowDocTypes.tdml
index b6ae8ab5a..77f784ba5 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/disallowDocTypes.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/disallowDocTypes.tdml
@@ -28,7 +28,7 @@
xmlns:tns="http://example.com">
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"/>
<xs:element name="root" type="xs:string"/>
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd
index 15d904be4..5388d134d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultQualified.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
elementFormDefault="qualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd
index a370ff47c..94da314f2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/elementFormDefaultUnqualified.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
elementFormDefault="unqualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/general.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/general.tdml
index 498762603..438a9959d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/general.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/general.tdml
@@ -25,7 +25,7 @@
to any specific requirements. /!-->
<tdml:defineSchema name="generalSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:defineFormat name="generalSchema">
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="text"
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
@@ -59,7 +59,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" separator="" separatorSuppressionPolicy="anyEmpty"
separatorPosition="infix" documentFinalTerminatorCanBeMissing="yes"
@@ -159,7 +159,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="delim_distinct1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="pound">
@@ -219,7 +219,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="nameAndRef">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="root1">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd
index 1fc5f09fa..fb1451946 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/generalSchema.dfdl.xsd
@@ -26,7 +26,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
elementFormDefault="qualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/infosetWalker.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/infosetWalker.tdml
index 26cab6eab..b99353dd8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/infosetWalker.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/infosetWalker.tdml
@@ -48,7 +48,7 @@
<tdml:defineSchema name="schema_01" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/largeInput.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/largeInput.tdml
index e914ad72c..a40de9bfa 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/largeInput.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/largeInput.tdml
@@ -25,7 +25,7 @@
to any specific requirements. /!-->
<tdml:defineSchema name="generalSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="generalFormat">
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="text"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/parseUnparsePolicy.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/parseUnparsePolicy.tdml
index 330395c68..ee8c8e85d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/parseUnparsePolicy.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/parseUnparsePolicy.tdml
@@ -25,7 +25,7 @@
to any specific requirements. /!-->
<tdml:defineSchema name="parseUnparsePolicy">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" representation="text"
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
separator="" ignoreCase="no" textNumberRep="standard" leadingSkip="0" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/schemaWithOtherAnnotations.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/schemaWithOtherAnnotations.dfdl.xsd
index 028d9c324..e858abc95 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/schemaWithOtherAnnotations.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/schemaWithOtherAnnotations.dfdl.xsd
@@ -25,7 +25,7 @@
targetNamespace="urn:foo"
xmlns:tns="urn:foo">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<!--
Daffodil ignores the imported schema because it does not define the dfdl
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testElementFormDefault.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testElementFormDefault.tdml
index 0340b1b28..5f5ccc02d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testElementFormDefault.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testElementFormDefault.tdml
@@ -23,7 +23,7 @@
xmlns:ex="http://example.com" xmlns:daf="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext">
<tdml:defineSchema name="qualified" elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format lengthKind="explicit" length="1" ref="ex:GeneralFormat"
separator="" initiator="" terminator="" occursCountKind="implicit"
@@ -45,7 +45,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="unqualified" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format lengthKind="explicit" length="1" ref="ex:GeneralFormat"
separator="" initiator="" terminator="" occursCountKind="implicit"
@@ -67,7 +67,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="missing" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format lengthKind="explicit" length="1" ref="ex:GeneralFormat"
separator="" initiator="" terminator="" occursCountKind="implicit"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testExpressionPropertyWarnings.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testExpressionPropertyWarnings.tdml
index b78bcff8e..33a5d59b9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testExpressionPropertyWarnings.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testExpressionPropertyWarnings.tdml
@@ -25,7 +25,7 @@
defaultRoundTrip="onePass">
<tdml:defineSchema name="S1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"/>
<xs:element name="root" type="xs:double" dfdl:textNumberPattern="#####0.0#####" dfdl:textStandardInfinityRep="{../ex:thisCantBeAnExpression}" />
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testTextBidi.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testTextBidi.tdml
index 7e8bf7bae..f24a98a05 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testTextBidi.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testTextBidi.tdml
@@ -30,7 +30,7 @@
-->
<tdml:defineSchema name="SchemaTextBidi" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"/>
<xs:element name="root-no" type="xs:string" dfdl:textBidi="no" />
<xs:element name="root-yes" type="xs:string" dfdl:textBidi="yes" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserBitOrderOVC.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserBitOrderOVC.tdml
index 54b0e6d82..d31b04e5f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserBitOrderOVC.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserBitOrderOVC.tdml
@@ -34,7 +34,7 @@
<tdml:defineSchema name="s1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
textPadKind='none' lengthKind="explicit" lengthUnits="bits" alignmentUnits="bits" alignment="1"
fillByte="%#rFF;" representation="binary" binaryNumberRep="binary"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
index 649c0702b..2e6211a19 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserFileBuffering.tdml
@@ -29,7 +29,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="fixedLengthStrings">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" textPadKind='padChar' />
<xs:element name="e1" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string" dfdl:truncateSpecifiedLengthString="yes"/>
<xs:element name="e2" dfdl:lengthKind="explicit" dfdl:length="1" type="xs:string" />
@@ -47,7 +47,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="illegalChars">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="e1" dfdl:lengthKind="delimited" type="xs:string"/>
@@ -377,7 +377,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="delimitedStrings">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
@@ -579,7 +579,7 @@
<tdml:defineSchema name="alignmentPaddingOVC">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
lengthUnits="bytes" outputNewLine="%CR;%LF;" alignment="1" alignmentUnits="bytes"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
index e194b57e0..6988f554f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserGeneral.tdml
@@ -22,7 +22,7 @@
suiteName="generalUnparserTests">
<tdml:defineSchema name="fixedLengthStrings">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" textPadKind='padChar' />
<xs:element name="e1" dfdl:lengthKind="explicit" dfdl:length="5" type="xs:string" dfdl:truncateSpecifiedLengthString="yes"/>
<xs:element name="e2" dfdl:lengthKind="explicit" dfdl:length="1" type="xs:string" />
@@ -40,7 +40,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="illegalChars">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="e1" dfdl:lengthKind="delimited" type="xs:string"/>
@@ -368,7 +368,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="delimitedStrings">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
@@ -562,7 +562,7 @@
<tdml:defineSchema name="alignmentPaddingOVC">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
lengthUnits="bytes" outputNewLine="%CR;%LF;" alignment="1" alignmentUnits="bytes"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserSAX.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserSAX.tdml
index 05b481c11..69980c611 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserSAX.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/testUnparserSAX.tdml
@@ -23,7 +23,7 @@
suiteName="saxUnparserTests">
<tdml:defineSchema name="saxUnparseSchema.embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="record" type="ex:itemType"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml
index 5903d1c07..e53276a29 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section00/general/tunables.tdml
@@ -100,7 +100,7 @@
</tdml:defineConfig>
<tdml:defineSchema name="unqualifiedPathStep" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
@@ -430,7 +430,7 @@
<tdml:defineSchema name="exceedMaxOccursBounds">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
@@ -462,7 +462,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="missingTextBidi">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -524,7 +524,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="textBidiYes">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -558,7 +558,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="missingFloating">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -620,7 +620,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="floatingYes">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -654,7 +654,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="encodingErrorPolicyError">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -700,7 +700,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="missingEncodingErrorPolicy">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
@@ -761,7 +761,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="smallMaxHexBinary">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrors.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrors.tdml
index e7fc846f3..827cacf9e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrors.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrors.tdml
@@ -33,7 +33,7 @@
<tdml:defineSchema name="upaFailure">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" textBidi="no" floating="no" encoding="ascii"
byteOrder="bigEndian" alignment="1" alignmentUnits="bytes"
@@ -79,7 +79,7 @@
<tdml:defineSchema name="delimiterNotFound">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" textBidi="no" floating="no" encoding="utf-8"
byteOrder="bigEndian" alignment="1" alignmentUnits="bytes"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrorsUnparse.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrorsUnparse.tdml
index 92520a6ac..3da865088 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrorsUnparse.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/ProcessingErrorsUnparse.tdml
@@ -33,7 +33,7 @@
<tdml:defineSchema name="upaFailure">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" textBidi="no" floating="no" encoding="ascii"
byteOrder="bigEndian" alignment="1" alignmentUnits="bytes"
@@ -79,7 +79,7 @@
<tdml:defineSchema name="okSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" textBidi="no" floating="no" encoding="ascii"
byteOrder="bigEndian" alignment="1" alignmentUnits="bytes"
@@ -244,7 +244,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="roundTripErr">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format lengthKind="explicit" length="1" ref="ex:GeneralFormat"
separator="" initiator="" terminator="" occursCountKind="parsed"
ignoreCase="no" textNumberRep="standard" representation="text"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/dfdl-schema-validation-diagnostics.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/dfdl-schema-validation-diagnostics.tdml
index 4ce778b8f..8eeaf1a3e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/dfdl-schema-validation-diagnostics.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/processing_errors/dfdl-schema-validation-diagnostics.tdml
@@ -25,14 +25,14 @@
defaultRoundTrip="true">
<tdml:defineSchema name="withValidationErrors">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" length="1"/>
<xs:element name="err1" type="xs:int" anAttributeThisIsNot="noise"/>
<xs:element name="err2" type="xs:int" notAnAttribute="randomness" />
</tdml:defineSchema>
<tdml:defineSchema name="withValidationErrors2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" length="1"/>
<xs:element name="err1" type="xs:int" dfdl:byteOrder="anAttributeThisIsNot"/>
<xs:element name="err2" type="something" dfdl:occursCountKind="notAnAttribute"/>
@@ -48,7 +48,7 @@
We need 5 validation errors.
-->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" length="1"/>
<xs:element name="err1" type="xs:int" anAttributeThisIsNot="blah"/>
<xs:element name="something:bar" type="something" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/AttributeFormDefault.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/AttributeFormDefault.dfdl.xsd
index d39cd22fc..6fdc137cd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/AttributeFormDefault.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/AttributeFormDefault.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:ex="http://www.example.com" attributeFormDefault="unqualified" >
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSource.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSource.dfdl.xsd
index 802e2a765..4218ef682 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSource.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSource.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:fn="http://www.w3.org/2005/xpath-functions"
>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSourceNonDfdl.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSourceNonDfdl.dfdl.xsd
index 70e2a7cd1..88c753478 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSourceNonDfdl.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingAppinfoSourceNonDfdl.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:sch="http://purl.oclc.org/dsdl/schematron"
>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="GeneralFormat"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingClosingTag.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingClosingTag.dfdl.xsd
index 82f35e458..2dc9fdd58 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingClosingTag.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/MissingClosingTag.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml
index 5e037af84..7e022d64c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/SchemaDefinitionErrors.tdml
@@ -33,7 +33,7 @@
<tdml:defineSchema name="SDE">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="implicit"/>
<xs:element name="matrix">
@@ -140,7 +140,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="warning">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" encoding="utf-8" representation="text"/>
<xs:element name="elem" type="xs:string">
<xs:annotation>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/lineNumber.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/lineNumber.dfdl.xsd
index d624e588e..4e5722e6b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/lineNumber.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/schema_definition_errors/lineNumber.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
This group doesn't do anything. It's just a convenient way to insert a
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
index 4656a0ba4..25c6c677a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section02/validation_errors/Validation.tdml
@@ -30,7 +30,7 @@
Schemas ======================================================================= -->
<tdml:defineSchema name="pattern">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" dfdl:lengthKind="delimited">
@@ -254,7 +254,7 @@
<tdml:defineSchema name="min2max5">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -367,7 +367,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="inputValueCalc">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" dfdl:lengthKind="delimited" dfdl:inputValueCalc="{ 5-3 }">
@@ -397,7 +397,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="TestFacets">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e2_2" dfdl:lengthKind="delimited">
@@ -984,7 +984,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="facetCombos">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" occursCountKind="implicit" />
<xs:element name="intRestrict" dfdl:lengthKind="delimited">
@@ -1252,7 +1252,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="assertValidation">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" type="xs:int" dfdl:lengthKind="delimited">
@@ -1362,7 +1362,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choiceValidation">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="maxInc3">
@@ -2159,7 +2159,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="validationOptional">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xs:element name="a">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/dfdl_xsdl_subset/DFDLSubset.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/dfdl_xsdl_subset/DFDLSubset.tdml
index e7c245d46..9450f3bea 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/dfdl_xsdl_subset/DFDLSubset.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/dfdl_xsdl_subset/DFDLSubset.tdml
@@ -31,7 +31,7 @@
<tdml:defineSchema name="groupRef.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
@@ -157,7 +157,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="groupRefDFDL">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
@@ -201,7 +201,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="groupRefGroupRef.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format separator=","/>
</dfdl:defineFormat>
@@ -277,7 +277,7 @@
<tdml:defineSchema name="refInitiator3.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
index 1ac5385f7..3592027a2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/Facets.tdml
@@ -73,7 +73,7 @@
<tdml:defineSchema name="facets-min0max0.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -114,7 +114,7 @@
<tdml:defineSchema name="facets-min1max1-scalar.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -154,7 +154,7 @@
<tdml:defineSchema name="facets-min2max20-array.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -188,7 +188,7 @@
<tdml:defineSchema name="arrays-min0max5.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -226,7 +226,7 @@
<tdml:defineSchema name="arrays-min1max5.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -264,7 +264,7 @@
<tdml:defineSchema name="arrays-min3max5.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -304,7 +304,7 @@
<tdml:defineSchema name="facets-min5max10.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -338,7 +338,7 @@
<tdml:defineSchema name="facets-min5max10-2.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -390,7 +390,7 @@
<tdml:defineSchema name="facets-min2max3-schemaErr.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -433,7 +433,7 @@
<tdml:defineSchema name="facets-fixedUnboundedMax-schemaErr.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -479,7 +479,7 @@
<tdml:defineSchema name="facets-cell-min1max1.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -520,7 +520,7 @@
<tdml:defineSchema name="facets-rowcell-min2maxUnbounded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -2778,7 +2778,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="pattern">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" dfdl:lengthKind="delimited">
@@ -3196,7 +3196,7 @@
<tdml:defineSchema name="lengthFacets">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text"/>
<xs:element name="e1" dfdl:lengthKind="implicit" dfdl:lengthUnits="bytes">
<xs:annotation>
@@ -3309,7 +3309,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="lengthFacetsIsolate">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text"/>
<xs:element name="e7" dfdl:lengthKind="delimited" dfdl:lengthUnits="bytes">
<xs:annotation>
@@ -3328,7 +3328,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="lengthFacetsIsolate2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text"/>
<xs:element name="e8" dfdl:lengthKind="delimited" dfdl:lengthUnits="bytes">
<xs:annotation>
@@ -3541,7 +3541,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="checkConstraints">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1">
<xs:complexType>
@@ -3893,7 +3893,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="TestFacets">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" dfdl:lengthKind="delimited">
<xs:annotation>
@@ -5020,7 +5020,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="enumSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="enum_st1">
@@ -5292,7 +5292,7 @@
-->
<tdml:defineSchema name="facetEnum06">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="enum_st4_base">
@@ -5356,7 +5356,7 @@
-->
<tdml:defineSchema name="facetEnum08">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="enum_st6">
@@ -5570,7 +5570,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="minMaxInExSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="mImE_st1">
@@ -6154,7 +6154,7 @@
-->
<tdml:defineSchema name="minMaxInEx10">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="mImE_st8">
@@ -6460,7 +6460,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="totalDigitsSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="tD_st1">
@@ -6556,7 +6556,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="totalDigitsSchemaIsolate">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="tD_st2">
@@ -6580,7 +6580,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="totalDigitsSchemaIsolate2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="tD_st3">
@@ -6604,7 +6604,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="totalDigitsSchemaIsolate3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="tD_st6">
@@ -6805,7 +6805,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="fractionDigitsSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="fD_st1">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/NulChars.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/NulChars.tdml
index 58efbf454..341fb4824 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/NulChars.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/NulChars.tdml
@@ -26,7 +26,7 @@
defaultValidation="on">
<tdml:defineSchema name="nullTest">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/PatternRanges.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/PatternRanges.tdml
index 0cea7571b..0c142508a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/PatternRanges.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/PatternRanges.tdml
@@ -26,7 +26,7 @@
defaultValidation="on">
<tdml:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/testBinary.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/testBinary.dfdl.xsd
index 972d1a39a..466ffa911 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/testBinary.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/facets/testBinary.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:ex="http://example.com" targetNamespace="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AJ.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AJ.tdml
index 15182a7ec..e11c44c65 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AJ.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AJ.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="AJ">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" binaryNumberRep="binary"
byteOrder="bigEndian" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AK.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AK.dfdl.xsd
index d0b604cec..aaeb3ab71 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AK.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AK.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:ex="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
index a6d3f0e1f..a4f9a1fb3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/AL.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
index 97954ca99..415f7fab8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrder.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" bitOrder='leastSignificantBitFirst' lengthKind='explicit'
byteOrder='littleEndian' alignmentUnits='bits' alignment='1'
@@ -148,7 +148,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" bitOrder='leastSignificantBitFirst' lengthKind='explicit'
alignmentUnits='bits' alignment='1' binaryNumberRep='binary'
@@ -268,7 +268,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" bitOrder='mostSignificantBitFirst' lengthKind='explicit'
alignmentUnits='bits' alignment='1' binaryNumberRep='binary'/>
@@ -352,7 +352,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="s4">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary" lengthUnits="bytes"
lengthKind='explicit' alignmentUnits='bytes' alignment='1' binaryNumberRep='binary' />
@@ -400,7 +400,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s5">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary" lengthUnits="bytes"
lengthKind='explicit' alignmentUnits='bytes' alignment='1' binaryNumberRep='binary' />
@@ -461,7 +461,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="s6">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" lengthKind='explicit'
alignmentUnits='bits' alignment='1' binaryNumberRep='binary'/>
@@ -571,7 +571,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s7">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" bitOrder='mostSignificantBitFirst' lengthKind='explicit'
alignmentUnits='bits' alignment='1' binaryNumberRep='binary'
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrderInvalid.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrderInvalid.tdml
index eeb074a78..8008a3140 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrderInvalid.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/BitOrderInvalid.tdml
@@ -23,7 +23,7 @@
xmlns:tns="http://example.com">
<tdml:defineSchema name="s2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bits" bitOrder='leastSignificantBitFirst' lengthKind='explicit'
alignmentUnits='bits' alignment='1' binaryNumberRep='binary'/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Blobs.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Blobs.tdml
index 1a0f0e35c..1c37edd66 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Blobs.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Blobs.tdml
@@ -38,7 +38,7 @@
<tdml:defineSchema name="Blob.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
representation="binary"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Boolean.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Boolean.tdml
index 3a53267c6..07a9cbaad 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Boolean.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Boolean.tdml
@@ -27,7 +27,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="boolean">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" separator=""
leadingSkip='0' encoding="US-ASCII" ignoreCase='no' initiator=""
terminator="" initiatedContent="no" textNumberRep="standard"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Encodings.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Encodings.tdml
index 326209790..29fd1f8c1 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Encodings.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/Encodings.tdml
@@ -28,7 +28,7 @@
<tdml:defineSchema name="s" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="binary"
lengthUnits="bits" alignmentUnits="bits" alignment="1"
bitOrder="leastSignificantBitFirst" byteOrder="littleEndian"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
index 182da80ca..189265a66 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/RuntimeCalendarLanguage.tdml
@@ -22,7 +22,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="s1" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" calendarPatternKind="explicit"/>
<xs:element name="r">
@@ -79,7 +79,7 @@
<tdml:defineSchema name="s2" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" calendarPatternKind="explicit"/>
<xs:element name="r">
@@ -138,7 +138,7 @@
</tdml:tutorial>
<tdml:defineSchema name="s3" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" calendarPatternKind="explicit"/>
<xs:element name="r">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
index 894a7d96e..e652f9812 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes.tdml
@@ -25,7 +25,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="SimpleTypes-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="text"
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
separator="" textNumberCheckPolicy="lax" ignoreCase="no" textNumberRep="standard"
@@ -203,7 +203,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="SimpleTypes-binary">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
lengthUnits="bytes"
textPadKind="padChar" textTrimKind="padChar" />
@@ -4393,7 +4393,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="SimpleTypes-restriction-base" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="embeddedLeadingSpace">
@@ -4411,7 +4411,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="SimpleTypes-padding">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text"
lengthUnits="characters" encoding="utf-8" byteOrder="bigEndian"
textStringPadCharacter="X" textStringJustification="left" textTrimKind="padChar" textPadKind="padChar"
@@ -4955,7 +4955,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="dateTimeSchemaTNR">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator="" terminator="" leadingSkip="0"
trailingSkip="0" textBidi="no" floating="no" encoding="utf-8"
byteOrder="bigEndian" alignment="1" alignmentUnits="bytes" fillByte="f"
@@ -4982,7 +4982,7 @@
<tdml:defineSchema name="dateTimeSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<!--
@@ -5181,7 +5181,7 @@
-->
<tdml:defineSchema name="tzEmptySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="date33">
@@ -7720,7 +7720,7 @@
<tdml:defineSchema name="HexBinary">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
@@ -8413,7 +8413,7 @@
<tdml:defineSchema name="DFDL-307-one-octet.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bits" byteOrder='bigEndian'
alignment="1" alignmentUnits="bits" lengthKind='explicit' />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes2.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes2.tdml
index a673eb5d2..1b422667a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes2.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypes2.tdml
@@ -23,7 +23,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="s">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" representation="text" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypesUnparse.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypesUnparse.tdml
index f3c3e03a3..21473877e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypesUnparse.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/SimpleTypesUnparse.tdml
@@ -23,7 +23,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="SimpleTypes-binary">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" fillByte="%#r20;" representation="binary" lengthUnits="bytes" />
<dfdl:defineVariable name="FOUR" type="xs:int" defaultValue="4" external="false" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/WhiteSpace.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/WhiteSpace.tdml
index 1de38d50c..a3d2d5538 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/WhiteSpace.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/WhiteSpace.tdml
@@ -24,7 +24,7 @@
<tdml:defineSchema name="Lax.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="text"
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
separator="" ignoreCase="no" textNumberRep="standard" textNumberCheckPolicy="lax"
@@ -72,7 +72,7 @@
<!-- STRICT -->
<tdml:defineSchema name="strict.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="implicit" representation="text"
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
separator="" ignoreCase="no" textNumberRep="standard" textNumberCheckPolicy="strict" />
@@ -118,7 +118,7 @@
lengthUnits="bytes" encoding="US-ASCII" initiator="" terminator=""
separator="" ignoreCase="no" textNumberRep="standard" textNumberCheckPolicy="strict"/>
</dfdl:defineFormat>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="uS_02" type="xs:unsignedShort"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd
index 5d547a5c3..5b8c64e9a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/nonNegativeInteger.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:annotation>
<xsd:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="fmt:GeneralPurposeFormat" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/simple-type-bases.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/simple-type-bases.tdml
index d6deb3a85..e46aaefa4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/simple-type-bases.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/simple-type-bases.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="stb">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" type="ex:ty" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/unions.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/unions.tdml
index 95cf4caf8..4e331e390 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/unions.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section05/simple_types/unions.tdml
@@ -27,7 +27,7 @@
defaultValidation="limited">
<tdml:defineSchema name="u1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
lengthKind="delimited" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd
index 79a4e8586..9fce2cb26 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/DefaultProperties.dfdl.xsd
@@ -19,7 +19,7 @@
<schema xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://example.com"
xmlns:tns="http://example.com">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
index 400aa0550..8e8debe09 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/Entities.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="Entities-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="rdefFormat" encoding="utf-8"
byteOrder="bigEndian" ignoreCase="no" textStringJustification="left"
@@ -67,7 +67,7 @@ is multiple bytes in UTF-8 encoding that is used - DFDL-6-042R"
<tdml:defineSchema name="Entities_01-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
byteOrder="bigEndian" representation="text" lengthUnits="characters"
textNumberRep="standard" lengthKind="delimited" initiator=""
@@ -267,7 +267,7 @@ is multiple bytes in UTF-8 encoding that is used - DFDL-6-042R"
<tdml:defineSchema name="Entities_02-Embedded">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="utf-16"
separator="/" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -529,7 +529,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EscapesSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
byteOrder="bigEndian" ignoreCase="no" textStringJustification="left"
textStringPadCharacter="0" textTrimKind="none" textPadKind="none"
@@ -624,7 +624,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="whitespaceSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
byteOrder="bigEndian" ignoreCase="no" textStringJustification="left"
textStringPadCharacter="0" textTrimKind="padChar" textPadKind="padChar"
@@ -870,7 +870,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="NLSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
byteOrder="bigEndian" representation="text" lengthUnits="characters"
textNumberRep="standard" lengthKind="delimited" initiator=""
@@ -991,7 +991,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EntitiesMix">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
byteOrder="bigEndian" representation="text" lengthUnits="characters"
textNumberRep="standard" lengthKind="delimited" initiator=""
@@ -1137,7 +1137,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EmptyStringEntityInExpression">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="US-ASCII"
separator="" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -1205,7 +1205,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EmptyStringEntityInExpressionDelimited">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="US-ASCII"
separator="" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -1243,7 +1243,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EmptyStringEntityTermInComplex">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="US-ASCII"
separator="" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -1308,7 +1308,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="EmptyStringEntityInitiator">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="US-ASCII"
separator="" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -1365,7 +1365,7 @@ is multiple bytes in UTF-8 encoding that is used"
<tdml:defineSchema name="AllAsciiCodePointEntities">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" encoding="ISO-8859-1" />
<xs:element name="hexEntities" type="xs:string" dfdl:initiator="%#x00;%#x01;%#x02;%#x03;%#x04;%#x05;%#x06;%#x07;%#x08;%#x09;%#x0A;%#x0B;%#x0C;%#x0D;%#x0E;%#x0F;%#x10;%#x11;%#x12;%#x13;%#x14;%#x15;%#x16;%#x17;%#x18;%#x19;%#x1A;%#x1B;%#x1C;%#x1D;%#x1E;%#x1F;%#x20;%#x21;%#x22;%#x23;%#x24;%#x25;%#x26;%#x27;%#x28;%#x29;%#x2A;%#x2B;%#x2C;%#x2D;%#x2E;%#x2F;%#x30;%#x31;%#x32;%#x33;%#x34;%#x35;%#x36;%#x37;%#x38;%#x39;%#x3A;%#x3B;%#x3C;%#x3D;%#x3E;%#x3F;%#x40;%#x41;%#x42;%#x43;%#x44;%#x45;%#x4 [...]
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/InvalidEntities.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/InvalidEntities.tdml
index 6e87022b0..6ef97c927 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/InvalidEntities.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/InvalidEntities.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="Entities-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="rdefFormat" encoding="utf-8" byteOrder="bigEndian"
ignoreCase="no" textStringJustification="left"
textStringPadCharacter="0" textTrimKind="none" textPadKind="none"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd
index 9ebae6a6c..f8db1380e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/charClassEntities.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:fn="http://www.w3.org/2005/xpath-functions"
elementFormDefault="qualified">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/entities_01.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/entities_01.tdml
index 99cf4e7cb..4a87199c7 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/entities_01.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/entities_01.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="sch1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="root" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -53,7 +53,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="sch2" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="root" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -83,7 +83,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="sch3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="root" dfdl:lengthKind="implicit">
<xs:complexType>
@@ -129,7 +129,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="sch4">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" separator="" separatorSuppressionPolicy="anyEmpty"
separatorPosition="infix" documentFinalTerminatorCanBeMissing="yes"
@@ -161,7 +161,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="sch5">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" separator="" separatorSuppressionPolicy="anyEmpty"
separatorPosition="infix" documentFinalTerminatorCanBeMissing="yes"
@@ -238,7 +238,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="sch6">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" separator="" separatorSuppressionPolicy="anyEmpty"
separatorPosition="infix" documentFinalTerminatorCanBeMissing="yes"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd
index 5455afd00..33e0543b5 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/entities/utf16schema.dfdl.xsd
@@ -20,7 +20,7 @@
targetNamespace="http://www.example.org/example1/" xmlns:tns="http://www.example.org/example1/"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM.dfdl.xsd
index 17c8b0d3a..5db09aabe 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:ibmSchExtn="http://www.ibm.com/schema/extensions"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:element dfdl:terminator="%NL;" ibmSchExtn:docRoot="true"
name="ABC">
<xsd:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM_invalid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM_invalid.dfdl.xsd
index f2cb64de2..104a7ae85 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM_invalid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_IBM_invalid.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:ibmSchExtn="http://www.ibm.com/schema/extensions"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:element dfdl:terminator="%NL;" name="ABC" name="Another!">
<xsd:complexType>
<xsd:sequence dfdl:separator="">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd
index 814110b32..91d2c52f6 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:ibmSchExtn="http://www.ibm.com/schema/extensions"
xmlns:rando="urn:imnotreal.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:element dfdl:terminator="%NL;" rando:whatAreYouDoing="this is not valid" name="ABC">
<xsd:complexType>
<xsd:sequence dfdl:separator="" rando:IcanPutAnythingHEre="yep" rando:separator=".">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid_2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid_2.dfdl.xsd
index d32656d97..c14be0e15 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid_2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ABC_invalid_2.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:ibmSchExtn="http://www.ibm.com/schema/extensions"
xmlns:rando="urn:imnotreal.com" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xsd:element dfdl:terminator="%NL;" rando:whatAreYouDoing="this is notavalid" name="ABC">
<xsd:complexType>
<xsd:sequence dfdl:separator="" rando:IcanPutAnythingHEre="yep" rando:separator=".">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
index 9d1c407ba..914a1ce85 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:tns="http://myAddress.com"
xmlns:addr="http://myAddress.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
index e09fe0adf..5e5184f25 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:ex="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/charClassEntities.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/charClassEntities.dfdl.xsd
index e92b3196c..7116c6137 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/charClassEntities.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/charClassEntities.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xmlns:fn="http://www.w3.org/2005/xpath-functions">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_namespace.dfdl.xsd
index cd7ad158f..fef903dcc 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_namespace.dfdl.xsd
@@ -20,7 +20,7 @@
targetNamespace="http://myCustomer.com" xmlns:addr="http://myAddress.com"
xmlns:cust="http://myCustomer.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://myAddress.com" schemaLocation="org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd"/>
+ <xs:import namespace="http://myAddress.com" schemaLocation="/org/apache/daffodil/section06/namespaces/address_namespace.dfdl.xsd"/>
<xs:element name="customer">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_no_namespace.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_no_namespace.dfdl.xsd
index 58424db44..32cbcb66d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_no_namespace.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/customer_no_namespace.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,7 +28,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/address_no_namespace.dfdl.xsd"/>
<xs:element name="customer">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd
index ec1ef2575..913eb7f36 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:cs="http://stepSchema.com" xmlns:ex="http://www.example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,7 +28,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://stepSchema.com" schemaLocation="org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd"/>
+ <xs:import namespace="http://stepSchema.com" schemaLocation="/org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd"/>
<xs:element name="elem">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd
index f314a23f5..857de757d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/cycle_step.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://stepSchema.com" xmlns:cb="http://baseSchema.com" xmlns:ex="http://www.example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,7 +28,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://baseSchema.com" schemaLocation="org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd"/>
+ <xs:import namespace="http://baseSchema.com" schemaLocation="/org/apache/daffodil/section06/namespaces/cycle_base.dfdl.xsd"/>
<xs:element name="elsewhere" dfdl:lengthKind="implicit">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat.dfdl.xsd
index bf3cb7b58..4db34c2dd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:tns="http://www.ibm.com/dfdl/GeneralPurposeFormat">
- <xs:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat" schemaLocation="IBMdefined/GeneralPurposeFormat.xsd"/>
+ <xs:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat" schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat_2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat_2.dfdl.xsd
index 0100c4fed..d3d83e80d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat_2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/ibm_format_compat_2.dfdl.xsd
@@ -22,7 +22,7 @@
targetNamespace="http://example.com" xmlns:tns="http://example.com">
<xsd:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd"/>
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd"/>
<xsd:element dfdl:lengthKind="implicit" ibmSchExtn:docRoot="true" name="RNAChain">
<xsd:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include01.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include01.dfdl.xsd
index 6cc5b3007..c514a9728 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include01.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include01.dfdl.xsd
@@ -20,6 +20,6 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
<!-- search for this on the classpath -->
- <xs:include schemaLocation="include01_01.dfdl.xsd"/>
+ <xs:include schemaLocation="/include01_01.dfdl.xsd"/>
</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include02.dfdl.xsd
index 13e0a766b..e90179ffb 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/include02.dfdl.xsd
@@ -20,6 +20,6 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
<!-- search for this on the classpath -->
- <xs:include schemaLocation="include02_01.dfdl.xsd"/>
+ <xs:include schemaLocation="/include02_01.dfdl.xsd"/>
</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
index 0c732b817..e91563ab3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
@@ -26,7 +26,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="embeddedWithInclude">
- <xs:include schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ <xs:include schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<dfdl:format ref="GeneralPurposeFormat"/>
<xs:element name="basic" type="xs:string" dfdl:lengthKind="delimited"/>
</tdml:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd
index 34374abf1..16be8aedd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://a01.com" xmlns:a01="http://a01.com" xmlns:b01="http://b01.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,7 +28,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://b01.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd"/>
+ <xs:import namespace="http://b01.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd"/>
<xs:element name="remote01" type="xs:int" dfdl:initiator="remote01:" dfdl:lengthKind="delimited"/>
<xs:element name="remote03" type="b01:initInt"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd
index e89ff2964..562fb0e9e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://a02.com" xmlns:a02="http://a02.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd"/>
<xs:element name="seq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd
index 81e7d87f0..7567b97de 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd
@@ -26,7 +26,7 @@
properties must be explicitly defined
-->
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -49,7 +49,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://b03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd"/>
+ <xs:import namespace="http://b03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd"/>
<xs:element name="nestSequence" dfdl:terminator="">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd
index 2d3b3ce4e..28601900c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo="http://foo.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://foo.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd"/>
+ <xs:import namespace="http://foo.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd"/>
<!-- notAString is of type foo:string, which is a simpleType with an xs:int restriction base -->
<xs:element name="notAString" type="foo:string"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd
index f2df9c341..9e73ec51b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo="http://foo.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://foo.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd"/>
+ <xs:import namespace="http://foo.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd"/>
<!-- notAString is of type foo:string, which is a simpleType with an xs:int restriction base -->
<xs:element name="notAString" type="foo:string"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd
index dcec26edc..64f2a2cb4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd
@@ -25,7 +25,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://b12.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_12.dfdl.xsd"/>
+ <xs:import namespace="http://b12.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_12.dfdl.xsd"/>
<xs:element name="nestSequence" dfdl:terminator="">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd
index 9caf65b6a..3eb81ab58 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://b13.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd"/>
+ <xs:import namespace="http://b13.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd"/>
<xs:element name="nestSequence">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_14.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_14.dfdl.xsd
index c6dc80285..c847456e8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_14.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_14.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://a14.com" xmlns:a14="http://a14.com" xmlns:b14="http://b14.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_15.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_15.dfdl.xsd
index 69965e341..26fe23563 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_15.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_15.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_16.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_16.dfdl.xsd
index 3e45dfb9d..366a8897b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_16.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_16.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_20.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_20.dfdl.xsd
index 971035ed8..b2331ff42 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_20.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_20.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:base="http://baseSchema.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://a20.com" xmlns:a20="http://a20.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_21.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_21.dfdl.xsd
index 41f135f7c..d7ba10d15 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_21.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_A_21.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:base="http://baseSchema.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://a21.com" xmlns:a21="http://a21.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd
index 8d86b4d1e..a303d6666 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://b01.com" xmlns:b01="http://b01.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd
index 0bcfbec2e..4489f52ae 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://b02.com" xmlns:b02="http://b02.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd"/>
<xs:element name="seq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd
index ed0d64b0b..d1472959d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_03.dfdl.xsd
@@ -26,7 +26,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://c03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd"/>
+ <xs:import namespace="http://c03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd"/>
<xs:element name="nest" type="c03:nestType" dfdl:textNumberJustification="center"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd
index cd9a9555a..94b600704 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://b04.com" xmlns:cFoo="http://c04.com" xmlns:foo="http://b04.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://c04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_04.dfdl.xsd"/>
+ <xs:import namespace="http://c04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_04.dfdl.xsd"/>
<xs:element name="bSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd
index 98e03db3c..55f11a0d4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd
@@ -28,7 +28,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://c04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_04.dfdl.xsd"/>
+ <xs:import namespace="http://c04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_04.dfdl.xsd"/>
<xs:element name="bSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd
index 86a8f14da..4ecb00fc2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -29,7 +29,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_05_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_05_nons.dfdl.xsd"/>
<xs:element name="bSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd
index be84a259c..e11a00cff 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd"/>
<xs:element name="date" type="xs:date" dfdl:ref="b06:dateNoTZ" dfdl:calendarPattern="MM-dd-yyyy" dfdl:calendarPatternKind="explicit"/>
<xs:element name="date2" type="xs:date" dfdl:ref="b06:dateTZtypo" dfdl:calendarPattern="MM-dd-yyyy" dfdl:calendarPatternKind="explicit"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd
index bff951772..fa9edb097 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd"/>
<xs:element name="date" type="xs:date" dfdl:ref="b06:dateNoTZ" dfdl:calendarPattern="MM-dd-yyyy" dfdl:calendarPatternKind="explicit"/>
<xs:element name="date2" type="xs:date" dfdl:ref="b06:dateTZtypo" dfdl:calendarPattern="MM-dd-yyyy" dfdl:calendarPatternKind="explicit"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_08.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_08.dfdl.xsd
index eceac3630..32184195d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_08.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_08.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://b08.com" xmlns:b08="http://b08.com" xmlns:c08="http://c08.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://c08.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd"/>
+ <xs:import namespace="http://c08.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd"/>
<xs:element name="bElem" type="c08:cString">
<xs:annotation>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd
index 972f5cbe7..d9024161b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_11.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:foo="http://foo.com" targetNamespace="http://foo.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd
index c1de980ad..94c739cb8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_B_13.dfdl.xsd
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://c13.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_13.dfdl.xsd"/>
+ <xs:import namespace="http://c13.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_13.dfdl.xsd"/>
<xs:element name="nest" type="c13:nestType" dfdl:textNumberJustification="center"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd
index 6e2815df4..39a69ada0 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_02.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd
index bdde31e77..d168dbf87 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_03.dfdl.xsd
@@ -26,7 +26,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://d03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd"/>
+ <xs:import namespace="http://d03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd"/>
<xs:simpleType name="nestType" dfdl:textNumberPadCharacter=".">
<xs:restriction base="d03:nestBase"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd
index 50c129f9c..f999b9519 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_C_08.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://c08.com" xmlns:c08="http://c08.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd
index 2aa9daf55..ab0da5a5c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_D_03.dfdl.xsd
@@ -26,7 +26,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://e03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd"/>
+ <xs:import namespace="http://e03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd"/>
<xs:simpleType name="nestBase">
<xs:restriction base="e03:subNestBase"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd
index dc08bb8ad..1d60d0458 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_E_03.dfdl.xsd
@@ -25,7 +25,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://f03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_F_03.dfdl.xsd"/>
+ <xs:import namespace="http://f03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_F_03.dfdl.xsd"/>
<xs:simpleType name="subNestBase" dfdl:ref="f03:format_01" dfdl:terminator="(e)" >
<xs:restriction base="xs:int"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_01.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_01.dfdl.xsd
index 0a9f8ba04..37836414c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_01.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_01.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:a01="http://a01.com" xmlns:b01="http://b01.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -29,8 +29,8 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a01.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd"/>
- <xs:import namespace="http://b01.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd"/>
+ <xs:import namespace="http://a01.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd"/>
+ <xs:import namespace="http://b01.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd"/>
<xs:element name="choice01">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_02.dfdl.xsd
index 904aab041..89146f95f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_02.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:a02="http://a02.com" xmlns:b02="http://b02.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,8 +30,8 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a02.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd"/>
- <xs:import namespace="http://b02.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd"/>
+ <xs:import namespace="http://a02.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_02.dfdl.xsd"/>
+ <xs:import namespace="http://b02.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_02.dfdl.xsd"/>
<xs:element name="super_seq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd
index 8538b1266..dd56dc08c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_03.dfdl.xsd
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a03.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd"/>
+ <xs:import namespace="http://a03.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_03.dfdl.xsd"/>
<xs:element name="rabbitHole">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04.dfdl.xsd
index f42b5ed7e..88f0298e2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:a04="http://a04.com" xmlns:b04="http://b04.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,8 +30,8 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
- <xs:import namespace="http://b04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd"/>
+ <xs:import namespace="http://a04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
+ <xs:import namespace="http://b04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd"/>
<xs:element name="aSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid.dfdl.xsd
index bba1ef6df..a8e3c3d0f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid.dfdl.xsd
@@ -28,8 +28,8 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
- <xs:import namespace="http://b04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd"/>
+ <xs:import namespace="http://a04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
+ <xs:import namespace="http://b04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_04.dfdl.xsd"/>
<xs:element name="aSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid2.dfdl.xsd
index 057358cf3..9568eb070 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_04_invalid2.dfdl.xsd
@@ -28,8 +28,8 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
- <xs:import namespace="http://b04.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd"/>
+ <xs:import namespace="http://a04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_04.dfdl.xsd"/>
+ <xs:import namespace="http://b04.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_04_invalid.dfdl.xsd"/>
<xs:element name="aSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd
index 709f74a38..78c86e52e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -29,7 +29,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_05_nons.dfdl.xsd"/>
<xs:element name="baseSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons_with_A.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons_with_A.dfdl.xsd
index d3789624e..3f9d3f1ac 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons_with_A.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_05_nons_with_A.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_05_nons.dfdl.xsd"/>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_05_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_base_05_nons.dfdl.xsd"/>
</xs:schema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06.dfdl.xsd
index 85ee6fac0..52f236f1d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:b06="http://b06.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,9 +30,9 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd"/>
- <xs:import namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
- <xs:import namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd"/>
+ <xs:import namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
+ <xs:import namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
<xs:element name="baseSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06_valid.dfdl.xsd
index d679da3bb..6a9d1c917 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_06_valid.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:b06="http://b06.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,9 +30,9 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd"/>
- <xs:import namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
- <xs:import namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd"/>
+ <xs:import namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
+ <xs:import namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
<xs:element name="baseSeq">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_07_failure.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_07_failure.dfdl.xsd
index e5901d887..bf0a02ea2 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_07_failure.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_07_failure.dfdl.xsd
@@ -26,7 +26,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://b00.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
+ <xs:import namespace="http://b00.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
<xs:element name="elem" type="xs:int"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_08.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_08.dfdl.xsd
index 19c30c8de..2dd35589f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_08.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_08.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:c08="http://c08.com" xmlns:a08="http://a08.com" xmlns:b08="http://b08.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:import namespace="http://a08.com" schemaLocation="multi_A_08.dfdl.xsd" />
<xs:import namespace="http://b08.com" schemaLocation="multi_B_08_classpath.dfdl.xsd" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd
index 077bedc7a..7f3f21a7b 100644
Binary files a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd and b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_09.dfdl.xsd differ
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_10.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_10.dfdl.xsd
index 51d3dbbab..e7722d73d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_10.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_10.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:a10="http://a10.com" xmlns:c10="http://c10.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,9 +30,9 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a10.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_10.dfdl.xsd"/>
- <xs:import namespace="http://c10.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_C_10.dfdl.xsd"/>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_10.dfdl.xsd"/>
+ <xs:import namespace="http://a10.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_10.dfdl.xsd"/>
+ <xs:import namespace="http://c10.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_C_10.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_10.dfdl.xsd"/>
<xs:element name="root">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11.dfdl.xsd
index 8c2bd6fe2..2b96534d3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11.dfdl.xsd
@@ -19,7 +19,7 @@
<p1:schema xmlns:p1="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="ns2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ns3" xmlns:p2="ns2" xmlns:p8="http://a06.com" xmlns:p9="http://b06.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<p3:annotation xmlns:p3="http://www.w3.org/2001/XMLSchema">
<p4:appinfo source="http://www.ogf.org/dfdl/" xmlns:p4="http://www.w3.org/2001/XMLSchema">
@@ -31,8 +31,8 @@
</p4:appinfo>
</p3:annotation>
- <p5:include xmlns:p5="http://www.w3.org/2001/XMLSchema" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd"/>
- <p6:import xmlns:p6="http://www.w3.org/2001/XMLSchema" namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
+ <p5:include xmlns:p5="http://www.w3.org/2001/XMLSchema" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_11_nons.dfdl.xsd"/>
+ <p6:import xmlns:p6="http://www.w3.org/2001/XMLSchema" namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06.dfdl.xsd"/>
<p7:element xmlns:p7="http://www.w3.org/2001/XMLSchema" name="root" type="p1:int" dfdl:lengthKind="explicit" dfdl:length="1"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11_valid.dfdl.xsd
index d44db4bc7..1556eb6aa 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_11_valid.dfdl.xsd
@@ -19,7 +19,7 @@
<p1:schema xmlns:p1="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="ns2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="ns3" xmlns:p2="ns2" xmlns:p8="http://a06.com" xmlns:p9="http://b06.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<p3:annotation xmlns:p3="http://www.w3.org/2001/XMLSchema">
<p4:appinfo source="http://www.ogf.org/dfdl/" xmlns:p4="http://www.w3.org/2001/XMLSchema">
@@ -31,8 +31,8 @@
</p4:appinfo>
</p3:annotation>
- <p5:include xmlns:p5="http://www.w3.org/2001/XMLSchema" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd"/>
- <p6:import xmlns:p6="http://www.w3.org/2001/XMLSchema" namespace="http://b06.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
+ <p5:include xmlns:p5="http://www.w3.org/2001/XMLSchema" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_11_nons_valid.dfdl.xsd"/>
+ <p6:import xmlns:p6="http://www.w3.org/2001/XMLSchema" namespace="http://b06.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_06_valid.dfdl.xsd"/>
<p7:element xmlns:p7="http://www.w3.org/2001/XMLSchema" name="root" type="p1:int" dfdl:lengthKind="explicit" dfdl:length="1"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_12.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_12.dfdl.xsd
index 8db9e5f5d..db86cef3e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_12.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_12.dfdl.xsd
@@ -26,7 +26,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a12.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd"/>
+ <xs:import namespace="http://a12.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_12.dfdl.xsd"/>
<xs:element name="rabbitHole">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_13.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_13.dfdl.xsd
index 70e3d24b5..26f82dc77 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_13.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_13.dfdl.xsd
@@ -27,7 +27,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:import namespace="http://a13.com" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd"/>
+ <xs:import namespace="http://a13.com" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_13.dfdl.xsd"/>
<xs:element name="rabbitHole">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_14.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_14.dfdl.xsd
index d199d1c03..d3ff34d60 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_14.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_14.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="http://baseSchema.com" xmlns:base14="http://baseSchema.com" xmlns:a14="http://a14.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd
index b5a33a491..58eda4a8f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_15.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_16.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_16.dfdl.xsd
index d6d154677..55fd200d4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_16.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_16.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_17.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_17.dfdl.xsd
index 598d0633a..6091687e8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_17.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_17.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,7 +28,7 @@
</xs:annotation>
<xs:include schemaLocation="multi_A_17.dfdl.xsd"/>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_17.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_17.dfdl.xsd"/>
<xs:element name="e17">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_18.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_18.dfdl.xsd
index 02641bc27..6ffc72a69 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_18.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_18.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:ex1="http://example.com/1" targetNamespace="http://example.com/1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_19.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_19.dfdl.xsd
index be23fa88f..ea47fd68f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_19.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_19.dfdl.xsd
@@ -18,7 +18,7 @@
<ex:schema xmlns:ex="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://example.com/1" targetNamespace="http://example.com/1">
- <ex:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <ex:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<ex:annotation>
<ex:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_20.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_20.dfdl.xsd
index 367540902..fc528c249 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_20.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_20.dfdl.xsd
@@ -20,7 +20,7 @@
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:a20="http://a20.com">
<xs:import namespace="http://a20.com" schemaLocation="multi_A_20.dfdl.xsd"/>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_21.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_21.dfdl.xsd
index 8db58ed9b..ba5bbaf24 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_21.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_21.dfdl.xsd
@@ -20,7 +20,7 @@
targetNamespace="http://baseSchema.com" xmlns:base="http://baseSchema.com" xmlns:a21="http://a21.com">
<xs:import namespace="http://a21.com" schemaLocation="multi_A_21.dfdl.xsd"/>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi.dfdl.xsd
index fd35cd2a4..1ef0990e4 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi.dfdl.xsd
@@ -19,7 +19,7 @@
<shi:schema xmlns:shi="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="shi:shi" xmlns:shishi="shi:shi" xmlns:shishishi="shi:shi:shi">
- <shi:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <shi:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<shi:annotation>
<shi:appinfo source="http://www.ogf.org/dfdl/">
@@ -31,8 +31,8 @@
</shi:appinfo>
</shi:annotation>
- <shi:include schemaLocation="org/apache/daffodil/section06/namespaces/shi"/>
- <shi:import namespace="shi:shi:shi" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_shi.dfdl.xsd"/>
+ <shi:include schemaLocation="/org/apache/daffodil/section06/namespaces/shi"/>
+ <shi:import namespace="shi:shi:shi" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_shi.dfdl.xsd"/>
<shi:element name="shishishi">
<shi:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi2.dfdl.xsd
index c08c45c78..62656107c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_base_shi2.dfdl.xsd
@@ -19,7 +19,7 @@
<shi:schema xmlns:shi="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
targetNamespace="shi:shi" xmlns:shishi="shi:shi" xmlns:shishishi="shi:shi:shi">
- <shi:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <shi:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<shi:annotation>
<shi:appinfo source="http://www.ogf.org/dfdl/">
@@ -28,8 +28,8 @@
</shi:appinfo>
</shi:annotation>
- <shi:include schemaLocation="org/apache/daffodil/section06/namespaces/shi"/>
- <shi:import namespace="shi:shi:shi" schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_shi.dfdl.xsd"/>
+ <shi:include schemaLocation="/org/apache/daffodil/section06/namespaces/shi"/>
+ <shi:import namespace="shi:shi:shi" schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_shi.dfdl.xsd"/>
<shi:element name="shishishi2">
<shi:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_temp.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_temp.dfdl.xsd
index 71fc5455a..ba06db839 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_temp.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/multi_temp.dfdl.xsd
@@ -25,7 +25,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_temp.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_temp.dfdl.xsd"/>
<xs:element name="baseSeq2">
<xs:complexType>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceCharLim.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceCharLim.dfdl.xsd
index b98c849aa..071730c29 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceCharLim.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceCharLim.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:qwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdfqwerasdf [...]
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules.dfdl.xsd
index e95109080..b334dea9a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules.dfdl.xsd
@@ -18,7 +18,7 @@
<_-_-_:schema xmlns:_-_-_="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:ψ="http://example.com" xmlns:ex="http://example.com" targetNamespace="http://example.com">
- <_-_-_:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <_-_-_:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<_-_-_:annotation>
<_-_-_:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules2.dfdl.xsd
index 1239d7330..4c2a1e1bd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceRules2.dfdl.xsd
@@ -22,7 +22,7 @@
xmlns:tns="http://example.com"
targetNamespace="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="tns:GeneralFormat"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceSpecialChar.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceSpecialChar.dfdl.xsd
index d92b682b8..49bb2a264 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceSpecialChar.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaceSpecialChar.dfdl.xsd
@@ -23,7 +23,7 @@ xmlns:b·="http://example.com"
targetNamespace="http://example.com">
- <имен:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <имен:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<имен:annotation>
<имен:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml
index 120de5a87..fd2663b3f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/namespaces.tdml
@@ -25,34 +25,34 @@
defaultRoundTrip="true">
<tdml:defineSchema name="embeddedWithImport">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<dfdl:format ref="gpf:GeneralPurposeFormat" />
<xs:element name="basic" type="xs:string"
dfdl:lengthKind="delimited" />
</tdml:defineSchema>
<tdml:defineSchema name="embeddedWithInclude">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="basic" type="xs:string"
dfdl:lengthKind="delimited" />
</tdml:defineSchema>
<tdml:defineSchema name="embedded_base_01">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="gpf:GeneralPurposeFormat" separator=""
initiator="" terminator="" leadingSkip='0' textTrimKind="none"
initiatedContent="no" ignoreCase="no" representation="text"
textNumberRep="standard" lengthKind="delimited" encoding="ASCII" />
<xs:import namespace="http://a01.com"
- schemaLocation="org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd" />
+ schemaLocation="/org/apache/daffodil/section06/namespaces/multi_A_01.dfdl.xsd" />
<xs:import namespace="http://b01.com"
- schemaLocation="org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd" />
+ schemaLocation="/org/apache/daffodil/section06/namespaces/multi_B_01.dfdl.xsd" />
<xs:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<xs:element name="choice01">
<xs:complexType>
@@ -68,9 +68,9 @@
</tdml:defineSchema>
<tdml:defineSchema name="IncorrectAppinfoSource">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:import namespace="http://www.ibm.com/dfdl/GeneralPurposeFormat"
- schemaLocation="IBMdefined/GeneralPurposeFormat.xsd" />
+ schemaLocation="/IBMdefined/GeneralPurposeFormat.xsd" />
<dfdl:format ref="gpf:GeneralPurposeFormat" />
<xs:element name="basic" type="xs:string"
dfdl:lengthKind="delimited" >
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/predefined_format.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/predefined_format.dfdl.xsd
index 4f5ccc660..656adcf0d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/predefined_format.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/predefined_format.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:tns="http://www.ogf.org/dfdl/dfdl-1.0/examples/" >
- <xs:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/examples/" schemaLocation="org/apache/daffodil/section06/namespaces/format.dfdl.xsd"/>
+ <xs:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/examples/" schemaLocation="/org/apache/daffodil/section06/namespaces/format.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/primTypesPrefixes.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/primTypesPrefixes.dfdl.xsd
index a3b2cc9a4..ef3ac522d 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/primTypesPrefixes.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/primTypesPrefixes.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" targetNamespace="http://example.com"
xmlns:tns="http://example.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname1.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname1.dfdl.xsd
index c509bb212..98d7aba26 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname1.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname1.dfdl.xsd
@@ -23,11 +23,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<!--
<xs:import namespace="http://example.com/2"
- schemaLocation="org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd" />
+ schemaLocation="/org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd" />
-->
<xs:annotation>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd
index 56fe63a31..db6ebaf59 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname2.dfdl.xsd
@@ -20,10 +20,10 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:what="http://example.com/3" xmlns:foo="http://example.com/2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:import namespace="http://example.com/3"
- schemaLocation="org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd" />
+ schemaLocation="/org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd
index c5eb1ab1c..04d5c86eb 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/qname3.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:foo="http://example.com/3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/shi b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/shi
index ffc0f5e8e..780c70c89 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/shi
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/shi
@@ -18,7 +18,7 @@
<shi:schema xmlns:shi="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <shi:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <shi:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<shi:annotation>
<shi:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd
index 6d78d3d43..71b446717 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:base="http://baseSchema.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd"/>
<xs:group name="aGroup">
<xs:sequence dfdl:separator=".">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd
index fb014ee73..dedb99cbd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_A_06_nons_valid.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:base="http://baseSchema.com">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
@@ -30,7 +30,7 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd"/>
<xs:group name="aGroup">
<xs:sequence dfdl:separator=".">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd
index 7ff4b991a..af21e9578 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons.dfdl.xsd
@@ -17,7 +17,7 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd
index e28457498..c6925cf5b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/subfolder/multi_C_06_nons_valid.dfdl.xsd
@@ -17,7 +17,7 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch1.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch1.dfdl.xsd
index 1481f645b..1a81551ae 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch1.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch1.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:tns="http://example.com"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <include schemaLocation="org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd" />
+ <include schemaLocation="/org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd" />
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
<dfdl:format ref="tns:test01fmt1" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd
index 4b32e85ae..15c8ba374 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test01sch2.dfdl.xsd
@@ -29,6 +29,6 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
</xs:schema>
\ No newline at end of file
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch1.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch1.dfdl.xsd
index 14eb05abc..186b19949 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch1.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch1.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <import namespace="urn:example2" schemaLocation="org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd" />
+ <import namespace="urn:example2" schemaLocation="/org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd" />
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd
index 8a31c36c4..d0ee3bbf9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test02sch2.dfdl.xsd
@@ -30,6 +30,6 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
</schema>
\ No newline at end of file
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch1.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch1.dfdl.xsd
index 7ad14671c..8f5edf967 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch1.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch1.dfdl.xsd
@@ -19,7 +19,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd" />
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd
index b8ce11dd6..6ac9d4d09 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test03sch2.dfdl.xsd
@@ -28,6 +28,6 @@
</xs:appinfo>
</xs:annotation>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
</xs:schema>
\ No newline at end of file
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test04sch2.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test04sch2.dfdl.xsd
index a0325de91..a7c40e7ee 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test04sch2.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test04sch2.dfdl.xsd
@@ -30,6 +30,6 @@
</appinfo>
</annotation>
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
</schema>
\ No newline at end of file
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test05sch6.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test05sch6.dfdl.xsd
index 8d0d11a20..a6a5b6138 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test05sch6.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/test05sch6.dfdl.xsd
@@ -23,7 +23,7 @@
xmlns:xs="http://www.w3.org/2001/XMLSchema"
elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/annotations/annotations.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/annotations/annotations.tdml
index 73e9e45b7..509bdaa89 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/annotations/annotations.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/annotations/annotations.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<defineSchema name="as1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="inElementContainerPassingAssert">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/assertions/assert.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/assertions/assert.tdml
index cc6c6f78d..22d7ef7f8 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/assertions/assert.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/assertions/assert.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="simpleAssert">
@@ -524,7 +524,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c1">
<xs:complexType>
@@ -719,7 +719,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="literalTextMatch">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xs:element name="root">
<xs:complexType>
@@ -835,7 +835,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -1125,7 +1125,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator="+"
terminator=";" leadingSkip="0" trailingSkip="0" textBidi="no"
floating="no" encoding="utf-8" byteOrder="bigEndian" alignment="1"
@@ -1252,7 +1252,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s4">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format
ref="ex:GeneralFormat"
lengthKind="delimited" />
@@ -1320,7 +1320,7 @@
<tdml:defineSchema name="assertsWithMessageExpression">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format
ref="ex:GeneralFormat"
lengthKind="delimited" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd
index be58be400..b10200f0f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.tdml
index 71a00f1b4..e2d97b320 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def2">
<dfdl:format ref="tns:def3" lengthKind="explicit"
lengthUnits="characters" length="4" representation="text"
@@ -89,7 +89,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="errs">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"
@@ -116,7 +116,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="defineNotUsed">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:GeneralFormat" lengthKind="explicit"
lengthUnits="characters" length="4" representation="text"
@@ -153,7 +153,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="circularRef">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:def2" lengthKind="explicit"
lengthUnits="characters" length="4" representation="text"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat_withComment.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat_withComment.dfdl.xsd
index daea29e3b..2c0e13789 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat_withComment.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/defineFormat/defineFormat_withComment.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/" >
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator.tdml
index 93629b685..80365b2f9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator.tdml
@@ -29,7 +29,7 @@
defaultValidation="on">
<tdml:defineSchema name="discrimAssertPlacement">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="root-discrim" dfdl:lengthKind="implicit" >
@@ -117,7 +117,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="s0">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:simpleType name="simpleAssert">
@@ -298,7 +298,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c1">
<xs:complexType>
@@ -345,7 +345,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c1">
<xs:complexType>
@@ -381,7 +381,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" type="xs:int" dfdl:lengthKind="delimited">
<xs:annotation>
@@ -589,7 +589,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="invalid">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" type="xs:int" dfdl:lengthKind="delimited">
<xs:annotation>
@@ -612,7 +612,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="discrimExpression">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1" type="xs:int" dfdl:lengthKind="delimited">
<xs:annotation>
@@ -703,7 +703,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c1">
<xs:complexType>
@@ -761,7 +761,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice4">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c1">
<xs:complexType>
@@ -866,7 +866,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="discrimWithVariable">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="var"/>
@@ -938,7 +938,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="iSetNotFound" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e1">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator2.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator2.tdml
index edec8d4e5..7c41bf8c3 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator2.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/discriminator2.tdml
@@ -27,7 +27,7 @@
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format
ref="tns:GeneralFormat"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml
index f7c9d0af4..d139dee10 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/multipleDiscriminators.tdml
@@ -24,7 +24,7 @@
<tdml:defineSchema name="multipleDiscriminators">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/nestedChoiceDiscriminator.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/nestedChoiceDiscriminator.tdml
index 0f71f3360..32732de5b 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/nestedChoiceDiscriminator.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/discriminators/nestedChoiceDiscriminator.tdml
@@ -28,7 +28,7 @@
defaultValidation="on">
<tdml:defineSchema name="s0" elementFormDefault="unqualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"/>
<!-- <![CDATA[
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScenarios.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScenarios.tdml
index 811b859b1..68b5d6ef9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScenarios.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScenarios.tdml
@@ -25,7 +25,7 @@
defaultRoundTrip="true">
<defineSchema name="es1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"
occursCountKind="implicit"/>
@@ -66,7 +66,7 @@
</defineSchema>
<defineSchema name="es1-2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" documentFinalTerminatorCanBeMissing="no"/>
<dfdl:defineEscapeScheme name="scenario1">
@@ -319,7 +319,7 @@
</parserTestCase>
<defineSchema name="es2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="scenario2">
@@ -368,7 +368,7 @@
</defineSchema>
<defineSchema name="es2-2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" documentFinalTerminatorCanBeMissing="no"/>
<dfdl:defineEscapeScheme name="scenario2">
@@ -417,7 +417,7 @@
</parserTestCase>
<defineSchema name="es3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="scenario3">
@@ -448,7 +448,7 @@
</parserTestCase>
<defineSchema name="es4-2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" documentFinalTerminatorCanBeMissing="no"/>
<dfdl:defineEscapeScheme name="scenario4">
@@ -468,7 +468,7 @@
</defineSchema>
<defineSchema name="es5">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="es">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScheme.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScheme.tdml
index 5294330d1..1b560c20c 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScheme.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeScheme.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<defineSchema name="es1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="pound">
@@ -57,19 +57,19 @@
</defineSchema>
<defineSchema name="es2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<xs:element name="elem" dfdl:defineEscapeScheme=""/>
</defineSchema>
<defineSchema name="es4">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<xs:element name="elem"/>
</defineSchema>
<defineSchema name="es5">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme>
<dfdl:escapeScheme escapeCharacter='#'
@@ -79,7 +79,7 @@
</defineSchema>
<defineSchema name="es6">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="pound">
@@ -114,7 +114,7 @@
</defineSchema>
<defineSchema name="emptyRef">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="table1">
@@ -129,7 +129,7 @@
</defineSchema>
<defineSchema name="unusedRef">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="table1">
@@ -143,7 +143,7 @@
</defineSchema>
<defineSchema name="nonUnique">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="escapeScheme">
<dfdl:escapeScheme escapeCharacter='#'
@@ -285,7 +285,7 @@
</parserTestCase>
<defineSchema name="escapeSchemeExpressions">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" separatorPosition="infix" lengthKind="delimited"
occursCountKind='parsed'/>
@@ -539,7 +539,7 @@
Purpose: This test demonstrates that escapeSheme with escapeBlock where the escapeBlockStart, escapeBlockEnd and escapeEscapeCharacter characters are the same, all quotes (DAFFODIL-1923).
-->
<defineSchema name="eBlkAllQuotes">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="eBlkAllQuotes">
@@ -581,7 +581,7 @@
Purpose: This test demonstrates that escapeSheme with escapeBlock where the escapeBlockEnd and escapeEscapeCharacter characters are the same (closing paren) but differnet from escapeBlockStart (DAFFODIL-1923).
-->
<defineSchema name="eBlkEndSame">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="eBlkEndParen">
@@ -623,7 +623,7 @@
Purpose: This test demonstrates that escapeSheme with escapeBlock where the escapeBlockEnd is the same as 2 escapeEscapeCharacters (DAFFODIL-1923).
-->
<defineSchema name="eBlkMultipleEEC">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="eBlkMultipleEEC">
@@ -659,7 +659,7 @@
</parserTestCase>
<defineSchema name="es7">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineEscapeScheme name="pound">
<!-- comment should be ignored -->
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeNeg.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeNeg.tdml
index b1e879685..7d80f55b6 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeNeg.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeNeg.tdml
@@ -23,7 +23,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="es1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited" />
<dfdl:defineEscapeScheme name="pound"/>
<xs:element name="elem" type="xs:int"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeUnparse.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeUnparse.tdml
index 89eb447c3..53e797d01 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeUnparse.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/escapeScheme/escapeSchemeUnparse.tdml
@@ -22,7 +22,7 @@
suiteName="escapeSchemeUnparse">
<tdml:defineSchema name="delimitedStringsEscapeScheme">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
<dfdl:defineEscapeScheme name="pound">
<dfdl:escapeScheme escapeCharacter='#'
@@ -400,7 +400,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="foo">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
<dfdl:defineEscapeScheme name='quoteSlash'>
<dfdl:escapeScheme escapeBlockStart='"'
@@ -604,7 +604,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="runtimeDelimiterEscapeConflict">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="ascii" lengthUnits="bytes" outputNewLine="%CR;%LF;"/>
<dfdl:defineEscapeScheme name="pound2">
<dfdl:escapeScheme escapeCharacter='#'
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
index 010ce8573..297318682 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.dfdl.xsd
@@ -20,7 +20,7 @@
xmlns:tns="http://example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.tdml
index 1996a6769..d5f91cbae 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/external_variables/external_variables.tdml
@@ -32,7 +32,7 @@
defaultValue="42" external="true" />
<dfdl:defineVariable name="myVar1" type="xs:int"
defaultValue="6" external="true" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="accessPreDefs">
@@ -109,7 +109,7 @@
defaultValue="42" external="true" />
<dfdl:defineVariable name="myVar1" type="xs:int"
defaultValue="6" external="true" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
@@ -204,7 +204,7 @@
defaultValue="42" external="true" />
<dfdl:defineVariable name="myVar1" type="xs:int"
defaultValue="6" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
@@ -255,7 +255,7 @@
defaultValue="42" external="true" />
<dfdl:defineVariable name="myVar1" type="xs:int"
defaultValue="6" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
@@ -291,7 +291,7 @@
external="true">73</dfdl:defineVariable>
<dfdl:defineVariable name="v_with_global_default"
type="xsd:int" defaultValue="15" external="true" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
@@ -338,7 +338,7 @@
<tdml:defineSchema name="v5">
<dfdl:defineVariable name="v_with_default" type="xsd:int"
defaultValue="1" external="true" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
index 25f973120..4ff560d87 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/PropertySyntax.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="PropertySyntax">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
@@ -281,7 +281,7 @@
<tdml:defineSchema name="PropertySyntaxInvalid">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax.dfdl.xsd
index 6a6bdf6ae..6cb7d84dd 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/property_syntax/property_syntax.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
index fe489a806..2924c8bb6 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/setVarWIthValueLength.tdml
@@ -30,7 +30,7 @@
xmlns="http://www.w3.org/2001/XMLSchema">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="f:GeneralFormat"
representation="binary"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml
index cbdfcde97..88b784f51 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables.tdml
@@ -41,7 +41,7 @@
defaultValue="{ $ex:myVar4 }" />
<dfdl:defineVariable name="nonConstVar2" type="xs:int"
defaultValue="{ $ex:nonConstVar }" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="c">
<xs:complexType>
@@ -1319,7 +1319,7 @@
defaultValue="42" />
<dfdl:defineVariable name="myVar1" type="xs:int" />
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="r1">
@@ -1440,7 +1440,7 @@
<tdml:defineSchema name="absolutePath" elementFormDefault="qualified">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"/>
<xs:element name="elem">
@@ -1661,7 +1661,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choiceInSequenceWithSeparators">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xs:element name="ch1">
@@ -1677,7 +1677,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="separatorAsVar">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<dfdl:defineVariable name="v3_with_default" type="xs:string"
@@ -1719,7 +1719,7 @@
defaultValue="" />
<dfdl:defineVariable name="v_empty_default2" type="xs:string" >{ "" }</dfdl:defineVariable>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="r1">
@@ -1786,7 +1786,7 @@
<dfdl:defineVariable name="v_empty_default_invalid" type="xs:string"
defaultValue="">{ "" }</dfdl:defineVariable>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="r2" type="xs:string" dfdl:inputValueCalc="{ $ex:v_empty_default_invalid }" dfdl:lengthKind="delimited" />
@@ -1810,7 +1810,7 @@
<tdml:defineSchema name="variable_path">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="var" defaultValue="e1" />
@@ -1865,7 +1865,7 @@
<tdml:defineSchema name="logical_default_values">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="float" type="xs:float" defaultValue="-INF" />
@@ -1907,7 +1907,7 @@
<tdml:defineSchema name="logical_default_values_err">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="float" type="xs:float" defaultValue="float" />
@@ -1926,7 +1926,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="choice_branch_variables">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="var1" type="xs:string" defaultValue="false" />
@@ -2006,7 +2006,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="variables_nilled_element">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
nilKind="literalValue" nilValue="%ES;" useNilForDefault="no" nilValueDelimiterPolicy="none" />
@@ -2047,7 +2047,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="newVariableInstance_choiceDispatchKey">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="GeneralFormat" />
<dfdl:defineVariable name="type" type="xs:int" />
@@ -2118,7 +2118,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="circular_defineVariable">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="circular1" type="xs:int"
@@ -2139,7 +2139,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="defineVariable_ref_infoset">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="badRef" type="xs:int"
@@ -2157,7 +2157,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="defineVariable_ref_noDefault">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="noDefault" type="xs:int" />
@@ -2177,7 +2177,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="defineVariable_nonConstantExpression_setVar">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<dfdl:defineVariable name="var1" type="xs:int"
@@ -2221,7 +2221,7 @@
<tdml:defineSchema name="variable_direction_schema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
representation="binary"/>
@@ -2309,7 +2309,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="variable_direction_simple">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
representation="text" textNumberRep="standard" alignment="8" alignmentUnits="bits"
lengthUnits="bytes" lengthKind="delimited" />
@@ -2496,7 +2496,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="variable_suspension_scope">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
representation="text" lengthKind="delimited"/>
@@ -2592,7 +2592,7 @@
<tdml:defineSchema name="escapeCharVars">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:defineVariable defaultValue="\" name="EscapeChar" type="xs:string"/>
@@ -2664,7 +2664,7 @@
<tdml:defineSchema name="multipleVarReadInPoU">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:defineVariable defaultValue="x" name="var1" type="xs:string"/>
@@ -2710,7 +2710,7 @@
<tdml:defineSchema name="nviInGroupDecl">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:defineVariable defaultValue="x" name="var1" type="xs:string"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables_01.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables_01.dfdl.xsd
index 6d7dbeaf7..5a110d863 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables_01.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section07/variables/variables_01.dfdl.xsd
@@ -25,7 +25,7 @@
xmlns:tns="http://example.com"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:annotation>
<xsd:appinfo source="http://www.ogf.org/dfdl/">
@@ -35,7 +35,7 @@
</xsd:appinfo>
</xsd:annotation>
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xsd:annotation>
<xsd:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml
index 288e69bbd..44c564abf 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping.tdml
@@ -23,7 +23,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="defineFormat-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="format_01">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
@@ -90,7 +90,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="defineFormat_01-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="characters" encoding="UTF-8" separator="" initiator=""
terminator="" separatorSuppressionPolicy="anyEmpty" occursCountKind="parsed"
@@ -198,7 +198,7 @@
<tdml:defineSchema name="dfdl_subset-Embedded">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
@@ -249,7 +249,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="defineFormat-Nested.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="format_a">
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit"
lengthUnits="bytes" encoding="ascii" terminator=";" length="3"
@@ -297,7 +297,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="multipleDef">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" lengthUnits="characters" length="4"/>
</dfdl:defineFormat>
@@ -330,7 +330,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="multipleDef2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" lengthUnits="characters" length="4"/>
</dfdl:defineFormat>
@@ -361,7 +361,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="multipleDef3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" separator=","/>
</dfdl:defineFormat>
@@ -396,7 +396,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="localAnnotationSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="UTF-8" separator="" initiator=""
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping_01.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping_01.tdml
index 6889291d5..9d5bf5851 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping_01.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/PropertyScoping_01.tdml
@@ -24,7 +24,7 @@
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:def1" encoding="utf-8"
lengthKind="explicit" lengthUnits="characters" length="5"
@@ -58,7 +58,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="s1-u2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:def1" encoding="ascii"
lengthKind="explicit" lengthUnits="characters" length="5"/>
@@ -88,7 +88,7 @@
<tdml:defineSchema name="s2">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def2">
<dfdl:format ref="tns:def3" lengthKind="explicit"
@@ -142,7 +142,7 @@
<tdml:defineSchema name="s3">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" initiator=""
terminator="" encoding="utf-8" binaryNumberRep="binary"
initiatedContent="no" />
@@ -195,7 +195,7 @@
<tdml:defineSchema name="PropScoping-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="text"
occursCountKind="parsed" lengthUnits="bytes" encoding="US-ASCII"
initiator="" terminator="" separator="" ignoreCase="no" />
@@ -230,7 +230,7 @@
<tdml:defineSchema name="dfdlRefNotFound">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="def">
<dfdl:format ref="tns:noWayMan" encoding="utf-8"
lengthKind="explicit" lengthUnits="characters" length="5"
@@ -261,7 +261,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="formatRefLongVsShortForm">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="aFormat">
<dfdl:format ref="tns:GeneralFormat" representation="text"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm.dfdl.xsd
index ba9252ace..c593c94c9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_02.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_02.dfdl.xsd
index 5f4d0ab54..84da6f150 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_02.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_02.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_03.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_03.dfdl.xsd
index 857d6aa8f..c12abd3f6 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_03.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_03.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_04.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_04.dfdl.xsd
index acb7df911..e81fa4db5 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_04.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section08/property_scoping/defaultForm_04.dfdl.xsd
@@ -18,7 +18,7 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ex="http://www.example.com" xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml
index 05913897b..b3b50f6dc 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/RepProps.tdml
@@ -244,7 +244,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="noBinaryNumberRep">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format lengthKind="implicit" leadingSkip="0" sequenceKind="ordered" representation="text"
trailingSkip="0" encoding="US-ASCII" alignment="1" alignmentUnits="bytes" initiator=""
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml
index f44cadb3d..ec02ea874 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section10/representation_properties/encodings.tdml
@@ -29,7 +29,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="enc1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" lengthKind="delimited"/>
@@ -268,7 +268,7 @@
elementFormDefault="unqualified"
useDefaultNamespace="false">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"
lengthKind="explicit"
@@ -318,7 +318,7 @@
elementFormDefault="unqualified"
useDefaultNamespace="false">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"
lengthKind="explicit"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
index 2dd6b24a3..20f7cb22e 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section11/content_framing_properties/ContentFramingProps.tdml
@@ -25,7 +25,7 @@
<tdml:defineSchema name="ContentFramingProperties-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="characters" encoding="UTF-8" />
@@ -261,7 +261,7 @@
<tdml:defineSchema name="packed7BitASCII">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-US-ASCII-7-BIT-PACKED"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian" />
@@ -804,7 +804,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="iso-8859-1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text" encoding="iso-8859-1"
separator="/" byteOrder="bigEndian" ignoreCase="no" textNumberRep="standard"
initiator="" initiatedContent="no" terminator="" />
@@ -958,7 +958,7 @@
<tdml:defineSchema name="mixedEncoding">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-US-ASCII-7-BIT-PACKED"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian"
lengthKind="implicit" alignmentUnits="bits" alignment="1" />
@@ -1086,7 +1086,7 @@
<tdml:defineSchema name="packed6BitASCII">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-US-ASCII-6-BIT-PACKED" alignmentUnits="bits"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian" />
@@ -1302,7 +1302,7 @@
<tdml:defineSchema name="packed5Bit">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-5-BIT-PACKED-LSBF"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian" />
@@ -1527,7 +1527,7 @@
<tdml:defineSchema name="octalLSBF">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-OCTAL-LSBF"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian" />
@@ -1654,7 +1654,7 @@
<tdml:defineSchema name="hexLSBF">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="X-DFDL-HEX-LSBF"
lengthUnits="characters" bitOrder="leastSignificantBitFirst" byteOrder="littleEndian" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
index 4080a575e..b5e1a053f 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/Aligned_Data.tdml
@@ -24,7 +24,7 @@
<tdml:defineSchema name="s1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="e" type="xs:string" dfdl:lengthKind="delimited"
@@ -56,7 +56,7 @@
<tdml:defineSchema name="alignmentSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary" encoding="utf-8" alignmentUnits="bits" alignment="4" leadingSkip="0"
occursCountKind='parsed'/>
@@ -492,7 +492,7 @@
<tdml:defineSchema name="implicitAlignmentSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="binary" encoding="ascii"
lengthUnits="bits" alignmentUnits="bits" binaryNumberRep="binary" textNumberPattern="###0.###;-###0.###"/>
@@ -575,7 +575,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="alignmentBitOrder">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" textNumberPattern="###0.###;-###0.###" lengthUnits='bits' representation='binary'
binaryNumberRep='binary' alignmentUnits='bits' lengthKind='explicit'
byteOrder="littleEndian"/>
@@ -3850,7 +3850,7 @@
</tdml:unparserTestCase>
<tdml:defineSchema name="separatorMTA">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat"
lengthUnits="bits"
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/BinaryInput_01.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/BinaryInput_01.tdml
index 4cb85212d..8ef390a8a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/BinaryInput_01.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/aligned_data/BinaryInput_01.tdml
@@ -23,7 +23,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-leading-skip-bytes.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="Outer" dfdl:leadingSkip="0"
dfdl:alignment="implicit" dfdl:alignmentUnits="bytes"
@@ -51,7 +51,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-leading-skip-bits.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bits" byteOrder="bigEndian"
alignment="1" alignmentUnits="bits" lengthKind="implicit" />
@@ -123,7 +123,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-trailing-skip-bytes.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bytes" byteOrder="bigEndian"
alignment="1" alignmentUnits="bytes" lengthKind="implicit" />
@@ -139,7 +139,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-trailing-skip-bits.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bits" byteOrder="bigEndian"
alignment="1" alignmentUnits="bits" lengthKind="implicit" />
@@ -211,7 +211,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-aligning-skip-bytes.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bytes" byteOrder="bigEndian"
alignment="8" alignmentUnits="bytes" lengthKind="implicit" />
@@ -229,7 +229,7 @@
<tdml:defineSchema
name="alignmentBytes">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bytes" byteOrder="bigEndian"
alignment="4" alignmentUnits="bytes" lengthKind="implicit" />
@@ -249,7 +249,7 @@
<tdml:defineSchema
name="DFDL-362-skip-alignments-aligning-skip-bits.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bits" byteOrder="bigEndian"
alignment="8" alignmentUnits="bits" lengthKind="implicit" />
@@ -267,7 +267,7 @@
<tdml:defineSchema
name="alignmentBits">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat" representation="binary"
binaryNumberRep="binary" lengthUnits="bits" byteOrder="bigEndian"
alignment="16" alignmentUnits="bits" lengthKind="implicit" />
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterProperties.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterProperties.tdml
index b30e9e201..1a6c94fba 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterProperties.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterProperties.tdml
@@ -24,7 +24,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="DelimiterProperties-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" leadingSkip="0" trailingSkip="0" separator=""
encoding="utf-8" occursCountKind="parsed" separatorSuppressionPolicy="anyEmpty"
@@ -183,7 +183,7 @@
</tdml:defineSchema>
<tdml:defineSchema name="DelimiterProperties-Embedded2.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="explicit" />
<xs:element dfdl:lengthKind="implicit" name="e1">
@@ -461,7 +461,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="basic">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format separatorSuppressionPolicy="never"
separatorPosition="infix" ref="ex:GeneralFormat" />
@@ -526,7 +526,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="initiatedContentSchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator="" terminator="" leadingSkip="0"
alignment="1" alignmentUnits="bytes" trailingSkip="0"
separator="" encoding="utf-8" occursCountKind="parsed"
@@ -618,7 +618,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="initiatedContentSimple1">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="utf-8"
representation="text" lengthUnits="characters" lengthKind="delimited" />
@@ -652,7 +652,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="AssertsOnSimpleTypes">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xs:element name="EI">
@@ -691,7 +691,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="ReqFieldMissingAndSepIsPrefixOfTerminator">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited" />
<xs:element name="E1" dfdl:terminator="$$">
@@ -756,7 +756,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="Lesson4_initiators_terminators">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" representation="text"
lengthKind="delimited"
encoding="ASCII" />
@@ -797,7 +797,7 @@
<tdml:defineSchema name="ignoreCase">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format separatorPosition="infix" ref="ex:GeneralFormat" ignoreCase="yes" />
@@ -909,7 +909,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="emptyInitiator">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" />
<xs:element name="zeroLengthString">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterPropertiesUnparse.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterPropertiesUnparse.tdml
index 03b986d83..f5b06f618 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterPropertiesUnparse.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/DelimiterPropertiesUnparse.tdml
@@ -23,7 +23,7 @@
xmlns:ex="http://example.com">
<tdml:defineSchema name="delimitedStrings">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
lengthUnits="bytes" outputNewLine="%CR;%LF;" initiatedContent="no" lengthKind="delimited"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testDFACreation.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testDFACreation.dfdl.xsd
index b4e948f0a..2dd92f473 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testDFACreation.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testDFACreation.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd
index 8e81059af..f9e27cde9 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/delimiter_properties/testOptionalInfix.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xs="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AB.dfdl.xsd b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AB.dfdl.xsd
index dfcac6667..7e71fe167 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AB.dfdl.xsd
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AB.dfdl.xsd
@@ -21,7 +21,7 @@
xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<annotation>
<appinfo source="http://www.ogf.org/dfdl/">
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
index 204dddcfa..0995e977a 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AI.tdml
@@ -23,7 +23,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="AI.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" encoding="ascii"
truncateSpecifiedLengthString="no"/>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
index ef3c6f3bb..4466d5590 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/AN.tdml
@@ -27,7 +27,7 @@
defaultRoundTrip="true">
<tdml:defineSchema name="AN-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:defineFormat name="explicit_defaults">
<dfdl:format ref="ex:GeneralFormat" />
</dfdl:defineFormat>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/DelimitedTests.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/DelimitedTests.tdml
index a7883ea44..c2f55a0d0 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/DelimitedTests.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section12/lengthKind/DelimitedTests.tdml
@@ -26,7 +26,7 @@
<tdml:defineSchema name="lengthKindDelimited-Embedded.dfdl.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="ascii" separator="" initiator=""
terminator="" occursCountKind="implicit" ignoreCase="no"
@@ -926,7 +926,7 @@
<tdml:defineSchema name="refInitiator.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
@@ -995,7 +995,7 @@
<tdml:defineSchema name="refInitiator2.xsd">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="text"
@@ -1072,7 +1072,7 @@
</tdml:parserTestCase>
<tdml:defineSchema name="wspstar_nl">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" lengthKind="delimited"
lengthUnits="bytes" encoding="ascii" separator="" initiator=""
terminator="" occursCountKind="parsed" ignoreCase="no" textNumberRep="standard"
@@ -1097,7 +1097,7 @@
<tdml:defineSchema name="delimitedBinary">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="ex:GeneralFormat" initiator=""
terminator="" encoding="utf-8" byteOrder="bigEndian"
occursCountKind="parsed" ignoreCase="no" representation="binary"
... 3769 lines suppressed ...
[daffodil] 01/02: Make include/import logic more precise and consistent
Posted by sl...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
slawrence pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/daffodil.git
commit 41cab1aa3397595d3c419d986db18ffa453d868a
Author: Steve Lawrence <sl...@apache.org>
AuthorDate: Fri Aug 11 09:18:05 2023 -0400
Make include/import logic more precise and consistent
We currently resolve include/import schema locations in two different
places, one in the DaffodilCatalogResolver and the other in dsom IIBase.
The logic is not obviously the same, so this adds a new XMLUtils
function specifically for resolving a schemaLocation attribute. The more
complex cases like catalog managers are not implemented here and are
still done in the different classes, but this at least consolidates the
search when catalog manager fails (which is the common case).
This also slightly tweaks the schemaLocation logic to the following
- If a schemaLocation is an absolute URI (i.e. has a scheme) we just
look it up directly
- If a schemaLocation is not absolute and the path starts with a /, then
we first look for it on the classpath. If not found we look for the
absolute path on the file system
- If a schemaLocation is not absolute and the path does not start with a
/, then we resolve the path relative to the importing file. If not
found, we look for the relative path on the classpath absolutely, but
with a deprecation warning.
Note that this deprecates looking up relative include imports on the
classpath. A schemaLocation that is expected to be in different jar on
the classpath should be an absolute path. This removes any ambiguity
about if a file should be resolved relative to the importing schema or
on the classpath. Eventually we should remove the deprecated capability
completely, but most schemas currently depend on this behavior. For
example, many schemas have something like the following:
<import schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
But this really should be an absolute path, like so:
<import schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
This also modifies the CLI to have similar logic, where we warn if a
schema path is provided absolutely.
Deprecation/Compatibility:
Resolving relative import/include schemaLocation paths absolutely is now
deprecated and will output a warning, and support may eventually be
removed. For example, a common import is:
<import schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
Although this path is relative, previous versions of Daffodil allowed
this to be found on the classpath absolutely, as if it started with a
slash. This behavior is deprecated. If a schemaLocation is expected to
be found on the classpath and not relative to the importing file, then
it should start with a slash, for example:
<import schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
Daffodil still supports the old behavior and will look up relative
schemaLocatin paths absolutely, but will output a schema definition
warning. Future versions of Daffodil may change this to an error.
Deprecation/Compatability:
Support for importing "edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd" has been removed.
Schemas should instead import "/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" and change
dfdl:format to reference "GeneralFormat"
DAFFODIL-2828
---
.../main/scala/org/apache/daffodil/cli/Main.scala | 53 +++++++--
.../daffodil/cli/cliTest/TestCLIParsing.scala | 51 ++++++++-
.../org/apache/daffodil/core/dsom/IIBase.scala | 61 ++--------
.../ncsa/daffodil/xsd/built-in-formats.xsd | 85 --------------
.../daffodil/lib/xml/DaffodilXMLLoader.scala | 54 ++++-----
.../org/apache/daffodil/lib/xml/XMLUtils.scala | 125 +++++++++++++++++++++
.../resources/org/apache/daffodil/xsd/dafext.xsd | 1 +
.../daffodil/processor/tdml/TestDaffodilC.scala | 9 +-
.../daffodil/processor/tdml/TestTDMLRunner.scala | 2 +-
.../section06/namespaces/includeImport.tdml | 19 ++++
.../section06/namespaces/TestNamespaces.scala | 4 +
11 files changed, 285 insertions(+), 179 deletions(-)
diff --git a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
index fa8ca15be..80409ac30 100644
--- a/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
+++ b/daffodil-cli/src/main/scala/org/apache/daffodil/cli/Main.scala
@@ -63,6 +63,7 @@ import org.apache.daffodil.lib.util.Timer
import org.apache.daffodil.lib.validation.Validators
import org.apache.daffodil.lib.xml.QName
import org.apache.daffodil.lib.xml.RefQName
+import org.apache.daffodil.lib.xml.XMLUtils
import org.apache.daffodil.runtime1.api.DFDL
import org.apache.daffodil.runtime1.debugger.DebuggerExitException
import org.apache.daffodil.runtime1.debugger.InteractiveDebugger
@@ -226,14 +227,52 @@ class CLIConf(arguments: Array[String], stdout: PrintStream, stderr: PrintStream
implicit def rootNSConverter = org.rogach.scallop.singleArgConverter[RefQName](qnameConvert _)
implicit def fileResourceURIConverter = singleArgConverter[URI]((s: String) => {
- val file = new File(s)
- val uri =
- if (file.isFile()) {
- Some(file.toURI)
- } else {
- Misc.getResourceRelativeOption(s, None)
+ val optResolved =
+ try {
+ val uri =
+ if (File.separatorChar == '/' || s.startsWith("/")) {
+ // This is either a non-Windows system or a resource on the classpath. Either way we
+ // assume it is a valid URI except for things like spaces, which this URI
+ // constructor converts. We do not specify a schema since this might be a relative
+ // path
+ new URI(null, s, null)
+ } else {
+ // This is a Windows system, which has complex path resolution and paths that are
+ // not valid URIs. Try to convert it to a relative URI where possible, otherwise we
+ // settle for an absolute URI
+ val p = Paths.get(s)
+ if (p.isAbsolute() || s.startsWith("\\")) {
+ // if the Windows path is absolute (i.e. starts with a drive letter and colon) or
+ // starts with a backslash (which resolves relative to the current drive instead
+ // of the current working directory), then there is no valid relative URI
+ // representation, so we just convert it to an absolute URI
+ p.toUri
+ } else {
+ // this Windows path is relative to the current working directory. We can convert
+ // it to a relative URI by just switching all the path separators. We do not
+ // specify a schema since this is a relative path
+ new URI(null, s.replace('\\', '/'), null)
+ }
+ }
+ // At this point we have a valid URI, which could be absolute or relative, with relative
+ // URIs resolved from the current working directory. We can convert this to a string and
+ // pass it to resolveSchemaLocation to find the actual file or resource
+ val cwd = Paths.get("").toUri
+ XMLUtils.resolveSchemaLocation(uri.toString, Some(cwd))
+ } catch {
+ case _: Exception => throw new Exception(s"Could not find file or resource $s")
+ }
+ optResolved match {
+ case Some((uri, relToAbs)) => {
+ if (relToAbs) {
+ Logger.log.warn(s"Found relative path on classpath absolutely, did you mean /$s")
+ }
+ uri
}
- uri.getOrElse(throw new Exception("Could not find file or resource %s".format(s)))
+ case None => {
+ throw new Exception(s"Could not find file or resource $s")
+ }
+ }
})
printedName = "Apache Daffodil"
diff --git a/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala b/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
index e6693b5ac..3c3dbb3ac 100644
--- a/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
+++ b/daffodil-cli/src/test/scala/org/apache/daffodil/cli/cliTest/TestCLIParsing.scala
@@ -630,9 +630,53 @@ class TestCLIParsing {
}
@Test def test_DFDL_1203_schema_from_jar(): Unit = {
+ // This test makes sure a schema can be compiled from a jar on the classpath--the schema
+ // val should not use the path() function, and the value should be an absolute resource
+ // path. Note that this requires the daffodil-cli src/test/resources directory to be on the
+ // classpath. If this test changes so that runCLI forks, that might not be the case and this
+ // test might fail
+ val schema = "/org/apache/daffodil/cli/global_element.dfdl.xsd"
+
+ val input = path(
+ "daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/test_DFDL-714.txt",
+ )
+
+ runCLI(args"parse -s $schema $input") { cli =>
+ cli.expect("<tns:elem xmlns:tns=\"http://baseSchema.com\">")
+ cli.expect("<content")
+ cli.expect("Hello World")
+ cli.expect("</tns:elem>")
+ }(ExitCode.Success)
+ }
+
+ @Test def test_DFDL_1203_schema_from_jar_relative(): Unit = {
+ // This is the same as test_DFDL_1203_schema_from_jar, but its schema is relative. This
+ // behavior is deprecated and should lead to a CLI warning. Future versions of Daffodil may
+ // disallow this and it may become a CLI error
+ val schema = "org/apache/daffodil/cli/global_element.dfdl.xsd"
+
+ val input = path(
+ "daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/test_DFDL-714.txt",
+ )
+
+ runCLI(args"parse -s $schema $input") { cli =>
+ cli.expect("<tns:elem xmlns:tns=\"http://baseSchema.com\">")
+ cli.expect("<content")
+ cli.expect("Hello World")
+ cli.expect("</tns:elem>")
+ cli.expectErr("Found relative path on classpath absolutely")
+ cli.expectErr("/org/apache/daffodil/cli/global_element.dfdl.xsd")
+ }(ExitCode.Success)
+ }
+
+ @Test def test_DFDL_1203_schema_from_absolute_path(): Unit = {
+ // This test makes sure a schema can be compiled from an absolute path on the filesystem.
+ // Note that this will result in the CLI seeing OS-dependent path separators, and on Windows
+ // will have a drive letter and colon prefixed
val schema = path(
"daffodil-cli/src/test/resources/org/apache/daffodil/cli/global_element.dfdl.xsd",
- )
+ ).toAbsolutePath
+
val input = path(
"daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/test_DFDL-714.txt",
)
@@ -672,10 +716,9 @@ class TestCLIParsing {
val input = path("daffodil-cli/src/test/resources/org/apache/daffodil/cli/input/input6.txt")
runCLI(args"parse -s $schema -r e $input") { cli =>
- cli.expectErr("Schema Definition Warning")
+ cli.expectErr("Schema Definition Error")
cli.expectErr("edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd")
- cli.expectErr("org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd")
- }(ExitCode.Success)
+ }(ExitCode.UnableToCreateProcessor)
}
@Test def test_CLI_Parsing_JavaDefaults(): Unit = {
diff --git a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/IIBase.scala b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/IIBase.scala
index 441f3761b..8fe32ecf6 100644
--- a/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/IIBase.scala
+++ b/daffodil-core/src/main/scala/org/apache/daffodil/core/dsom/IIBase.scala
@@ -17,10 +17,8 @@
package org.apache.daffodil.core.dsom
-import java.io.File
import java.net.URI
import java.net.URISyntaxException
-import java.net.URLEncoder
import scala.collection.immutable.ListMap
import scala.xml.Node
@@ -31,6 +29,7 @@ import org.apache.daffodil.lib.api.WarnID
import org.apache.daffodil.lib.util.Delay
import org.apache.daffodil.lib.util.Misc
import org.apache.daffodil.lib.xml.NS
+import org.apache.daffodil.lib.xml.XMLUtils
/**
* This file along with DFDLSchemaFile are the implementation of import and include
@@ -179,16 +178,7 @@ abstract class IIBase(
res
}.value
- final lazy val schemaLocationProperty = {
- val prop = getAttributeOption("schemaLocation")
- if (prop.isDefined && prop.get == "edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd") {
- SDW(
- WarnID.DeprecatedBuiltInFormats,
- "schemaLocation property uses deprecated include/import of edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd. Use org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd instead and change the dfdl:format ref to \"GeneralFormat\".",
- )
- }
- prop
- }
+ final lazy val schemaLocationProperty = getAttributeOption("schemaLocation")
protected final def isValidURI(uri: String): Boolean = {
try { new URI(uri) }
@@ -205,44 +195,17 @@ abstract class IIBase(
protected final lazy val resolvedSchemaLocation: Option[DaffodilSchemaSource] =
LV('resolvedSchemaLocation) {
val res = schemaLocationProperty.flatMap { slText =>
- // We need to determine if the URI is valid, if it's not we should attempt to encode it
- // to make it valid (takes care of spaces in directories). If it fails after this, oh well!
- val encodedSLText = if (!isValidURI(slText)) {
- val file = new File(slText)
- if (file.exists()) file.toURI().toString() else URLEncoder.encode(slText, "UTF-8")
- } else slText
-
- val uri: URI = URI.create(encodedSLText)
- val enclosingSchemaURI: Option[URI] =
- if (Misc.isFileURI(uri)) None else schemaFile.map { _.schemaSource.uriForLoading }
-
- val completeURI = enclosingSchemaURI.map { _.resolve(uri) }.getOrElse(uri)
- val protocol = {
- if (completeURI.isAbsolute) {
- val completeURL = completeURI.toURL
- completeURL.getProtocol()
- } else {
- ""
- }
+ val enclosingSchemaURI = schemaFile.map { _.schemaSource.uriForLoading }
+ val optURI = XMLUtils.resolveSchemaLocation(slText, enclosingSchemaURI)
+ val optSource = optURI.map { case (uri, relToAbs) =>
+ schemaDefinitionWarningWhen(
+ WarnID.DeprecatedRelativeSchemaLocation,
+ relToAbs,
+ s"Resolving relative schemaLocations absolutely is deprecated. Did you mean /$slText",
+ )
+ URISchemaSource(uri)
}
- //
- // Note that Looking in the current working directory (CWD)
- // would be a security risk/issue. So if a user wants the CWD
- // they should add "." to their classpath to get it to be
- // searched.
- //
- val resolved =
- if (protocol == "file" && (new File(completeURI)).exists)
- Some(URISchemaSource(completeURI))
- else if (protocol == "jar")
- Some(
- URISchemaSource(completeURI),
- ) // jars are pre-resolved - we got the jar URI from the resolver
- else {
- val res = Misc.getResourceRelativeOption(encodedSLText, enclosingSchemaURI)
- res.map { URISchemaSource(_) }
- }
- resolved
+ optSource
}
res
}.value
diff --git a/daffodil-lib/src/main/resources/edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd b/daffodil-lib/src/main/resources/edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd
deleted file mode 100644
index c9ceb8b86..000000000
--- a/daffodil-lib/src/main/resources/edu/illinois/ncsa/daffodil/xsd/built-in-formats.xsd
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<xs:schema xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
- xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <!-- Intended for inclusion into other schemas. Has no targetNamespace on
- purpose -->
- <xs:annotation>
- <xs:appinfo source="http://www.ogf.org/dfdl/">
-
- <!-- Don't add new properties here. Add them to daffodilNewProperties1 -->
-
- <!-- Note: The definition of daffodilTest1 in scala code had diverged
- from what was in this file. The one embedded in scala code has been removed.
- It now reads this one to get the definition. -->
-
- <dfdl:defineFormat name="daffodilTest1">
- <dfdl:format ref="daffodilNewProperties1" alignment="1"
- alignmentUnits="bytes" binaryFloatRep="ieee" binaryNumberRep="binary"
- byteOrder="bigEndian"
- calendarPatternKind="implicit"
- documentFinalTerminatorCanBeMissing="no" emptyValueDelimiterPolicy="both"
- encoding="US-ASCII" escapeSchemeRef="" ignoreCase="no"
- initiatedContent="no" initiator="" leadingSkip="0" lengthKind="implicit"
- lengthUnits="bytes" occursCountKind="parsed" representation="text"
- separator="" separatorPosition="infix" separatorSuppressionPolicy="anyEmpty"
- sequenceKind="ordered" terminator="" textNumberCheckPolicy="lax"
- textNumberRep="standard" textStandardBase="10"
- textStringJustification="left" textTrimKind="none" trailingSkip="0"
- utf16Width="fixed" textStandardDecimalSeparator="."
- textStandardGroupingSeparator="," textStandardExponentRep="E"
- textStandardZeroRep="0" textStandardInfinityRep="Inf"
- textStandardNaNRep="NaN" textNumberPattern="#,##0.###;-#,##0.###"
- textNumberRounding="explicit" textNumberRoundingMode="roundHalfEven"
- textNumberRoundingIncrement="0" decimalSigned="yes"
- />
- </dfdl:defineFormat>
-
- <!-- As we add new properties, add them here. -->
- <!-- Some tests (negative tests) expect errors depending on some of the
- properties in daffodilTest1 being missing. If those tests are made to include
- daffodilTest1 then they break because the properties are present. However,
- once a new property starts being required, the test breaks because it doesn't
- have the new property defined. Include this file and then ref daffodilNewProperties1
- gets you only the new properties without all the property settings of daffodilTest1. -->
-
- <dfdl:defineFormat name="daffodilNewProperties1">
- <dfdl:format encodingErrorPolicy="replace" sequenceKind="ordered"
- calendarPatternKind='implicit' calendarFirstDayOfWeek='Sunday'
- calendarDaysInFirstWeek='4' calendarTimeZone='UTC'
- calendarCheckPolicy='strict' calendarLanguage='en'
- bitOrder="mostSignificantBitFirst" outputNewLine="%LF;" textPadKind="none"
- fillByte="%#r20;" truncateSpecifiedLengthString="no"
- textStringPadCharacter="%SP;" textNumberPadCharacter="%SP;"
- textBooleanPadCharacter="%SP;" textCalendarPadCharacter="%SP;"
- textCalendarJustification="left"
- textNumberJustification="right"
- textOutputMinLength="0"
- floating="no"
- calendarCenturyStart="53"
- calendarObserveDST="yes"
- textBidi="no"
- />
- </dfdl:defineFormat>
-
- </xs:appinfo>
- </xs:annotation>
-
-</xs:schema>
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/DaffodilXMLLoader.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/DaffodilXMLLoader.scala
index 942d7bce2..8f33d2d41 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/DaffodilXMLLoader.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/DaffodilXMLLoader.scala
@@ -24,7 +24,6 @@ package org.apache.daffodil.lib.xml
*/
import java.io.BufferedInputStream
-import java.io.File
import java.io.InputStream
import java.io.Reader
import java.net.URI
@@ -209,17 +208,7 @@ class DFDLCatalogResolver private ()
Logger.log.debug(s"nsURI = ${nsURI}, baseURI = ${baseURIString}, systemId = ${systemId}")
val resolvedUri = delegate.resolveURI(nsURI)
- val resolvedSystem =
- if (systemId == null) null
- else {
- delegate.resolveSystem(systemId) match {
- case null => {
- val systemIdFile = new File(systemId)
- if (systemIdFile.exists) systemIdFile.toURI().toString else null
- }
- case rSys => rSys
- }
- }
+ val resolvedSystem = delegate.resolveSystem(systemId)
// An Include in a schema with a target namespace should resolve to the systemId and ignore the nsURI
// because the nsURI will resolve to the including schema file.
@@ -251,26 +240,31 @@ class DFDLCatalogResolver private ()
None
}
case (null, sysId) => {
- // We did not get a catalog resolution of the nsURI, nor
- // a straight file resolution of the systemId, so we
- // use the systemId (which comes from the schemaLocation attribute)
- // and the classpath.
- val baseURI = if (baseURIString == null) None else Some(new URI(baseURIString))
- val optURI = Misc.getResourceRelativeOption(sysId, baseURI)
+ // We did not get a catalog resolution of the nsURI. We now look for the systemID (which
+ // comes from the schemaLocation attribute) on classpath or as a file.
+ val optURI =
+ try {
+ val contextURI = Some(new URI(baseURIString))
+ val resolved = XMLUtils.resolveSchemaLocation(sysId, contextURI)
+ // we drop the boolean return part of resolveSchemaLocation because we don't care here
+ // if a relative schemaLocation was resolved absolutely. Daffodil will detect that
+ // elsewhere and output a warning.
+ resolved.map(_._1)
+ } catch {
+ case e: IllegalArgumentException =>
+ throw new SAXParseException(
+ s"Invalid or unsupported schemaLocation URI: ${e.getMessage}",
+ null,
+ )
+ }
+
optURI match {
- case Some(uri) => Logger.log.debug(s"Found on classpath: ${uri}.")
+ case Some(uri) => Logger.log.debug(s"Found schemaLocation: ${uri}.")
case None => {
- //
- // We have to explicitly throw this, because returning with
- // a no-resolve does not cause Xerces to report an error.
- // Instead you just get later errors about symbols that can't
- // be resolved, but it never mentions that an include/import didn't
- // work.
- val e = new SAXParseException(
- s"""DaffodilXMLLoader: Unable to resolve schemaLocation='$systemId'.""",
- null,
- )
- throw e
+ // We have to explicitly throw this, because returning with a no-resolve does not
+ // cause Xerces to report an error. Instead you just get later errors about symbols
+ // that can't be resolved, but it never mentions that an include/import didn't work.
+ throw new SAXParseException(s"Unable to resolve schemaLocation: $systemId", null)
}
}
optURI
diff --git a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/XMLUtils.scala b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/XMLUtils.scala
index 340455b5b..0a1d88b61 100644
--- a/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/XMLUtils.scala
+++ b/daffodil-lib/src/main/scala/org/apache/daffodil/lib/xml/XMLUtils.scala
@@ -18,6 +18,10 @@
package org.apache.daffodil.lib.xml
import java.io.File
+import java.io.IOException
+import java.net.URI
+import java.net.URISyntaxException
+import java.net.URL
import java.nio.charset.StandardCharsets
import java.nio.file.Files
import java.nio.file.Paths
@@ -1299,6 +1303,127 @@ Differences were (path, expected, actual):
}
} else maybePrefix(nsb.parent, uri)
}
+
+ /**
+ * Resolves an xs:include/xs:import schemaLocation to a URI
+ *
+ * Attempts to resolve a schemaLocation using a provided URI and contextURI, where the context
+ * is the URI of the schema importing this schemaLocation.
+ *
+ * If schemaLocation is not a valid URI, an IllegalArgumentException is thrown.
+ *
+ * If schemaLocation is not an absolute URI, then only the path component should be provided,
+ * or an IllegalArgumentException is thrown.
+ *
+ * If schemaLocation is not an absolute URI, and the path component is relative, then
+ * optContextURI must be provided or a usage exception is thrown.
+ *
+ * Returns None if this fails to resolve the schemaLocation to a URI that exists. If this
+ * successfully resolves, it returns a Some containing a tuple of the URI and a boolean that
+ * is true if a relative schemaLocation path was resolved absolutely on the classpath, and
+ * false otherwise. A boolean value of true indicates that a fallback behavior was used for
+ * backwards compatibility with older versions of Daffodil. The ability to resolve relative
+ * URIs absolutely, and the associated boolean, may be removed in the future.
+ */
+ def resolveSchemaLocation(
+ schemaLocation: String,
+ optContextURI: Option[URI],
+ ): Option[(URI, Boolean)] = {
+ val uri =
+ try {
+ new URI(schemaLocation)
+ } catch {
+ case e: URISyntaxException =>
+ throw new IllegalArgumentException(
+ "schemaLocation is not a valid URI: " + schemaLocation,
+ e,
+ )
+ }
+
+ val uriIsJustPathComponent =
+ uri.getScheme == null &&
+ uri.getAuthority == null &&
+ uri.getQuery == null &&
+ uri.getFragment == null &&
+ uri.getPath != null
+
+ val optResolved =
+ if (uri.isAbsolute) {
+ // an absolute URI is one with a scheme. In this case, we expect to be able to resolve
+ // the URI and do not try anything else (e.g. filesystem, classpath). Since this function
+ // is for schemaLocation attributes, we may eventually want to disallow this, and only
+ // allow relative URIs (i.e. URIs without a scheme). We do have some places that use
+ // absolute URIs in includes/imports and cannot remove this yet.
+ try {
+ uri.toURL.openStream.close
+ Some(uri, false)
+ } catch {
+ case e: IOException => None
+ }
+ } else if (!uriIsJustPathComponent) {
+ // this is not an absolute URI so we don't have a scheme. This should just be a path, so
+ // throw an IllegalArgumentException if that's not the case
+ val msg =
+ s"Non-absolute schemaLocation URI can only contain a path component: $schemaLocation"
+ throw new IllegalArgumentException(msg)
+ } else if (uri.getPath.startsWith("/")) {
+ // The None.orElse{ ... }.orElse { ... } pattern below is useful to evaluate each
+ // alternative way to resolve a schema location, stopping only when a Some is returned.
+ // This makes for easily adding/removing/reordering resolution approaches by changing
+ // orElse blocks
+ val optResolvedAbsolute = None
+ .orElse {
+ // Search for the schemaLocation on the classpath. The schemaLocation path is
+ // absolute so we can use it as-is so getResource does not care what package this
+ // class is in.
+ val resource = this.getClass.getResource(uri.getPath)
+ if (resource != null) Some((resource.toURI, false)) else None
+ }
+ .orElse {
+ // Search for the schemaLocation path on the file system. This path is absolute so it
+ // must exist. If it does not exist, this orElse block results in a None
+ val file = Paths.get(uri.getPath).toFile
+ if (file.exists) Some((file.toURI, false)) else None
+ }
+ optResolvedAbsolute
+ } else {
+ // the schema location is a relative path, we must have a context resolve it
+ Assert.usage(optContextURI.isDefined)
+ val contextURI = optContextURI.get
+ val optResolvedRelative = None
+ .orElse {
+ // This is a relative path, so look up the schemaLocation path relative to the
+ // context. Note that URI.resolve does not support opaque URIs, and the context
+ // parameter is often an opaque "jar" URI if the context resolved to a file inside a
+ // jar on the classpath. Instead we can use the URL constructor to resolve the
+ // relative path, which does support opaque URIs for supported schemes (jar and
+ // file). Unfortunately, the only way to test for URL existence is to open a stream
+ // to that resulting URL and see if an exception is thrown or not
+ val resolvedURL = new URL(contextURI.toURL, uri.getPath)
+ try {
+ resolvedURL.openStream.close
+ Some((resolvedURL.toURI, false))
+ } catch {
+ case e: IOException => None
+ }
+ }
+ .orElse {
+ // The user might have meant an absolute schemaLocation but left off the leading
+ // slash accidentally. Past versions of Daffodil allowed this, so we allow it too,
+ // but return a boolean if a relative path was found absolutely so callers can warn
+ // if needed. Future versions of Daffodil may want to remove this orElse block so we
+ // are strict about how absolute vs relative schemaLocations are resolved.
+ val resource = this.getClass.getResource("/" + uri.getPath)
+ if (resource != null) {
+ Some((resource.toURI, true))
+ } else {
+ None
+ }
+ }
+ optResolvedRelative
+ }
+ optResolved
+ }
}
trait GetAttributesMixin extends ThrowsSDE {
diff --git a/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd b/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
index e0d3e5f5b..3afc77cf7 100644
--- a/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
+++ b/daffodil-propgen/src/main/resources/org/apache/daffodil/xsd/dafext.xsd
@@ -695,6 +695,7 @@
<xs:enumeration value="deprecatedPropertyDFDLXError" />
<xs:enumeration value="deprecatedPropertyDFDLError" />
<xs:enumeration value="deprecatedPropertySeparatorPolicy" />
+ <xs:enumeration value="deprecatedRelativeSchemaLocation" />
<xs:enumeration value="discouragedDiscriminatorPlacement" />
<xs:enumeration value="discouragedAssertPlacement" />
<xs:enumeration value="emptyElementParsePolicyError" />
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
index 53cf17f88..192442f1f 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestDaffodilC.scala
@@ -137,7 +137,7 @@ class TestDaffodilC {
val input = new ByteArrayInputStream(b)
val pr = tdp.parse(input, b.length * 8)
assert(
- !pr.isProcessingError && pf.getDiagnostics.isEmpty,
+ !pr.isProcessingError && pr.getDiagnostics.isEmpty,
pr.getDiagnostics.map(_.getMessage()).mkString("\n"),
)
val expected = <e1><x>1280</x></e1>
@@ -175,7 +175,7 @@ class TestDaffodilC {
val output = new ByteArrayOutputStream()
val ur = tdp.unparse(infosetXML, output)
assert(
- !ur.isProcessingError && pf.getDiagnostics.isEmpty,
+ !ur.isProcessingError && ur.getDiagnostics.isEmpty,
ur.getDiagnostics.map(_.getMessage()).mkString("\n"),
)
val expected = Misc.hex2Bytes("00000500")
@@ -218,7 +218,10 @@ class TestDaffodilC {
cr match {
case Left(diagnostics) => fail(s"getProcessor failed: ${diagnostics.mkString}")
case Right((diagnostics, tdmlDFDLProcessor)) =>
- assert(diagnostics.isEmpty)
+ assert(
+ diagnostics.forall(!_.isError),
+ diagnostics.filter(_.isError).map(_.getMessage()).mkString("\n"),
+ )
assert(tdmlDFDLProcessor.isInstanceOf[DaffodilCTDMLDFDLProcessor])
}
}
diff --git a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
index c5e0eaf06..2f8d372e5 100644
--- a/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
+++ b/daffodil-tdml-processor/src/test/scala/org/apache/daffodil/processor/tdml/TestTDMLRunner.scala
@@ -216,7 +216,7 @@ class TestTDMLRunner {
xsd
} xmlns:dfdl={dfdl} xmlns:tns={example}>
<ts:defineSchema name="mySchema">
- <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
+ <xs:include schemaLocation="/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd"/>
<dfdl:format ref="tns:GeneralFormat"/>
<xs:element name="data" type="xs:int" dfdl:lengthKind="explicit" dfdl:length="{ xs:unsignedInt(2) }"/>
</ts:defineSchema>
diff --git a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
index 3ef55bb52..0c732b817 100644
--- a/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
+++ b/daffodil-test/src/test/resources/org/apache/daffodil/section06/namespaces/includeImport.tdml
@@ -66,5 +66,24 @@
</tdml:parserTestCase>
+ <tdml:defineSchema name="deprecatedSchemaLocation">
+ <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+ <dfdl:format ref="GeneralFormat"/>
+ <xs:element name="basic" type="xs:string" dfdl:lengthKind="delimited"/>
+ </tdml:defineSchema>
+
+ <tdml:parserTestCase name="deprecatedSchemaLocation01" model="deprecatedSchemaLocation">
+ <tdml:document><![CDATA[123]]></tdml:document>
+ <tdml:infoset>
+ <tdml:dfdlInfoset>
+ <basic>123</basic>
+ </tdml:dfdlInfoset>
+ </tdml:infoset>
+ <tdml:warnings>
+ <tdml:warning>relative</tdml:warning>
+ <tdml:warning>schemaLocation</tdml:warning>
+ <tdml:warning>/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd</tdml:warning>
+ </tdml:warnings>
+ </tdml:parserTestCase>
</tdml:testSuite>
diff --git a/daffodil-test/src/test/scala/org/apache/daffodil/section06/namespaces/TestNamespaces.scala b/daffodil-test/src/test/scala/org/apache/daffodil/section06/namespaces/TestNamespaces.scala
index fa7d5fcdb..16537be0d 100644
--- a/daffodil-test/src/test/scala/org/apache/daffodil/section06/namespaces/TestNamespaces.scala
+++ b/daffodil-test/src/test/scala/org/apache/daffodil/section06/namespaces/TestNamespaces.scala
@@ -244,4 +244,8 @@ class TestNamespaces {
@Test def test_complexIncludesNamespaces_02(): Unit = {
runner2.runOneTest("complexIncludesNamespaces_02")
}
+
+ @Test def test_deprecatedSchemaLocation01(): Unit = {
+ runner3.runOneTest("deprecatedSchemaLocation01")
+ }
}