diff --git a/.gitignore b/.gitignore index bf4a27946..6ceb4808d 100755 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,7 @@ scap/scap-schema-*.jar scap/schemas/oval/official scap-extensions/schemas.episode scap-extensions/scap-schema-extensions.jar +cyberscope/target +dod-arf/target +scap/target +scap-extensions/target diff --git a/3rd-party/Saxon-HE-9.4.jar b/3rd-party/Saxon-HE-9.4.jar new file mode 100644 index 000000000..2f12c2c69 Binary files /dev/null and b/3rd-party/Saxon-HE-9.4.jar differ diff --git a/3rd-party/codemodel-4.0.0.jar b/3rd-party/codemodel-4.0.0.jar new file mode 100644 index 000000000..c0c29757e Binary files /dev/null and b/3rd-party/codemodel-4.0.0.jar differ diff --git a/3rd-party/dtd-parser-1.5.0.jar b/3rd-party/dtd-parser-1.5.0.jar new file mode 100644 index 000000000..e2b57a130 Binary files /dev/null and b/3rd-party/dtd-parser-1.5.0.jar differ diff --git a/3rd-party/istack-commons-runtime-4.1.1.jar b/3rd-party/istack-commons-runtime-4.1.1.jar new file mode 100644 index 000000000..39dd5d00d Binary files /dev/null and b/3rd-party/istack-commons-runtime-4.1.1.jar differ diff --git a/3rd-party/istack-commons-tools-4.1.1.jar b/3rd-party/istack-commons-tools-4.1.1.jar new file mode 100644 index 000000000..32913d714 Binary files /dev/null and b/3rd-party/istack-commons-tools-4.1.1.jar differ diff --git a/3rd-party/jakarta.activation-api-2.1.0.jar b/3rd-party/jakarta.activation-api-2.1.0.jar new file mode 100644 index 000000000..b12598565 Binary files /dev/null and b/3rd-party/jakarta.activation-api-2.1.0.jar differ diff --git a/3rd-party/jakarta.xml.bind-api-4.0.0.jar b/3rd-party/jakarta.xml.bind-api-4.0.0.jar new file mode 100644 index 000000000..b10d606bc Binary files /dev/null and b/3rd-party/jakarta.xml.bind-api-4.0.0.jar differ diff --git a/3rd-party/jaxb-core-3.0.2.jar b/3rd-party/jaxb-core-3.0.2.jar new file mode 100644 index 000000000..8ad907eb4 Binary files /dev/null and b/3rd-party/jaxb-core-3.0.2.jar differ diff --git a/3rd-party/jaxb-impl-3.0.2.jar b/3rd-party/jaxb-impl-3.0.2.jar new file mode 100644 index 000000000..fad38ecc2 Binary files /dev/null and b/3rd-party/jaxb-impl-3.0.2.jar differ diff --git a/3rd-party/jaxb-impl.jar b/3rd-party/jaxb-impl.jar deleted file mode 100644 index cd249e7c6..000000000 Binary files a/3rd-party/jaxb-impl.jar and /dev/null differ diff --git a/3rd-party/jaxb-xjc-2.2.6.jar b/3rd-party/jaxb-xjc-2.2.6.jar deleted file mode 100644 index 7f2d80783..000000000 Binary files a/3rd-party/jaxb-xjc-2.2.6.jar and /dev/null differ diff --git a/3rd-party/jaxb-xjc-3.0.2.jar b/3rd-party/jaxb-xjc-3.0.2.jar new file mode 100644 index 000000000..0f07f8e9f Binary files /dev/null and b/3rd-party/jaxb-xjc-3.0.2.jar differ diff --git a/3rd-party/jaxb2-namespace-prefix-1.3.jar b/3rd-party/jaxb2-namespace-prefix-1.3.jar deleted file mode 100644 index 303d05ef9..000000000 Binary files a/3rd-party/jaxb2-namespace-prefix-1.3.jar and /dev/null differ diff --git a/3rd-party/jaxb2-namespace-prefix-2.0.jar b/3rd-party/jaxb2-namespace-prefix-2.0.jar new file mode 100644 index 000000000..9e7b0505e Binary files /dev/null and b/3rd-party/jaxb2-namespace-prefix-2.0.jar differ diff --git a/3rd-party/relaxng-datatype-4.0.0.jar b/3rd-party/relaxng-datatype-4.0.0.jar new file mode 100644 index 000000000..53e473f44 Binary files /dev/null and b/3rd-party/relaxng-datatype-4.0.0.jar differ diff --git a/3rd-party/rngom-4.0.0.jar b/3rd-party/rngom-4.0.0.jar new file mode 100644 index 000000000..5da4a7ffa Binary files /dev/null and b/3rd-party/rngom-4.0.0.jar differ diff --git a/3rd-party/saxon9he.jar b/3rd-party/saxon9he.jar deleted file mode 100644 index ca6fff0d6..000000000 Binary files a/3rd-party/saxon9he.jar and /dev/null differ diff --git a/3rd-party/txw2-4.0.0.jar b/3rd-party/txw2-4.0.0.jar new file mode 100644 index 000000000..ba03493ab Binary files /dev/null and b/3rd-party/txw2-4.0.0.jar differ diff --git a/3rd-party/xsom-4.0.0.jar b/3rd-party/xsom-4.0.0.jar new file mode 100644 index 000000000..1259aeb54 Binary files /dev/null and b/3rd-party/xsom-4.0.0.jar differ diff --git a/GNUmakefile b/GNUmakefile index 64833c94b..766e22abb 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -6,8 +6,10 @@ TOP=$(realpath .) include $(TOP)/common.mk ifeq (win, $(PLATFORM)) + CLASSPATH="$(shell cygpath -wp $(JAXB_BIND_API_LIB))" SOURCEPATH="$(shell cygpath -w $(SCAP)/$(GEN))$(CLN)$(shell cygpath -w $(SCAP_EXT)/$(GEN))" else + CLASSPATH=$(JAXB_BIND_API_LIB) SOURCEPATH=$(SCAP)/$(GEN)$(CLN)$(SCAP_EXT)/$(GEN) endif @@ -15,7 +17,7 @@ all: $(SCAP_LIB) $(SCAP_EXT_LIB) $(DOCS)/index.html $(CYBERSCOPE_LIB) $(DODARF_L $(DOCS)/index.html: $(SCAP_LIB) $(SCAP_EXT_LIB) mkdir -p $(DOCS) - $(JAVADOC) $(JAVADOCFLAGS) -d $(DOCS) -sourcepath $(SOURCEPATH) -subpackages org:scap + $(JAVADOC) $(JAVADOCFLAGS) -cp $(CLASSPATH) -d $(DOCS) -sourcepath $(SOURCEPATH) -subpackages org:scap $(SCAP_LIB): $(SCAP)/$(BINDINGS) @$(MAKE) --directory=$(SCAP) diff --git a/common.mk b/common.mk index 4a7b5cd93..d2fed2b4e 100644 --- a/common.mk +++ b/common.mk @@ -28,30 +28,43 @@ ifeq (win, $(PLATFORM)) JAR=$(WIN_JAVA_HOME)/bin/jar.exe JAVADOC=$(WIN_JAVA_HOME)/bin/javadoc.exe JAVAC=$(WIN_JAVA_HOME)/bin/javac.exe - CLASSLIB=$(shell cygpath -w $(JAVA_HOME))\jre\lib\rt.jar NUMPROCS=1 else JAVA=$(JAVA_HOME)/bin/java JAR=$(JAVA_HOME)/bin/jar JAVADOC=$(JAVA_HOME)/bin/javadoc JAVAC=$(JAVA_HOME)/bin/javac - CLASSLIB=$(JAVA_HOME)/jre/lib/rt.jar ifeq (mac, $(PLATFORM)) NUMPROCS=$(shell sysctl -n hw.ncpu) else NUMPROCS=$(shell nproc) endif endif -RAW_JAVA_VERSION:=$(shell $(JAVA_HOME)/bin/java -version 2>&1) -ifeq (1.8, $(findstring 1.8, $(RAW_JAVA_VERSION))) - JAVA_VERSION=1.8 +RAW_JAVA_VERSION:=$(shell "$(JAVA_HOME)/bin/java" -version 2>&1) +ifeq (11, $(findstring 11, $(findstring "11., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=11 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (12, $(findstring 12, $(findstring "12., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=12 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (13, $(findstring 13, $(findstring "13., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=13 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (14, $(findstring 14, $(findstring "14., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=14 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (15, $(findstring 15, $(findstring "15., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=15 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (16, $(findstring 16, $(findstring "16., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=16 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (17, $(findstring 17, $(findstring "17., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=17 + JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m +else ifeq (18, $(findstring 18, $(findstring "18., $(RAW_JAVA_VERSION)))) + JAVA_VERSION=18 JAVADOCFLAGS=-Xdoclint:none -J-Xmx512m -else ifeq (1.7, $(findstring 1.7, $(RAW_JAVA_VERSION))) - JAVA_VERSION=1.7 - JAVADOCFLAGS=-J-Xmx512m -else ifeq (1.6, $(findstring 1.6, $(RAW_JAVA_VERSION))) - JAVA_VERSION=1.6 - JAVADOCFLAGS=-J-Xmx512m else $(error "Unsupported Java version: $(RAW_JAVA_VERSION)") endif @@ -69,11 +82,11 @@ SCHEMADIR=schemas OVAL_SRC=$(THIRDPARTY)/OVAL/oval-schemas OVAL_SCHEMA=$(SCHEMADIR)/oval BINDINGS=$(SCHEMADIR)/bindings.xjb -CATALOG=schemas.cat +CATALOG=schemas.xml EPISODE=schemas.episode XJCFLAGS=-enableIntrospection -catalog $(CATALOG) -episode $(EPISODE) -XJCFLAGS_EXT=-classpath "$(NAMESPACE_PLUGIN)" $(XJCFLAGS) -extension -Xnamespace-prefix -XJC=$(JAVA) -Djavax.xml.accessExternalSchema=all -Dcom.sun.tools.xjc.XJCFacade.nohack=true -cp $(XJC_LIB) com.sun.tools.xjc.XJCFacade +XJCFLAGS_EXT=$(XJCFLAGS) -extension -Xnamespace-prefix +XJC=$(JAVA) -Djavax.xml.accessExternalSchema=all -Dcom.sun.tools.xjc.XJCFacade.nohack=true -cp "$(XJC_LIBS)" com.sun.tools.xjc.XJCFacade # # Make namespaces optional in the episode bindings @@ -91,6 +104,6 @@ DODARF=$(TOP)/dod-arf DODARF_LIB=$(DODARF)/DoD-ARF-schema.jar THIRDPARTY=$(TOP)/3rd-party -SAXON_LIB=$(THIRDPARTY)/saxon9he.jar -XJC_LIB=$(THIRDPARTY)/jaxb-xjc-2.2.6.jar -NAMESPACE_PLUGIN=$(THIRDPARTY)/jaxb2-namespace-prefix-1.3.jar +SAXON_LIB=$(THIRDPARTY)/Saxon-HE-9.4.jar +JAXB_BIND_API_LIB=$(THIRDPARTY)/jakarta.xml.bind-api-4.0.0.jar +XJC_LIBS=$(THIRDPARTY)/jaxb-xjc-3.0.2.jar$(CLN)$(THIRDPARTY)/jaxb-core-3.0.2.jar$(CLN)$(THIRDPARTY)/jaxb-impl-3.0.2.jar$(CLN)$(JAXB_BIND_API_LIB)$(CLN)$(THIRDPARTY)/jakarta.activation-api-2.1.0.jar$(CLN)$(THIRDPARTY)/istack-commons-runtime-4.1.1.jar$(CLN)$(THIRDPARTY)/jaxb2-namespace-prefix-2.0.jar$(CLN)$(THIRDPARTY)/rngom-4.0.0.jar$(CLN)$(THIRDPARTY)/relaxng-datatype-4.0.0.jar$(CLN)$(THIRDPARTY)/dtd-parser-1.5.0.jar$(CLN)$(THIRDPARTY)/xsom-4.0.0.jar$(CLN)$(THIRDPARTY)/codemodel-4.0.0.jar$(CLN)$(THIRDPARTY)/txw2-4.0.0.jar diff --git a/cyberscope/GNUmakefile b/cyberscope/GNUmakefile index 184ec346d..0b0a8ebe2 100644 --- a/cyberscope/GNUmakefile +++ b/cyberscope/GNUmakefile @@ -4,7 +4,13 @@ TOP=.. include $(TOP)/common.mk -CLASSPATH="$(CLASSLIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" +ifeq (win, $(PLATFORM)) + CLASSPATH="$(shell cygpath -wp $(JAXB_BIND_API_LIB))$(CLN)$(shell cygpath -wp $(SCAP_LIB))$(CLN)$(shell cygpath -wp $(GEN))" + JAVADOCCP="$(shell cygpath -wp $(JAXB_BIND_API_LIB))$(CLN)$(shell cygpath -wp $(SCAP)/$(BUILD))" +else + CLASSPATH="$(JAXB_BIND_API_LIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" + JAVADOCCP="$(JAXB_BIND_API_LIB)$(CLN)$(SCAP)/$(BUILD)" +endif include classes.mk include schemas.mk @@ -20,7 +26,7 @@ $(CYBERSCOPE_LIB): $(GEN) classes resources $(DOCS) $(JAR) cvf $@ -C $(BUILD)/ . $(DOCS): $(GEN) - $(JAVADOC) $(JAVADOCFLAGS) -d $(DOCS) -sourcepath $(GEN) -subpackages cyberscope -classpath $(SCAP)/$(BUILD)/ + $(JAVADOC) $(JAVADOCFLAGS) -d $(DOCS) -sourcepath $(GEN) -subpackages cyberscope -classpath $(JAVADOCCP) clean: rm -f $(EPISODE) diff --git a/cyberscope/pom.xml b/cyberscope/pom.xml new file mode 100644 index 000000000..e18f65aad --- /dev/null +++ b/cyberscope/pom.xml @@ -0,0 +1,172 @@ + + + + + jOVAL + com.joval + poc + + + 4.0.0 + com.joval + cyberscope-schema + ${project.artifactId} + latest + jar + + + + com.joval + scap-schema + latest + + + + + cyberscope-schema + + + + src/main/resources + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + Process episode file for cyberscope + prepare-package + + + + + + + + + + + + + run + + + + + + maven-resources-plugin + ${maven-resources-plugin-version} + + + copy catalog file (schemas.xml) for cyberscope + process-resources + + copy-resources + + + ${project.build.outputDirectory}/cyberscope + + + ${basedir} + + schemas.xml + + false + + + + + + copy registry.ini for cyberscope + process-classes + + copy-resources + + + ${project.build.outputDirectory}/cyberscope + + + ${basedir}/rsrc + + registry.ini + + false + + + + + + copy schemas for cyberscope + process-classes + + copy-resources + + + ${project.build.outputDirectory}/cyberscope/schemas + + + ${SCHEMADIR} + + bindings.xjb + + false + + + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + xjc-cyberscope + generate-sources + + xjc + + + true + true + true + + -Xnamespace-prefix + + schemas.xml + + ${SCHEMADIR}//bindings.xjb + + XmlSchema + + ${SCHEMADIR}/ai-1.0-ea1/asset-identification_1.0.0-ea1.xsd + ${SCHEMADIR}/arf-1.0-ea1/asset-reporting-format_1.0.0-ea1.xsd + ${SCHEMADIR}/lasr-1.0-ea1/lightweight-asset-summary-results_1.0.0-ea1.xsd + ${SCHEMADIR}/oasis/CommonTypes.xsd + ${SCHEMADIR}/oasis/xAL.xsd + ${SCHEMADIR}/oasis/xNL.xsd + ../scap/target/scap-schema-${SCAP_VERSION}.jar + + ${GEN} + + + + + + org.glassfish.jaxb + jaxb-xjc + ${org.glassfish.jaxb.xjc.version} + + + + + + \ No newline at end of file diff --git a/cyberscope/schemas.cat b/cyberscope/schemas.cat deleted file mode 100644 index 3a05b3946..000000000 --- a/cyberscope/schemas.cat +++ /dev/null @@ -1,10 +0,0 @@ -PUBLIC "http://scap.nist.gov/schema/asset-identification/1.0" "schemas/ai-1.0-ea1/asset-identification_1.0.0-ea1.xsd" -PUBLIC "http://scap.nist.gov/schema/asset-reporting-format/1.0" "schemas/arf-1.0-ea1/asset-reporting-format_1.0.0-ea1.xsd" -PUBLIC "http://scap.nist.gov/schema/lightweight-asset-summary-results/1.0" "schemas/lasr-1.0-ea1/lightweight-asset-summary-results_1.0.0-ea1.xsd" -PUBLIC "urn:oasis:names:tc:ciq:ct:3" "schemas/oasis/CommonTypes.xsd" -PUBLIC "urn:oasis:names:tc:ciq:xal:3" "schemas/oasis/xAL.xsd" -PUBLIC "urn:oasis:names:tc:ciq:xnl:3" "schemas/oasis/xNL.xsd" -SYSTEM "datatypes.dtd" "../scap/schemas/xml/datatypes.dtd" -PUBLIC "http://www.w3.org/1999/xlink" "../scap/schemas/xml/xlink.xsd" -PUBLIC "http://www.w3.org/XML/1998/namespace" "../scap/schemas/xml/xml.xsd" -SYSTEM "XMLSchema.dtd" "../scap/schemas/xml/XMLSchema.dtd" diff --git a/cyberscope/schemas.xml b/cyberscope/schemas.xml new file mode 100644 index 000000000..1578ce14f --- /dev/null +++ b/cyberscope/schemas.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/cyberscope/schemas/bindings.xjb b/cyberscope/schemas/bindings.xjb index a6d6eb883..446c5dcf3 100644 --- a/cyberscope/schemas/bindings.xjb +++ b/cyberscope/schemas/bindings.xjb @@ -5,8 +5,8 @@ This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt --> - diff --git a/dod-arf/GNUmakefile b/dod-arf/GNUmakefile index 0a81a245d..cd98ec243 100644 --- a/dod-arf/GNUmakefile +++ b/dod-arf/GNUmakefile @@ -4,7 +4,13 @@ TOP=.. include $(TOP)/common.mk -CLASSPATH="$(CLASSLIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" +ifeq (win, $(PLATFORM)) + CLASSPATH="$(shell cygpath -wp $(JAXB_BIND_API_LIB))$(CLN)$(shell cygpath -wp $(SCAP_LIB))$(CLN)$(shell cygpath -wp $(GEN))" + JAVADOCCP="$(shell cygpath -wp $(JAXB_BIND_API_LIB))$(CLN)$(shell cygpath -wp $(SCAP)/$(BUILD))" +else + CLASSPATH="$(JAXB_BIND_API_LIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" + JAVADOCCP="$(JAXB_BIND_API_LIB)$(CLN)$(SCAP)/$(BUILD)" +endif include classes.mk @@ -19,7 +25,7 @@ $(DODARF_LIB): $(GEN) classes resources $(DOCS) $(JAR) cvf $@ -C $(BUILD)/ . $(DOCS): $(GEN) - $(JAVADOC) $(JAVADOCFLAGS) -d $(DOCS) -sourcepath $(GEN) -subpackages gov:mil.disa -classpath $(SCAP)/$(BUILD)/ + $(JAVADOC) $(JAVADOCFLAGS) -d $(DOCS) -sourcepath $(GEN) -subpackages gov:mil.disa -classpath $(JAVADOCCP) clean: rm -f $(EPISODE) diff --git a/dod-arf/pom.xml b/dod-arf/pom.xml new file mode 100644 index 000000000..863173b8d --- /dev/null +++ b/dod-arf/pom.xml @@ -0,0 +1,188 @@ + + + + + jOVAL + com.joval + poc + + + 4.0.0 + com.joval + DoD-ARF-schema + ${project.artifactId} + latest + jar + + + + com.joval + scap-schema + latest + + + + + DoD-ARF-schema + + + + src/main/resources + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + Deleting core*ObjectFactory.java files for DoD-ARF + process-sources + + + + + + + + + run + + + + Process episode file for DoD-ARF + prepare-package + + + + + + + + + + + + + run + + + + + + maven-resources-plugin + ${maven-resources-plugin-version} + + + copy catalog file (schemas.xml) for DoD-ARF + process-resources + + copy-resources + + + ${project.build.outputDirectory}/dodarf + + + ${basedir} + + schemas.xml + + false + + + + + + copy registry.ini for DoD-ARF + process-classes + + copy-resources + + + ${project.build.outputDirectory}/dodarf + + + ${basedir}/rsrc + + registry.ini + + false + + + + + + copy schemas for DoD-ARF + process-classes + + copy-resources + + + ${project.build.outputDirectory}/dodarf/schemas + + + ${SCHEMADIR} + + bindings.xjb + + false + + + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + xjc-DoD-ARF + generate-sources + + xjc + + + true + true + true + + -Xnamespace-prefix + + schemas.xml + + ${SCHEMADIR}/bindings.xjb + + XmlSchema + + ${SCHEMADIR} + ../scap/target/scap-schema-${SCAP_VERSION}.jar + + + + + \.xjb + + + + ${GEN} + + + + + + org.glassfish.jaxb + jaxb-xjc + ${org.glassfish.jaxb.xjc.version} + + + + + + \ No newline at end of file diff --git a/dod-arf/schemas.cat b/dod-arf/schemas.cat deleted file mode 100644 index 964124da7..000000000 --- a/dod-arf/schemas.cat +++ /dev/null @@ -1,42 +0,0 @@ -OVERRIDE no -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/assessment/0.41" "schemas/assessment.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/assessment_report/0.41" "schemas/assessment_report.xsd" -PUBLIC "http://scap.nist.gov/schema/cce/0.1" "schemas/cce_0.1.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/net_defense/cnd-core/0.41" "schemas/cnd-core.xsd" -PUBLIC "http://cpe.mitre.org/XMLSchema/cpe/1.0" "schemas/cpe-1.0.xsd" -PUBLIC "http://cpe.mitre.org/dictionary/2.0" "../scap/schemas/cpe-2.3/cpe-dictionary_2.3.xsd" -PUBLIC "http://cpe.mitre.org/language/2.0" "../scap/schemas/cpe-2.3/cpe-language_2.3.xsd" -PUBLIC "http://cpe.mitre.org/naming/2.0" "../scap/schemas/cpe-2.3/cpe-naming_2.3.xsd" -PUBLIC "http://scap.nist.gov/schema/cpe-record/0.1" "schemas/cpe-record_0.1.xsd" -PUBLIC "http://scap.nist.gov/schema/cve/0.1" "schemas/cve_0.1.1.xsd" -PUBLIC "http://scap.nist.gov/schema/cvss-v2/0.2" "schemas/cvss-v2_0.2.xsd" -SYSTEM "datatypes.dtd" "../scap/schemas/xml/datatypes.dtd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/device/0.41" "schemas/device_record.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/ext_net_data/0.41" "schemas/ext_net_data.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/geolocation/0.41" "schemas/geolocation.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/global-enumerations/0.41" "schemas/global_enumerations.xsd" -PUBLIC "http://scap.nist.gov/schema/feed/vulnerability/2.0" "schemas/nvd-cve-feed_2.0.xsd" -PUBLIC "http://scap.nist.gov/schema/patch/0.1" "schemas/patch_0.1.xsd" -PUBLIC "http://scap.nist.gov/schema/vulnerability/0.4" "schemas/vulnerability_0.4.1.xsd" -PUBLIC "urn:us:gov:ic:ism:v2" "schemas/IC-ISM-v2.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/ops_attributes/0.41" "schemas/ops_attributes.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/organization/0.41" "schemas/organization.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-common-5" "../scap/schemas/oval/merged/oval-common-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5" "../scap/schemas/oval/merged/oval-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-results-5" "../scap/schemas/oval/merged/oval-results-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5" "../scap/schemas/oval/merged/oval-system-characteristics-schema.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/person/0.41" "schemas/person.xsd" -PUBLIC "http://www.cisecurity.org/xccdf/platform/0.2.3" "schemas/platform-0.2.3.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/replication/0.41" "schemas/replication.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/scan_data/0.41" "schemas/scan_data.xsd" -PUBLIC "http://scap.nist.gov/schema/scap-core/0.1" "schemas/scap-core_0.1.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/security-marking/0.41" "schemas/security_marking.xsd" -PUBLIC "http://purl.org/dc/elements/1.1/" "../scap/schemas/dublin/simpledc20021212.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/netops/shared_data/tagged_value/0.41" "schemas/tagged_value.xsd" -PUBLIC "http://metadata.dod.mil/mdr/ns/ia_cnd/pki/x509_cert/3" "schemas/x509_cert.xsd" -PUBLIC "http://checklists.nist.gov/xccdf/1.1" "schemas/xccdf-1.1.4.xsd" -PUBLIC "http://checklists.nist.gov/xccdf-p/1.1" "schemas/xccdfp-1.1.xsd" -PUBLIC "http://www.w3.org/1999/xlink" "../scap/schemas/xml/xlink.xsd" -PUBLIC "http://www.w3.org/XML/1998/namespace" "../scap/schemas/xml/xml.xsd" -PUBLIC "http://www.w3.org/2000/09/xmldsig#" "../scap/schemas/xml/xmldsig-core-schema.xsd" -SYSTEM "XMLSchema.dtd" "../scap/schemas/xml/XMLSchema.dtd" diff --git a/dod-arf/schemas.xml b/dod-arf/schemas.xml new file mode 100644 index 000000000..a57d35199 --- /dev/null +++ b/dod-arf/schemas.xml @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dod-arf/schemas/bindings.xjb b/dod-arf/schemas/bindings.xjb index 3ef0bf9d3..ebea200da 100644 --- a/dod-arf/schemas/bindings.xjb +++ b/dod-arf/schemas/bindings.xjb @@ -5,8 +5,8 @@ This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt --> - diff --git a/pom.xml b/pom.xml new file mode 100644 index 000000000..8d571ebff --- /dev/null +++ b/pom.xml @@ -0,0 +1,161 @@ + + + + + 4.0.0 + com.joval + jOVAL + poc + + ${project.artifactId} + pom + + + scap + scap-extensions + dod-arf + cyberscope + + + + 11 + 11 + 1.1.0 + 3.1.0 + 3.1.0 + 1.0.2 + 3.3.0 + + 3.4.0 + 3.0.2 + 3.0.1 + 9.4 + + 1.3.0.0.0-9 + 5.11.2 + ${project.build.directory}/gen-src + schemas + <bindings scd="x-schema::tns" + <bindings scd="x-schema::tns" if-exists="true" + + 2.1.0 + 4.0.0 + 2.0 + 1.5.0 + 4.1.1 + 4.0.0 + 4.0.0 + 4.0.0 + + + + + org.jvnet.jaxb2_commons + jaxb2-namespace-prefix + ${jaxb2-namespace-prefix.version} + + + com.sun.xml.dtd-parser + dtd-parser + ${dtd-parser.version} + + + com.sun.istack + istack-commons-runtime + ${istack-commons.version} + + + jakarta.activation + jakarta.activation-api + ${jakarta.activation.version} + + + jakarta.xml.bind + jakarta.xml.bind-api + ${jakarta.xml.bind.version} + + + com.sun.xml.bind.external + relaxng-datatype + ${com.sun.xml.bind.external.version} + + + com.sun.xml.bind.external + rngom + ${com.sun.xml.bind.external.version} + + + org.glassfish.jaxb + txw2 + ${org.glassfish.jaxb.version} + + + org.glassfish.jaxb + xsom + ${org.glassfish.jaxb.version} + + + org.glassfish.jaxb + codemodel + ${org.glassfish.jaxb.version} + + + + + + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version} + + + + set-system-properties + + + + + javax.xml.accessExternalSchema + all + + + javax.xml.accessExternalDTD + all + + + com.sun.tools.xjc.XJCFacade.nohack + true + + + + + + + + + org.apache.maven.plugins + maven-javadoc-plugin + ${maven-javadoc-plugin.version} + + + false + none + public + false + + docs + org:scap + scap/gen-src:scap-extensions/gen-src + + + + + + \ No newline at end of file diff --git a/scap-extensions/GNUmakefile b/scap-extensions/GNUmakefile index 90fad992a..cfb8e240f 100644 --- a/scap-extensions/GNUmakefile +++ b/scap-extensions/GNUmakefile @@ -4,7 +4,7 @@ TOP=.. include $(TOP)/common.mk -CLASSPATH="$(CLASSLIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" +CLASSPATH="$(JAXB_BIND_API_LIB)$(CLN)$(SCAP_LIB)$(CLN)$(GEN)" include classes.mk diff --git a/scap-extensions/pom.xml b/scap-extensions/pom.xml new file mode 100644 index 000000000..db039885a --- /dev/null +++ b/scap-extensions/pom.xml @@ -0,0 +1,188 @@ + + + + + jOVAL + com.joval + poc + + + 4.0.0 + com.joval + scap-schema-extensions + ${project.artifactId} + latest + jar + + + + com.joval + scap-schema + latest + + + + + scap-schema-extensions + + + + src/main/resources + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + Deleting core*ObjectFactory.java files for scap-extensions + process-sources + + + + + + + + + run + + + + Process episode file for scap-extensions + prepare-package + + + + + + + + + + + + + run + + + + + + maven-resources-plugin + ${maven-resources-plugin-version} + + + copy catalog file (schemas.xml) for scap-extensions + process-resources + + copy-resources + + + ${project.build.outputDirectory}/scapx + + + ${basedir} + + schemas.xml + + false + + + + + + copy registry.ini for scap-extensions + process-classes + + copy-resources + + + ${project.build.outputDirectory}/scapx + + + ${basedir}/rsrc + + registry.ini + + false + + + + + + copy schemas for scap-extensions + process-classes + + copy-resources + + + ${project.build.outputDirectory}/scapx/schemas + + + ${SCHEMADIR} + + bindings.xjb + + false + + + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + xjc-scap-extensions + generate-sources + + xjc + + + true + true + true + + -Xnamespace-prefix + + schemas.xml + + ${SCHEMADIR}/bindings.xjb + + XmlSchema + + ${SCHEMADIR} + ../scap/target/scap-schema-${SCAP_VERSION}.jar + + + + + \.xjb + + + + ${GEN} + + + + + + org.glassfish.jaxb + jaxb-xjc + ${org.glassfish.jaxb.xjc.version} + + + + + + \ No newline at end of file diff --git a/scap-extensions/schemas.cat b/scap-extensions/schemas.cat deleted file mode 100644 index 32965dcd8..000000000 --- a/scap-extensions/schemas.cat +++ /dev/null @@ -1,21 +0,0 @@ --- -Copyright (C) 2013-2020 JovalCM.com. All rights reserved. -This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt - - - This is a TR9401 catalog file for experimental schemas that can be found in the OVAL Sandbox. It is an illustration - of how a third-party can extend jOVAL's OVAL data model without directly modifying the scap component. - --- - -OVERRIDE no -PUBLIC "http://oval.mitre.org/XMLSchema/oval-common-5" "../scap/schemas/oval/merged/oval-common-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5" "../scap/schemas/oval/merged/oval-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5" "../scap/schemas/oval/merged/oval-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#nxos" "schemas/x-nxos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#nxos" "schemas/x-nxos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#cmd" "schemas/x-shellcommand-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#cmd" "schemas/x-shellcommand-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#x-protocols" "schemas/x-protocols-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#x-protocols" "schemas/x-protocols-system-characteristics-schema.xsd" -PUBLIC "http://www.w3.org/2000/09/xmldsig#" "../scap/schemas/xml/xmldsig-core-schema.xsd" diff --git a/scap-extensions/schemas.xml b/scap-extensions/schemas.xml new file mode 100644 index 000000000..41132a6eb --- /dev/null +++ b/scap-extensions/schemas.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + diff --git a/scap-extensions/schemas/bindings.xjb b/scap-extensions/schemas/bindings.xjb index feb0bf2b4..d7a1c163e 100644 --- a/scap-extensions/schemas/bindings.xjb +++ b/scap-extensions/schemas/bindings.xjb @@ -5,8 +5,8 @@ This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt --> - diff --git a/scap/GNUmakefile b/scap/GNUmakefile index 0187b973e..22b5c52a1 100644 --- a/scap/GNUmakefile +++ b/scap/GNUmakefile @@ -4,7 +4,7 @@ TOP=.. include $(TOP)/common.mk -CLASSPATH="$(CLASSLIB)$(CLN)$(GEN)" +CLASSPATH="$(JAXB_BIND_API_LIB)$(CLN)$(GEN)" include classes.mk diff --git a/scap/pom.xml b/scap/pom.xml new file mode 100644 index 000000000..480a181f2 --- /dev/null +++ b/scap/pom.xml @@ -0,0 +1,421 @@ + + + + + jOVAL + com.joval + poc + + + 4.0.0 + com.joval + scap-schema + ${project.artifactId} + latest + jar + + + .. + ${TOP}/3rd-party + ${THIRDPARTY}/OVAL/oval-schemas + ${SCHEMADIR}/oval + ${OVAL_SCHEMA}/official + + + + scap-schema-${SCAP_VERSION} + + + + src/main/resources + false + + + + + + org.apache.maven.plugins + maven-antrun-plugin + ${maven-antrun-plugin.version} + + + Copying schema to OVAL official directory + initialize + + + + + + + + + + + + + + + + + + + + + + + + + + + run + + + + Process episode file + prepare-package + + + + + + + + + + + + + run + + + + + + maven-resources-plugin + ${maven-resources-plugin-version} + + + copy catalog file (schemas.xml) + process-resources + + copy-resources + + + ${project.build.outputDirectory}/scap + + + ${basedir} + + schemas.xml + + false + + + + + + copy registry.ini + process-classes + + copy-resources + + + ${project.build.outputDirectory}/scap + + + ${basedir}/rsrc + + registry.ini + + false + + + + + + copy schemas + process-classes + + copy-resources + + + ${project.build.outputDirectory}/scap/schemas + + + ${SCHEMADIR} + + bindings.xjb + + false + + + + + + + + + org.codehaus.mojo + properties-maven-plugin + ${properties-maven-plugin.version} + + + + set-system-properties + + + + + javax.xml.accessExternalSchema + all + + + javax.xml.accessExternalDTD + all + + + com.sun.tools.xjc.XJCFacade.nohack + true + + + + + + + + + org.codehaus.mojo + xml-maven-plugin + ${xml-maven-plugin-version} + + + Transform OVAL Official files with xslt2 + initialize + + transform + + + + + ${OVAL_OFFICIAL} + + oval-common-schema.xsd + + ${OVAL_OFFICIAL} + ${OVAL_SCHEMA}/unofficial/strip-redefined-common.xsl + + + ${OVAL_OFFICIAL} + + independent-*.xsd + + ${OVAL_OFFICIAL} + ${OVAL_SCHEMA}/unofficial/strip-redefined-independent.xsl + + + + + + Schematron Transform ExtractSchFromXSD + initialize + + transform + + + true + + + ${basedir}/schematron + + *.xml + + ${project.build.directory}/gen-sch + ${basedir}/rsrc/ExtractSchFromXSD.xsl + + + schematron.sch + + + + + ${project.build.directory}/gen-sch + + *.sch + + ${project.build.outputDirectory} + ${basedir}/rsrc/iso_svrl_for_xslt1.xsl + + + xsl + + + + + + + + + + net.sf.saxon + Saxon-HE + ${saxon-he-version} + + + + + + org.codehaus.mojo + jaxb2-maven-plugin + ${jaxb2-maven-plugin.version} + + + xjc-scap + generate-sources + + xjc + + + true + true + true + + -Xnamespace-prefix + + schemas.xml + + ${SCHEMADIR}/bindings.xjb + + XmlSchema + + ${SCHEMADIR}/oasis + ${SCHEMADIR}/cce-v5 + ${SCHEMADIR}/dublin + ${SCHEMADIR}/sce-1.0 + ${SCHEMADIR}/ai-1.1 + ${SCHEMADIR}/arf-1.1 + ${SCHEMADIR}/cpe-2.3 + ${SCHEMADIR}/svrl + ${SCHEMADIR}/xml/xhtml1-strict.xsd + ${SCHEMADIR}/xml/xlink.xsd + ${SCHEMADIR}/xml/xmldsig-core-schema.xsd + ${SCHEMADIR}/oval/merged + ${SCHEMADIR}/ds-1.2 + ${SCHEMADIR}/constructs-1.2 + ${SCHEMADIR}/tmsad-1.0 + ${SCHEMADIR}/xccdf-1.2 + ${SCHEMADIR}/joval + ${SCHEMADIR}/ocil-2.0 + + ${GEN} + + + + + + org.glassfish.jaxb + jaxb-xjc + ${org.glassfish.jaxb.xjc.version} + + + + + + + + + + + + \ No newline at end of file diff --git a/scap/schemas.cat b/scap/schemas.cat deleted file mode 100644 index eff702274..000000000 --- a/scap/schemas.cat +++ /dev/null @@ -1,100 +0,0 @@ --- -Copyright (C) 2015 jOVAL.org. All rights reserved. -This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt - - This is a TR9401 catalog file. It has two purposes: - - 1) Is is used for JAXB compilation, being fed into XJC via the -catalog option. - - 2) It is packaged in the schema JAR file, under the scap basename. At runtime, this file is loaded by the - org.joval.xml.SchemaRegistry class, and used to create mappings for an org.w3c.dom.xml.LSResourceResolver. - The resolver uses the ClassLoader to find resources corresponding to [basename]/location, corresponding - to each public or system ID, and the locations that are specified below. This makes it possible to load - a whole multi-part schema, its validator, and its JAXBContext, using just a single JAR file. - --- - -OVERRIDE no -PUBLIC "http://scap.nist.gov/schema/asset-identification/1.1" "schemas/ai-1.1/asset-identification_1.1.0.xsd" -PUBLIC "http://scap.nist.gov/schema/asset-reporting-format/1.1" "schemas/arf-1.1/asset-reporting-format_1.1.0.xsd" -PUBLIC "http://scap.nist.gov/schema/reporting-core/1.1" "schemas/arf-1.1/reporting-core_1.1.0.xsd" -PUBLIC "http://scap.nist.gov/schema/scap/constructs/1.2" "schemas/constructs-1.2/scap-constructs_1.2.xsd" -PUBLIC "http://cce.mitre.org" "schemas/cce-v5/cce-schema.xsd" -PUBLIC "http://cpe.mitre.org/dictionary/2.0" "schemas/cpe-2.3/cpe-dictionary_2.3.xsd" -PUBLIC "http://scap.nist.gov/schema/cpe-extension/2.3" "schemas/cpe-2.3/cpe-dictionary-extension_2.3.xsd" -PUBLIC "http://cpe.mitre.org/language/2.0" "schemas/cpe-2.3/cpe-language_2.3.xsd" -PUBLIC "http://cpe.mitre.org/naming/2.0" "schemas/cpe-2.3/cpe-naming_2.3.xsd" -PUBLIC "http://scap.nist.gov/schema/scap/source/1.2" "schemas/ds-1.2/scap-source-data-stream_1.2.xsd" -PUBLIC "http://purl.org/dc/dcmitype/" "schemas/dublin/dcmitype.xsd" -PUBLIC "http://purl.org/dc/elements/1.1/" "schemas/dublin/dc.xsd" -PUBLIC "http://purl.org/dc/terms/" "schemas/dublin/dcterms.xsd" -PUBLIC "http://www.joval.org/schemas/scap/1.2/diagnostic" "schemas/joval/diagnostic-schema-1.0.xsd" -PUBLIC "http://jovalcm.com/oval/metadata" "schemas/joval/oval-metadata-schema-1.0.xsd" -PUBLIC "urn:oasis:names:tc:entity:xmlns:xml:catalog" "schemas/oasis/catalog-1.1.xsd" -PUBLIC "urn:oasis:names:tc:ciq:xsdschema:xAL:2.0" "schemas/oasis/xAL.xsd" -PUBLIC "urn:oasis:names:tc:ciq:xsdschema:xNL:2.0" "schemas/oasis/xNL.xsd" -PUBLIC "http://scap.nist.gov/schema/ocil/2.0" "schemas/ocil-2.0/ocil-2.0.xsd" -PUBLIC "http://scap.nist.gov/schema/xml-dsig/1.0" "schemas/tmsad-1.0/tmsad_1.0.xsd" -PUBLIC "http://www.gocil.org/schemas/ocil/2.0/diagnostic" "schemas/ocil-2.0/ocil-diagnostic-schema.xsd" -PUBLIC "http://www.gocil.org/schemas/ocil/2.0/variables" "schemas/ocil-2.0/ocil-variables-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-common-5" "schemas/oval/merged/oval-common-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5" "schemas/oval/merged/oval-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5" "schemas/oval/merged/oval-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-results-5" "schemas/oval/merged/oval-results-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#aix" "schemas/oval/merged/aix-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#aix" "schemas/oval/merged/aix-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#android" "schemas/oval/merged/android-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#android" "schemas/oval/merged/android-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#apache" "schemas/oval/merged/apache-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#apache" "schemas/oval/merged/apache-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#apple_ios" "schemas/oval/merged/apple-ios-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#apple_ios" "schemas/oval/merged/apple-ios-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#asa" "schemas/oval/merged/asa-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#asa" "schemas/oval/merged/asa-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#catos" "schemas/oval/merged/catos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#catos" "schemas/oval/merged/catos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#esx" "schemas/oval/merged/esx-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#esx" "schemas/oval/merged/esx-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#freebsd" "schemas/oval/merged/freebsd-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#freebsd" "schemas/oval/merged/freebsd-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#hpux" "schemas/oval/merged/hpux-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#hpux" "schemas/oval/merged/hpux-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" "schemas/oval/merged/independent-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#independent" "schemas/oval/merged/independent-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#ios" "schemas/oval/merged/ios-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#ios" "schemas/oval/merged/ios-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#iosxe" "schemas/oval/merged/iosxe-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#iosxe" "schemas/oval/merged/iosxe-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#junos" "schemas/oval/merged/junos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#junos" "schemas/oval/merged/junos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#linux" "schemas/oval/merged/linux-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#linux" "schemas/oval/merged/linux-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#macos" "schemas/oval/merged/macos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#macos" "schemas/oval/merged/macos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#netconf" "schemas/oval/merged/netconf-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#netconf" "schemas/oval/merged/netconf-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#panos" "schemas/oval/merged/panos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#panos" "schemas/oval/merged/panos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#pixos" "schemas/oval/merged/pixos-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#pixos" "schemas/oval/merged/pixos-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#sharepoint" "schemas/oval/merged/sharepoint-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#sharepoint" "schemas/oval/merged/sharepoint-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#solaris" "schemas/oval/merged/solaris-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#solaris" "schemas/oval/merged/solaris-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" "schemas/oval/merged/unix-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#unix" "schemas/oval/merged/unix-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-definitions-5#windows" "schemas/oval/merged/windows-definitions-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-system-characteristics-5#windows" "schemas/oval/merged/windows-system-characteristics-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-directives-5" "schemas/oval/merged/oval-directives-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/oval-variables-5" "schemas/oval/merged/oval-variables-schema.xsd" -PUBLIC "http://oval.mitre.org/XMLSchema/ovaldi/evalids" "schemas/oval/merged/evaluation-ids.xsd" -PUBLIC "http://open-scap.org/page/SCE_xccdf_stream" "schemas/sce-1.0/sce-1.0-xccdf-extended-component.xsd" -PUBLIC "http://open-scap.org/page/SCE_result_file" "schemas/sce-1.0/sce-result-schema.xsd" -PUBLIC "http://checklists.nist.gov/xccdf/1.2" "schemas/xccdf-1.2/xccdf_1.2.xsd" -SYSTEM "datatypes.dtd" "schemas/xml/datatypes.dtd" -PUBLIC "http://www.w3.org/1999/xhtml" "schemas/xml/xhtml1-strict.xsd" -PUBLIC "http://www.w3.org/1999/xlink" "schemas/xml/xlink.xsd" -PUBLIC "http://www.w3.org/XML/1998/namespace" "schemas/xml/xml.xsd" -PUBLIC "http://www.w3.org/2000/09/xmldsig#" "schemas/xml/xmldsig-core-schema.xsd" -SYSTEM "XMLSchema.dtd" "schemas/xml/XMLSchema.dtd" -PUBLIC "http://purl.oclc.org/dsdl/svrl" "schemas/svrl/svrl.xsd" diff --git a/scap/schemas.xml b/scap/schemas.xml new file mode 100644 index 000000000..719ca2909 --- /dev/null +++ b/scap/schemas.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scap/schemas/bindings.xjb b/scap/schemas/bindings.xjb index bd59f0bd0..402981eee 100644 --- a/scap/schemas/bindings.xjb +++ b/scap/schemas/bindings.xjb @@ -5,8 +5,8 @@ This software is licensed under the LGPL 3.0 license available at http://www.gnu.org/licenses/lgpl.txt --> -