Skip to content

Commit

Permalink
Version 1.3.2 - Updates
Browse files Browse the repository at this point in the history 
Update to Daffodil 3.6.0

Updates of paths for schemaLocation attributes.
Specifically the ones that are absolute paths.

Update schema to avoid duplicate element field names.
This allows JSON output to be legal JSON (no repeated field names).

The version number change is needed as the prior commit changed
element names of the futureUse fields.
That's equivalent to an API change in software so a new version is required.

Added test data files illustrating JSON representation.

Added missing doc files to the doc directory.

This format is public so I believe these specs should be here in
the project.

DFDLSchemas#57,
DFDLSchemas#56
  • Loading branch information
@mbeckerle
mbeckerle committed Jan 11, 2024
1 parent 6007ac4 commit fe755ab
Show file tree
Hide file tree
Showing 11 changed files with 65 additions and 47 deletions.
4 changes: 2 additions & 2 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name := "dfdl-mil-std-2045"

organization := "com.owlcyberdefense"

version := "1.3.1"
version := "1.3.2"

scalaVersion := "2.12.18"

libraryDependencies ++= Seq(
"org.apache.daffodil" %% "daffodil-tdml-processor" % "3.5.0" % "test",
"org.apache.daffodil" %% "daffodil-tdml-processor" % "3.6.0" % "test",
"junit" % "junit" % "4.13.2" % "test",
"com.github.sbt" % "junit-interface" % "0.13.3" % "test",
)
Expand Down
Binary file added doc/MIL-STD-2045_47001B.pdf
View file
Binary file not shown.
Binary file added doc/MIL-STD-2045_47001C.pdf
View file
Binary file not shown.
Binary file added doc/MIL-STD-2045_47001D_CHANGE-1.pdf
View file
Binary file not shown.
6 changes: 3 additions & 3 deletions ...ain/resources/com/owlcyberdefense/mil-std-2045/xsd/milstd2045_application_header.dfdl.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ SOFTWARE.
</sequence>
</complexType>
</element>
<group ref="ms2045:futureUseGroup"/>
<group ref="ms2045:futureUseGroup1"/>
<!-- start message handling group -->
<element name="message_handling_group">
<complexType>
Expand Down Expand Up @@ -461,15 +461,15 @@ SOFTWARE.
</sequence>
</complexType>
</element>
<group ref="ms2045:futureUseGroup"/>
<group ref="ms2045:futureUseGroup2"/>
<group ref="ms2045:message_security_group"/>
</sequence>
</complexType>
</element>
</sequence>
</complexType>
</element>
<group ref="ms2045:futureUseGroup"/>
<group ref="ms2045:futureUseGroup3"/>
<!-- end message handling group -->
<sequence dfdl:alignment="1" dfdl:alignmentUnits="bytes"/>
</sequence>
Expand Down
22 changes: 20 additions & 2 deletions ...main/resources/com/owlcyberdefense/mil-std-2045/xsd/milstd2045_future_use_groups.dfdl.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,9 +52,27 @@ SOFTWARE.
</appinfo>
</annotation>

<group name="futureUseGroup">
<group name="futureUseGroup1">
<sequence>
<element name="future" type="ms2045:future"
<element name="future1" type="ms2045:future"
minOccurs="0"
dfdl:occursCountKind="expression"
dfdl:occursCount="{ if ($ms2045:versionSpec eq 'D1') then 1 else 0 }"/>
</sequence>
</group>

<group name="futureUseGroup2">
<sequence>
<element name="future2" type="ms2045:future"
minOccurs="0"
dfdl:occursCountKind="expression"
dfdl:occursCount="{ if ($ms2045:versionSpec eq 'D1') then 1 else 0 }"/>
</sequence>
</group>

<group name="futureUseGroup3">
<sequence>
<element name="future3" type="ms2045:future"
minOccurs="0"
dfdl:occursCountKind="expression"
dfdl:occursCount="{ if ($ms2045:versionSpec eq 'D1') then 1 else 0 }"/>
Expand Down
8 changes: 4 additions & 4 deletions src/test/resources/com/owlcyberdefense/mil-std-2045/D1_all_fields.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@
"value": "640"
}
],
"future": [
"future1": [
{
}
],
Expand Down Expand Up @@ -228,7 +228,7 @@
]
}
],
"future": [
"future2": [
{
}
],
Expand Down Expand Up @@ -439,7 +439,7 @@
]
}
],
"future": [
"future2": [
{
}
],
Expand Down Expand Up @@ -522,7 +522,7 @@
}
]
},
"future": [
"future3": [
{
}
]
Expand Down
16 changes: 8 additions & 8 deletions src/test/resources/com/owlcyberdefense/mil-std-2045/D1_all_fields.x2.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<header_size>
<value>640</value>
</header_size>
<future></future>
<future1></future1>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -155,7 +155,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future></future>
<future2></future2>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -307,7 +307,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future></future>
<future2></future2>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -368,7 +368,7 @@
</message_security_group>
</item>
</message_handling_group>
<future></future>
<future3></future3>
</contents>
</header>
</message>
Expand Down Expand Up @@ -420,7 +420,7 @@
<header_size>
<value>640</value>
</header_size>
<future></future>
<future1></future1>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -527,7 +527,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future></future>
<future2></future2>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -679,7 +679,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future></future>
<future2></future2>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -740,7 +740,7 @@
</message_security_group>
</item>
</message_handling_group>
<future></future>
<future3></future3>
</contents>
</header>
</message>
Expand Down
8 changes: 4 additions & 4 deletions src/test/resources/com/owlcyberdefense/mil-std-2045/D1_all_fields.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
<header_size>
<value>640</value>
</header_size>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -155,7 +155,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future/>
<future2/>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -307,7 +307,7 @@
<dateTime>2014-02-03T04:05:00</dateTime>
</item>
</reference_message_data_group>
<future/>
<future2/>
<message_security_group>
<security_parameters_information>
<value>OK_Authentication_No_Encryption</value>
Expand Down Expand Up @@ -368,7 +368,7 @@
</message_security_group>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</header>
</message>
Expand Down
42 changes: 21 additions & 21 deletions src/test/resources/com/owlcyberdefense/mil-std-2045/milstd2045.tdml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -298,7 +298,7 @@ SOFTWARE.
</urn>
</item>
</recipient_address_group>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -340,10 +340,10 @@ SOFTWARE.
<value>No_Reply_Required</value>
</operator_reply_request_indicator>
</acknowledgement_request_group>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -381,7 +381,7 @@ SOFTWARE.
</urn>
</item>
</recipient_address_group>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -423,10 +423,10 @@ SOFTWARE.
<value>No_Reply_Required</value>
</operator_reply_request_indicator>
</acknowledgement_request_group>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -483,7 +483,7 @@ operator_reply_request_indicator set to 1">
</urn>
</item>
</recipient_address_group>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -525,10 +525,10 @@ operator_reply_request_indicator set to 1">
<value>Reply_Requested</value>
</operator_reply_request_indicator>
</acknowledgement_request_group>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -634,7 +634,7 @@ operator_reply_request_indicator set to 1">
<header_size>
<value>8</value>
</header_size>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand All @@ -653,10 +653,10 @@ operator_reply_request_indicator set to 1">
<security_classification>
<value>TS</value>
</security_classification>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -1213,7 +1213,7 @@ operator_reply_request_indicator set to 1">
<version>
<value>D1</value>
</version>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand All @@ -1232,10 +1232,10 @@ operator_reply_request_indicator set to 1">
<security_classification>
<value>U</value>
</security_classification>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -1435,7 +1435,7 @@ operator_reply_request_indicator set to 1">
<version>
<value>D1</value>
</version>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand All @@ -1459,10 +1459,10 @@ operator_reply_request_indicator set to 1">
<value>NO_STATEMENT</value>
</item>
</control_release_marking_D1>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down Expand Up @@ -1576,7 +1576,7 @@ operator_reply_request_indicator set to 1">
<version>
<value>D1</value>
</version>
<future/>
<future1/>
<message_handling_group>
<item>
<umf>
Expand Down Expand Up @@ -1606,10 +1606,10 @@ operator_reply_request_indicator set to 1">
<value>ALGERIA_(AG)</value>
</item>
</control_release_marking_D1>
<future/>
<future2/>
</item>
</message_handling_group>
<future/>
<future3/>
</contents>
</ex:milstd2045_application_header>
</tdml:dfdlInfoset>
Expand Down
6 changes: 3 additions & 3 deletions src/test/resources/com/owlcyberdefense/mil-std-2045/test2045MsgHdr1.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
]
}
],
"future": [
"future1": [
{
}
],
Expand Down Expand Up @@ -91,14 +91,14 @@
}
}
],
"future": [
"future2": [
{
}
]
}
]
},
"future": [
"future3": [
{
}
]
Expand Down

0 comments on commit fe755ab

Please sign in to comment.