diff --git a/DFDL/attribution/XMLCatalog.xml b/DFDL/attribution/XMLCatalog.xml
new file mode 100644
index 0000000000000000000000000000000000000000..8bdf14c1072c933322ce8cd45f8478758fb93294
--- /dev/null
+++ b/DFDL/attribution/XMLCatalog.xml
@@ -0,0 +1,48 @@
+<?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.
+-->
+<!DOCTYPE catalog
+ PUBLIC "-//OASIS//DTD XML Catalogs V1.0//EN"
+ "http://www.oasis-open.org/committees/entity/release/1.0/catalog.dtd">
+<catalog xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+ <!--
+ It would be good to not have this xmlns in here, because eclipse
+ shows validation errors having to do with the publicId of XMLSchema.dtd
+ not obeying the pattern.
+ -->
+ <uri name="http://www.ibm.com/xmlns/dfdl/testData"
+ uri="file:org/apache/daffodil/xsd/tdml.xsd"/>
+ <uri name="http://www.ogf.org/dfdl/dfdl-1.0/"
+ uri="file:org/apache/daffodil/xsd/DFDL_part3_model.xsd"/>
+ <uri name="http://www.ogf.org/dfdl/dfdl-1.0/extensions"
+ uri="file:org/apache/daffodil/xsd/dfdlx.xsd"/>
+ <uri name="http://www.w3.org/2001/XMLSchema"
+ uri="file:org/apache/daffodil/xsd/XMLSchema_for_DFDL.xsd"/>
+ <uri name="http://www.w3.org/XML/1998/namespace"
+ uri="file:org/apache/daffodil/xsd/xml.xsd"/>
+
+ <!-- Seems the format of catalogs doesn't allow spaces in the publicId.
+ I don't know if one can replace them with escape %20 stuff or not.-->
+ <public publicId="-//W3C//DTD XMLSCHEMA 200102//EN"
+ uri="file:org/apache/daffodil/xsd/XMLSchema.dtd"/>
+ <public publicId="datatypes"
+ uri="file:org/apache/daffodil/xsd/datatypes.dtd"/>
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
+ uri="file:org/apache/daffodil/xsd/dafint.xsd"/>
+ <uri name="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"
+ uri="file:org/apache/daffodil/xsd/dafext.xsd"/>
+</catalog>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
index 176edbf506e2af15065be90ad3bf221d385cd788..d46072012463961d5e4d3fc28fa04220f845ed7c 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormat.dfdl.xsd
@@ -19,17 +19,100 @@
<xs:schema xmlns:dfdl="http://www.ogf.org/dfdl/dfdl-1.0/"
xmlns:xs="http://www.w3.org/2001/XMLSchema">
- <xs:include schemaLocation="DFDLGeneralFormatBase.dfdl.xsd" />
-
<!-- Intended for inclusion into other schemas. Has no targetNamespace on purpose -->
<xs:annotation>
<xs:appinfo source="http://www.ogf.org/dfdl/">
+ <!--
+ This set of properties should never change. It can be added to
+ if properties are missing, but should not be changed.
+
+ Changes should be introduced by way of defining new formats in
+ terms of this one, which override definitions. See below in
+ the file for examples.
+ -->
+ <dfdl:defineFormat name="GeneralFormatOriginal">
+ <dfdl:format
+ alignment="1"
+ alignmentUnits="bytes"
+ binaryFloatRep="ieee"
+ binaryNumberCheckPolicy="lax"
+ binaryNumberRep="binary"
+ binaryCalendarEpoch="1970-01-01T00:00:00"
+ bitOrder="mostSignificantBitFirst"
+ byteOrder="bigEndian"
+ calendarCenturyStart="53"
+ calendarCheckPolicy="strict"
+ calendarDaysInFirstWeek="4"
+ calendarFirstDayOfWeek="Sunday"
+ calendarLanguage="en"
+ calendarObserveDST="yes"
+ calendarPatternKind="implicit"
+ calendarTimeZone=""
+ choiceLengthKind="implicit"
+ decimalSigned="yes"
+ documentFinalTerminatorCanBeMissing="no"
+ emptyValueDelimiterPolicy="both"
+ encodingErrorPolicy="replace"
+ encoding="US-ASCII"
+ escapeSchemeRef=""
+ fillByte="%#r20;"
+ floating="no"
+ ignoreCase="no"
+ initiatedContent="no"
+ initiator=""
+ leadingSkip="0"
+ lengthKind="implicit"
+ lengthUnits="bytes"
+ occursCountKind="implicit"
+ outputNewLine="%LF;"
+ representation="text"
+ separator=""
+ separatorPosition="infix"
+ separatorSuppressionPolicy="anyEmpty"
+ sequenceKind="ordered"
+ terminator=""
+ textBidi="no"
+ textBooleanPadCharacter="%SP;"
+ textCalendarJustification="left"
+ textCalendarPadCharacter="%SP;"
+ textNumberCheckPolicy="lax"
+ textNumberJustification="right"
+ textNumberPadCharacter="%SP;"
+ textNumberPattern="#,##0.###;-#,##0.###"
+ textNumberRep="standard"
+ textNumberRounding="explicit"
+ textNumberRoundingIncrement="0"
+ textNumberRoundingMode="roundHalfEven"
+ textOutputMinLength="0"
+ textPadKind="none"
+ textStandardBase="10"
+ textStandardDecimalSeparator="."
+ textStandardExponentRep="E"
+ textStandardGroupingSeparator=","
+ textStandardInfinityRep="Inf"
+ textStandardNaNRep="NaN"
+ textStandardZeroRep="0"
+ textStringJustification="left"
+ textStringPadCharacter="%SP;"
+ textTrimKind="none"
+ trailingSkip="0"
+ truncateSpecifiedLengthString="no"
+ utf16Width="fixed"
+ />
+ </dfdl:defineFormat>
+
<dfdl:defineFormat name="GeneralFormat">
- <dfdl:format ref="GeneralFormatBase"
- emptyElementParsePolicy="treatAsEmpty"/>
+ <dfdl:format ref="GeneralFormatOriginal" />
</dfdl:defineFormat>
+ <dfdl:defineFormat name="GeneralFormatPortable">
+ <dfdl:format ref="GeneralFormatOriginal"
+ calendarTimeZone="UTC"
+ encodingErrorPolicy="error"
+ />
+ </dfdl:defineFormat>
+
</xs:appinfo>
</xs:annotation>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatBase.dfdl.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatBase.dfdl.xsd
deleted file mode 100644
index f22159a361218c0fb2207b8a8e12bfb086881efb..0000000000000000000000000000000000000000
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatBase.dfdl.xsd
+++ /dev/null
@@ -1,108 +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/">
-
- <!--
- This set of properties should never change. It can be added to
- if properties are missing, but should not be changed.
-
- Changes should be introduced by way of defining new formats in
- terms of this one, which override definitions. See below in
- the file for examples.
- -->
- <dfdl:defineFormat name="GeneralFormatBase">
- <dfdl:format
- alignment="1"
- alignmentUnits="bytes"
- binaryFloatRep="ieee"
- binaryNumberCheckPolicy="lax"
- binaryNumberRep="binary"
- binaryCalendarEpoch="1970-01-01T00:00:00"
- bitOrder="mostSignificantBitFirst"
- byteOrder="bigEndian"
- calendarCenturyStart="53"
- calendarCheckPolicy="strict"
- calendarDaysInFirstWeek="4"
- calendarFirstDayOfWeek="Sunday"
- calendarLanguage="en"
- calendarObserveDST="yes"
- calendarPatternKind="implicit"
- calendarTimeZone=""
- choiceLengthKind="implicit"
- decimalSigned="yes"
- documentFinalTerminatorCanBeMissing="no"
- emptyValueDelimiterPolicy="both"
- encodingErrorPolicy="replace"
- encoding="US-ASCII"
- escapeSchemeRef=""
- fillByte="%#r20;"
- floating="no"
- ignoreCase="no"
- initiatedContent="no"
- initiator=""
- leadingSkip="0"
- lengthKind="implicit"
- lengthUnits="bytes"
- occursCountKind="implicit"
- outputNewLine="%LF;"
- representation="text"
- separator=""
- separatorPosition="infix"
- separatorSuppressionPolicy="anyEmpty"
- sequenceKind="ordered"
- terminator=""
- textBidi="no"
- textBooleanPadCharacter="%SP;"
- textCalendarJustification="left"
- textCalendarPadCharacter="%SP;"
- textNumberCheckPolicy="lax"
- textNumberJustification="right"
- textNumberPadCharacter="%SP;"
- textNumberPattern="#,##0.###;-#,##0.###"
- textNumberRep="standard"
- textNumberRounding="explicit"
- textNumberRoundingIncrement="0"
- textNumberRoundingMode="roundHalfEven"
- textOutputMinLength="0"
- textPadKind="none"
- textStandardBase="10"
- textStandardDecimalSeparator="."
- textStandardExponentRep="E"
- textStandardGroupingSeparator=","
- textStandardInfinityRep="Inf"
- textStandardNaNRep="NaN"
- textStandardZeroRep=""
- textStringJustification="left"
- textStringPadCharacter="%SP;"
- textTrimKind="none"
- trailingSkip="0"
- truncateSpecifiedLengthString="no"
- utf16Width="fixed"
- />
- </dfdl:defineFormat>
-
- </xs:appinfo>
- </xs:annotation>
-
-</xs:schema>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd
deleted file mode 100644
index 183304d91ce270e485784b529a3a9ce8f10daf31..0000000000000000000000000000000000000000
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDLGeneralFormatPortable.dfdl.xsd
+++ /dev/null
@@ -1,38 +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">
-
- <xs:include schemaLocation="DFDLGeneralFormatBase.dfdl.xsd" />
-
- <!-- Intended for inclusion into other schemas. Has no targetNamespace on purpose -->
- <xs:annotation>
- <xs:appinfo source="http://www.ogf.org/dfdl/">
-
- <dfdl:defineFormat name="GeneralFormat">
- <dfdl:format ref="GeneralFormatBase"
- calendarTimeZone="UTC"
- encodingErrorPolicy="error"
- />
- </dfdl:defineFormat>
-
- </xs:appinfo>
- </xs:annotation>
-
-</xs:schema>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd
index 8991c147a9e591e9433cb45fbdf6d1bc7d3f4541..9d6f351e31398d4a9dd23a29fa158f14828e3eb3 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part1_simpletypes.xsd
@@ -93,16 +93,9 @@
</xsd:simpleType>
<xsd:simpleType name="NonEmptyListOfDFDLStringLiteral">
- <xsd:restriction base="dfdl:ListOfDFDLStringLiteral">
- <xsd:minLength value="1"/>
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:simpleType name="NonEmptyListOfDFDLStringLiteral_nilValue">
<xsd:restriction base="dfdl:ListOfDFDLStringLiteral">
<!-- used for dfdl:nilValue. We can give a much clearer diagnostic with a suggestion
- on what the user should do instead, ie did they mean to use '%ES;'. So we don't
- check this here. -->
+ on what the user should do instead. So we don't check this here. -->
<!-- <xsd:minLength value="1"/> -->
</xsd:restriction>
</xsd:simpleType>
@@ -633,13 +626,6 @@
</xsd:restriction>
</xsd:simpleType>
- <xsd:simpleType name="EmptyElementParsePolicyEnum">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="treatAsEmpty" />
- <xsd:enumeration value="treatAsAbsent" />
- </xsd:restriction>
- </xsd:simpleType>
-
<!-- ============================================================= -->
<!-- Simple types with DFDL Expression -->
<!-- ============================================================= -->
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd
index 644b54a25f8d6ce3ebd719baae6cac3cb0a6e2dd..9f0b2a2159c42708c7008532498dbb60f824d466 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part2_attributes.xsd
@@ -25,9 +25,7 @@
attributeFormDefault="unqualified" elementFormDefault="qualified">
<xsd:include schemaLocation="DFDL_part1_simpletypes.xsd" />
-
- <!-- Add schemaLocation="dafext.xsd" to allow NetBeans XML validation to work -->
- <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext" schemaLocation="dafext.xsd"/>
+ <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"/>
<xsd:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/extensions"/>
<!-- ==================================================================== -->
@@ -63,15 +61,12 @@
except it applies to elements instead of attributes (xs:any vs
xs:anyAttribute). See the description above for how this group works to
enable strict validation of dfdl namespace elements and lax validation of
- other elements. Note that in addition to specifying ##other (i.e. non-DFDL
- namespace) as lax, we must also specify ##local (i.e. no-namespace) as lax.
- Only specifying ##other does not match no-namespace elements.
+ other elements.
-->
<xsd:group name="anyOther">
- <xsd:choice>
+ <xsd:sequence>
<xsd:any namespace="##other" processContents="lax" />
- <xsd:any namespace="##local" processContents="lax" />
- </xsd:choice>
+ </xsd:sequence>
</xsd:group>
<xsd:attributeGroup name="BaseAG">
@@ -103,9 +98,8 @@
<xsd:attribute name="bitOrder" type="dfdl:BitOrderEnum"/>
<xsd:attribute ref="daf:parseUnparsePolicy"/> <!-- backwards compatibility -->
<xsd:attribute ref="dfdlx:parseUnparsePolicy"/>
- <xsd:attribute name="emptyElementParsePolicy" type="dfdl:EmptyElementParsePolicyEnum"/>
- <xsd:attribute ref="dfdlx:emptyElementParsePolicy"/> <!-- deprecated -->
-
+ <xsd:attribute ref="dfdlx:emptyElementParsePolicy"/>
+
<xsd:attribute name="encoding"
type="dfdl:EncodingEnum_Or_DFDLExpression" />
<xsd:attribute name="utf16Width" type="dfdl:UTF16WidthEnum" />
@@ -401,12 +395,12 @@
<!-- 13.14 Properties for Nillable Elements -->
<xsd:attribute name="nilKind" type="dfdl:NilKindEnum" />
- <xsd:attribute name="nilValue" type="dfdl:NonEmptyListOfDFDLStringLiteral_nilValue" />
+ <xsd:attribute name="nilValue" type="dfdl:NonEmptyListOfDFDLStringLiteral" />
<xsd:attribute name="nilValueDelimiterPolicy" type="dfdl:NilValueDelimiterPolicyEnum" />
<xsd:attributeGroup name="NillableAG">
<xsd:attribute name="nilKind" type="dfdl:NilKindEnum" />
- <xsd:attribute name="nilValue" type="dfdl:NonEmptyListOfDFDLStringLiteral_nilValue" />
+ <xsd:attribute name="nilValue" type="dfdl:NonEmptyListOfDFDLStringLiteral" />
<xsd:attribute name="nilValueDelimiterPolicy" type="dfdl:NilValueDelimiterPolicyEnum" />
</xsd:attributeGroup>
@@ -545,7 +539,6 @@
<xsd:enumeration value="bitOrder"/>
<xsd:enumeration value="encoding" />
<xsd:enumeration value="encodingErrorPolicy"/>
- <xsd:enumeration value="emptyElementParsePolicy"/>
<xsd:enumeration value="utf16Width" />
<xsd:enumeration value="ignoreCase" />
@@ -648,8 +641,6 @@
type="dfdl:EncodingEnum_Or_DFDLExpression" />
<xsd:attribute form="qualified" name="encodingErrorPolicy"
type="dfdl:EncodingErrorPolicyEnum" />
- <xsd:attribute form="qualified" name="emptyElementParsePolicy"
- type="dfdl:EmptyElementParsePolicyEnum" />
<xsd:attribute form="qualified" name="utf16Width"
type="dfdl:UTF16WidthEnum" />
<xsd:attribute form="qualified" name="ignoreCase"
@@ -926,7 +917,7 @@
<xsd:attribute form="qualified" name="nilKind"
type="dfdl:NilKindEnum" />
<xsd:attribute form="qualified" name="nilValue"
- type="dfdl:NonEmptyListOfDFDLStringLiteral_nilValue" />
+ type="dfdl:NonEmptyListOfDFDLStringLiteral" />
<xsd:attribute form="qualified" name="nilValueDelimiterPolicy"
type="dfdl:NilValueDelimiterPolicyEnum" />
</xsd:attributeGroup>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part3_model.xsd b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part3_model.xsd
index ad59d7595ba2a1660d5109454f7a57fba2356346..157aaf7543448b519d90bf05831573ec74f50fe0 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part3_model.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/DFDL_part3_model.xsd
@@ -25,10 +25,8 @@
xmlns:dafint="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"
attributeFormDefault="unqualified" elementFormDefault="qualified">
- <xsd:include schemaLocation="DFDL_part2_attributes.xsd"/>
-
- <!-- Add schemaLocation="dafint.xsd" to allow NetBeans XML validation to work -->
- <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int" schemaLocation="dafint.xsd"/>
+ <xsd:include schemaLocation="DFDL_part2_attributes.xsd" />
+ <xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"/>
<xsd:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:ext"/>
<xsd:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/extensions"/>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/dafext.xsd b/DFDL/attribution/org/apache/daffodil/xsd/dafext.xsd
index 017849422008dc3c25e671d129c3aa235ba54d37..806f6a8f5c7733aec0344857c7dedb90c36f4e15 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/dafext.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/dafext.xsd
@@ -27,8 +27,7 @@
attributeFormDefault="unqualified"
elementFormDefault="qualified">
- <!-- Add schemaLocation="daflx.xsd" to allow NetBeans XML validation to work -->
- <xs:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/extensions" schemaLocation="dfdlx.xsd"/>
+ <xs:import namespace="http://www.ogf.org/dfdl/dfdl-1.0/extensions"/>
<xs:import namespace="urn:ogf:dfdl:2013:imp:daffodil.apache.org:2018:int"/>
<!-- needed for backwards compatability with daf:parseUnparsePolicy -->
@@ -102,18 +101,6 @@
<xs:element name="tunables">
<xs:complexType>
<xs:all>
- <xs:element name="allowBigIntegerBits" type="xs:boolean" default="true" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Previous Daffodil releases let schemas define every type's length using "bits" as the length unit
- even though the specification allows bit length units only for a specific set of types' binary
- representations and does not allow bit length units for any other type's binary representation
- or any type's text representation. When this tunable is true, a deprecation warning is issued
- when bit length units are incorrectly used. When this tunable is false, a schema definition
- error will be issued instead.
- </xs:documentation>
- </xs:annotation>
- </xs:element>
<xs:element name="allowExpressionResultCoercion" type="xs:boolean" default="true" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -220,40 +207,6 @@
</xs:restriction>
</xs:simpleType>
</xs:element>
- <xs:element name="infosetWalkerSkipMin" default="32" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Daffodil periodically walks the internal infoset to send events to the configured
- InfosetOutputter, skipping at least this number of walk attempts. Larger values
- mean delayed InfosetOutputter events and more memory usage; Smaller values mean
- more CPU usage. Set this value to zero to never skip any walk attempts. This is
- specifically for advanced testing behavior and should not need to be changed by users.
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="0" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
- <xs:element name="infosetWalkerSkipMax" default="2048" minOccurs="0">
- <xs:annotation>
- <xs:documentation>
- Daffodil periodically walks the internal infoset to send events to the configured
- InfosetOutputter. On walks where no progress is made, the number of walks to skip
- is increased with the assumption that something is blocking it (like an
- unresolved point of uncertainty), up to this maximum value. Higher values mean
- less attempts are made when blocked for a long time, but with potentially more
- delays and memory usage before InfosetOutputter events are created. This is
- specifically for advanced testing behavior and should not need to be changed by users.
- </xs:documentation>
- </xs:annotation>
- <xs:simpleType>
- <xs:restriction base="xs:int">
- <xs:minInclusive value="0" />
- </xs:restriction>
- </xs:simpleType>
- </xs:element>
<xs:element name="inputFileMemoryMapLowThreshold" type="xs:int" default="33554432" minOccurs="0">
<xs:annotation>
<xs:documentation>
@@ -309,7 +262,7 @@
</xs:documentation>
</xs:annotation>
</xs:element>
- <xs:element name="maxHexBinaryLengthInBytes" default="1073741823" minOccurs="0">
+ <xs:element name="maxHexBinaryLengthInBytes" default="2147483647" minOccurs="0">
<xs:annotation>
<xs:documentation>
The maximum size allowed for an xs:hexBinary element.
@@ -318,12 +271,6 @@
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="1" />
- <!--
- The maxInclusive value is set to (Int.MaxValue / 2) since each byte in
- hex binary becomes 2 hex chars, and the maximum length of a string in
- Java is Int.MaxValue
- -->
- <xs:maxInclusive value="1073741823" />
</xs:restriction>
</xs:simpleType>
</xs:element>
@@ -617,11 +564,7 @@
</xs:element>
<xs:simpleType name="TunableEmptyElementParsePolicy">
- <xs:restriction base="xs:string">
- <xs:enumeration value="treatAsEmpty" />
- <xs:enumeration value="treatAsAbsent" />
- <xs:enumeration value="treatAsMissing" /> <!-- deprecated -->
- </xs:restriction>
+ <xs:restriction base="dfdlx:EmptyElementParsePolicyEnum" />
</xs:simpleType>
<!--
@@ -673,8 +616,6 @@
<xs:enumeration value="appinfoDFDLSourceWrong" />
<xs:enumeration value="appinfoNoSource" />
<xs:enumeration value="choiceInsideHiddenGroup" />
- <xs:enumeration value="codeGenerator" />
- <xs:enumeration value="deprecatedBigIntegerBits" />
<xs:enumeration value="deprecatedBuiltInFormats" />
<xs:enumeration value="deprecatedEncodingNameUSASCII7BitPacked" />
<xs:enumeration value="deprecatedExpressionResultCoercion" />
@@ -705,15 +646,12 @@
<xs:enumeration value="queryStylePathExpression" />
<xs:enumeration value="regexPatternZeroLength" />
<xs:enumeration value="textBidiError" />
- <xs:enumeration value="textNumberPatternWarning" />
<xs:enumeration value="textOutputMinLengthOutOfRange" />
<xs:enumeration value="textStandardBaseUndefined" />
<xs:enumeration value="unsupportedAttributeBlockDefault" />
<xs:enumeration value="unsupportedAttributeFinalDefault" />
<xs:enumeration value="unsupportedAttributeFormDefault" />
<xs:enumeration value="unsupportedAttributeSchemaLocation" />
- <xs:enumeration value="variableSet" />
- <xs:enumeration value="xmlParser" />
</xs:restriction>
</xs:simpleType>
</xs:list>
diff --git a/DFDL/attribution/org/apache/daffodil/xsd/dfdlx.xsd b/DFDL/attribution/org/apache/daffodil/xsd/dfdlx.xsd
index 395aed008de26ca702e978a2acaa2a102dad914e..f6037e78743a5f6867094c9a8bf4514ca719b656 100644
--- a/DFDL/attribution/org/apache/daffodil/xsd/dfdlx.xsd
+++ b/DFDL/attribution/org/apache/daffodil/xsd/dfdlx.xsd
@@ -36,7 +36,7 @@
<xs:restriction base="xs:string">
<xs:enumeration value="dfdlx:alignmentKind" />
<xs:enumeration value="dfdlx:choiceBranchKeyRanges" />
- <xs:enumeration value="dfdlx:emptyElementParsePolicy"/> <!-- deprecated -->
+ <xs:enumeration value="dfdlx:emptyElementParsePolicy"/>
<xs:enumeration value="dfdlx:inputTypeCalc"/>
<xs:enumeration value="dfdlx:objectKind"/>
<xs:enumeration value="dfdlx:outputTypeCalc"/>
@@ -94,11 +94,11 @@
</xs:restriction>
</xs:simpleType>
- <xs:attribute name="emptyElementParsePolicy" type="dfdlx:EmptyElementParsePolicyEnum"/> <!-- deprecated -->
+ <xs:attribute name="emptyElementParsePolicy" type="dfdlx:EmptyElementParsePolicyEnum"/>
<xs:simpleType name="EmptyElementParsePolicyEnum">
<xs:restriction base="xs:string">
<xs:enumeration value="treatAsEmpty" />
- <xs:enumeration value="treatAsMissing" /> <!-- deprecated -->
+ <xs:enumeration value="treatAsMissing" />
</xs:restriction>
</xs:simpleType>
diff --git a/DFDL/dataFormats/link16/SISO_STD_002_10July_2006.pdf b/DFDL/dataFormats/link16/SISO_STD_002_10July_2006.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5511922dd0935f6760cdbdc058c61fa458ad01f0
Binary files /dev/null and b/DFDL/dataFormats/link16/SISO_STD_002_10July_2006.pdf differ