Discrepancy between COM XML and COM document

[DavidFeliot]

There seems to be a discrepancy between the COM document and the COM XML definitions about CompositeFilter: 1- In the COM document, CompositeFilter inherits from QueryFilter 2- In the COM XML, there is another structure called CompositeFilterSet that extends QueryFilter and contains CompositeFilter that does not inherit from QueryFilter

Which one is correct?

[SamCooper]

The XML is the correct one, do you want me to set something up to autogenerate the document (section 3 onwards) for you?

[DavidFeliot]

Yes please.

[SamCooper]

Ok, you'll need to build these projects: https://github.com/esa/CCSDS_MO_POM https://github.com/esa/CCSDS_MO_XML https://github.com/esa/CCSDS_MO_StubGenerator

and then use this POM to build the documents:

<?xml version="1.0" encoding="UTF-8"?>

  <!--
    Licensed under the European Space Agency Public License, Version 2.0
    You may not use this file except in compliance with the License.

    Except as expressly set forth in this License, the Software is provided to
    You on an "as is" basis and without warranties of any kind, including without
    limitation merchantability, fitness for a particular purpose, absence of
    defects or errors, accuracy or non-infringement of intellectual property rights.

    See the License for the specific language governing permissions and limitations under the License.
-->

<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
  <modelVersion>4.0.0</modelVersion>

  <parent>
    <groupId>int.esa</groupId>
    <artifactId>CCSDS_MO_POM</artifactId>
    <version>1.0-SNAPSHOT</version>
  </parent>

  <artifactId>DocuGeneration</artifactId>
  <packaging>jar</packaging>
  <version>1.0-SNAPSHOT</version>
  <name>CCSDS Document Generation</name>

  <properties>
    <esa.stubgenerator.version>1.0-SNAPSHOT</esa.stubgenerator.version>
    <ccsds.specification.version>1.1-SNAPSHOT</ccsds.specification.version>
  </properties>

  <build>
    <plugins>
      <plugin>
        <groupId>org.apache.maven.plugins</groupId>
        <artifactId>maven-dependency-plugin</artifactId>
        <executions>
          <execution>
            <id>unpack</id>
            <phase>generate-sources</phase>
            <goals>
              <goal>unpack</goal>
            </goals>
            <configuration>
              <artifactItems>
                <artifactItem>
                  <groupId>org.ccsds</groupId>
                  <artifactId>MOXML</artifactId>
                  <version>${ccsds.specification.version}</version>
                  <type>jar</type>
                  <overWrite>false</overWrite>
                  <outputDirectory>${project.build.directory}</outputDirectory>
                  <includes>**/ServiceDefMAL.xml,**/ServiceDefCOM.xml,**/ServiceDefCommon.xml,**/ServiceDefMC.xml</includes>
                </artifactItem>
              </artifactItems>
            </configuration>
          </execution>
        </executions>
      </plugin>
      <plugin>
        <groupId>int.esa</groupId>
        <artifactId>CCSDS_MO_StubGenerator</artifactId>
        <executions>
          <execution>
            <phase>process-sources</phase>
            <goals>
              <goal>generate</goal>
            </goals>
            <configuration>
              <targetLanguages>
                <targetLanguage>DOCX</targetLanguage>
<!--                <targetLanguage>SVG</targetLanguage>-->
              </targetLanguages>
              <xmlDirectory>${project.build.directory}/xml</xmlDirectory>
              <xmlRefDirectory>${project.build.directory}/xml-ref</xmlRefDirectory>
            </configuration>
          </execution>
        </executions>
      </plugin>
    </plugins>
  </build>
</project>