commit cd97ccb4651a0345e113ce9fd9f9e648ce1f3f9e
author Michael Beckerle <mbeckerle@apache.org> Wed May 11 14:45:59 2022 -0400
committer Mike Beckerle <mbeckerle@apache.org> Wed May 11 18:07:19 2022 -0400
tree 297dbc087fb59d23370b4a4506a3ddff8ab88df3
parent d888377efcc9256d635862b61ad1fa207af72118

Updates to improve style of schemas and tdml using default namespaces

Also updated to sbt 1.6.2

project/build.properties

diff --git a/project/build.properties b/project/build.properties
index 98655aa..e7ff87f 100644
--- a/project/build.properties
+++ b/project/build.properties
@@ -13,4 +13,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-sbt.version=1.6.1
+sbt.version=1.6.2

"b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/$if\050namespaced.truthy\051$main$else$src$endif$/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/$if\050namespaced.truthy\051$xsd$else$.$endif$/$name__camel$.dfdl.xsd"

diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/$if\050namespaced.truthy\051$main$else$src$endif$/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/$if\050namespaced.truthy\051$xsd$else$.$endif$/$name__camel$.dfdl.xsd" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/$if\050namespaced.truthy\051$main$else$src$endif$/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/$if\050namespaced.truthy\051$xsd$else$.$endif$/$name__camel$.dfdl.xsd"
index 9c3c05d..37d8afa 100644
--- "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/$if\050namespaced.truthy\051$main$else$src$endif$/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/$if\050namespaced.truthy\051$xsd$else$.$endif$/$name__camel$.dfdl.xsd"
+++ "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/$if\050namespaced.truthy\051$main$else$src$endif$/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/$if\050namespaced.truthy\051$xsd$else$.$endif$/$name__camel$.dfdl.xsd"
@@ -18,28 +18,29 @@
 -->
 !$
 
-<xs:schema
+<schema
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
+  xmlns="http://www.w3.org/2001/XMLSchema"
   xmlns:fn="http://www.w3.org/2005/xpath-functions"
   xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
   xmlns:$name;format="camel"$="urn:$name;format="camel"$"
   targetNamespace="urn:$name;format="camel"$"
   elementFormDefault="unqualified">
 
-  <xs:include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
+  <include schemaLocation="org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd" />
 
-  <xs:annotation>
-    <xs:appinfo source="http://www.ogf.org/dfdl/">
+  <annotation>
+    <appinfo source="http://www.ogf.org/dfdl/">
       <dfdl:format ref="$name;format="camel"$:GeneralFormat" />
-    </xs:appinfo>
-  </xs:annotation>
+    </appinfo>
+  </annotation>
 
-  <xs:element name="$name;format="Camel"$">
-    <xs:complexType>
-      <xs:sequence>
+  <element name="$name;format="Camel"$">
+    <complexType>
+      <sequence>
 
-      </xs:sequence>
-    </xs:complexType>
-  </xs:element>
+      </sequence>
+    </complexType>
+  </element>
 
-</xs:schema>
+</schema>

"b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"

diff --git "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml" "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
index 04db58c..d8d9c09 100644
--- "a/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
+++ "b/src/main/g8/$if\050namespaced.truthy\051$src$else$.$endif$/test/$if\050namespaced.truthy\051$resources$else$.$endif$/$if\050namespaced.truthy\051$$package$$else$.$endif$/$if\050namespaced.truthy\051$$name__camel$$else$.$endif$/Test$name__Camel$.tdml"
@@ -18,21 +18,22 @@
 -->
 !$
 
-<tdml:testSuite suiteName="$name;format="Camel"$" description="$name;format="Camel"$ tests"
+<testSuite suiteName="$name;format="Camel"$" description="$name;format="Camel"$ tests"
   xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/" 
-  xmlns:fn="http://www.w3.org/2005/xpath-functions" 
-  xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData" 
+  xmlns:fn="http://www.w3.org/2005/xpath-functions"
+  xmlns:tdml="http://www.ibm.com/xmlns/dfdl/testData"
+  xmlns="http://www.ibm.com/xmlns/dfdl/testData"
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   defaultRoundTrip="onePass">
 
-  <tdml:parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
-    <tdml:document>
-      <tdml:documentPart type="file">test_01.$extension$</tdml:documentPart>
-    </tdml:document>
-    <tdml:infoset>
-      <tdml:dfdlInfoset type="file">test_01.$extension$.xml</tdml:dfdlInfoset>
-    </tdml:infoset>
-  </tdml:parserTestCase>
+  <parserTestCase name="test_$name;format="camel"$_01" root="$name;format="Camel"$" model="$if(namespaced.truthy)$$package;format="packaged"$/$name;format="camel"$/xsd/$endif$$name;format="camel"$.dfdl.xsd">
+    <document>
+      <documentPart type="file">test_01.$extension$</documentPart>
+    </document>
+    <infoset>
+      <dfdlInfoset type="file">test_01.$extension$.xml</dfdlInfoset>
+    </infoset>
+  </parserTestCase>
 
-</tdml:testSuite>
+</testSuite>

src/main/g8/project/build.properties

diff --git a/src/main/g8/project/build.properties b/src/main/g8/project/build.properties
index 0f20dc5..f00b8c9 100644
--- a/src/main/g8/project/build.properties
+++ b/src/main/g8/project/build.properties
@@ -14,4 +14,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 !$
-sbt.version=1.6.1
+sbt.version=1.6.2