Make include/import logic more precise and consistent

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"

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="">

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/">

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/">

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/" >

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/" >

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/" >

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=""

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/">

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/">

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/" >

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"/>

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">

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>

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/" >

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/" >

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/">

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/">

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/">

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 = {

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

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>

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

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

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

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