Skip to content

Commit 20ee67c

Browse files
gtbackgtback
committed
Update external schemas to use local copy of CybOX with correct namespace
1 parent d3ac0d8 commit 20ee67c

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

‎external/capec_2.7/ap_schema_v2.7.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:capec="http://capec.mitre.org/capec-2"
3-
xmlns:cybox="http://cybox.mitre.org/cybox-2" targetNamespace="http://capec.mitre.org/capec-2"
3+
xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2" targetNamespace="http://capec.mitre.org/capec-2"
44
elementFormDefault="qualified" attributeFormDefault="unqualified" version="2.7">
5-
<xs:import namespace="http://cybox.mitre.org/cybox-2"
5+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/core-2"
66
schemaLocation="../../cybox/core.xsd"/>
77
<xs:element name="Attack_Pattern_Catalog">
88
<xs:annotation>

‎external/maec_4.1/maec_bundle_schema.xsd‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:maecVocabs="http://maec.mitre.org/default_vocabularies-1" xmlns:maecBundle="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:cyboxVocabs="http://cybox.mitre.org/default_vocabularies-2" xmlns:cybox="http://cybox.mitre.org/cybox-2" xmlns:cyboxCommon="http://cybox.mitre.org/common-2" xmlns:ProcessObj="http://cybox.mitre.org/objects#ProcessObject-2" xmlns:CodeObj="http://cybox.mitre.org/objects#CodeObject-2" version="4.1">
3-
<xs:import namespace="http://cybox.mitre.org/cybox-2" schemaLocation="../../cybox/core.xsd"/>
4-
<xs:import namespace="http://cybox.mitre.org/common-2" schemaLocation="../../cybox/common.xsd"/>
5-
<xs:import namespace="http://cybox.mitre.org/objects#CodeObject-2" schemaLocation="../../cybox/objects/Code_Object.xsd"/>
2+
<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:maecVocabs="http://maec.mitre.org/default_vocabularies-1" xmlns:maecBundle="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:cyboxVocabs="http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2" xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2" xmlns:cyboxCommon="http://docs.oasis-open.org/cti/ns/cybox/common-2" xmlns:ProcessObj="http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" xmlns:CodeObj="http://docs.oasis-open.org/cti/ns/cybox/objects/code-2" version="4.1">
3+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/core-2" schemaLocation="../../cybox/core.xsd"/>
4+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/common-2" schemaLocation="../../cybox/common.xsd"/>
5+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/objects/code-2" schemaLocation="../../cybox/objects/Code_Object.xsd"/>
66
<xs:annotation>
77
<xs:documentation>The following is a description of the elements, types, and attributes that compose Malware Attribute Enumeration and Characterization (MAEC) Bundle schema.</xs:documentation>
88
<xs:documentation>The MAEC Bundle Schema is maintained by The Mitre Corporation. For more information, including how to get involved in the project, please visit the MAEC website at http://maec.mitre.org.</xs:documentation>
9-
<xs:documentation>This schema imports the CyBOX schema and object schemas. More info on CybOX can be found at http://cybox.mitre.org.</xs:documentation>
9+
<xs:documentation>This schema imports the CyBOX schema and object schemas. More info on CybOX can be found at http://cyboxproject.github.io.</xs:documentation>
1010
<xs:appinfo>
1111
<schema>MAEC Bundle Schema</schema>
1212
<version>4.1</version>
1313
<date>02/11/2014</date>
1414
<terms_of_use>Copyright (c) 2012-2014, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the MAEC License located at http://maec.mitre.org/about/termsofuse.html. See the MAEC License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the MAEC Schema, this license header must be included.</terms_of_use>
1515
</xs:appinfo>
1616
</xs:annotation>
17-
<xs:import namespace="http://cybox.mitre.org/objects#ProcessObject-2" schemaLocation="../../cybox/objects/Process_Object.xsd"/>
18-
<xs:import namespace="http://cybox.mitre.org/default_vocabularies-2" schemaLocation="../../cybox/default_vocabularies.xsd"/>
17+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/objects/process-2" schemaLocation="../../cybox/objects/Process_Object.xsd"/>
18+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/vocabularies-2" schemaLocation="../../cybox/default_vocabularies.xsd"/>
1919
<xs:import namespace="http://maec.mitre.org/default_vocabularies-1" schemaLocation="maec_default_vocabularies.xsd"/>
2020
<xs:element name="MAEC_Bundle" type="maecBundle:BundleType">
2121
<xs:annotation>

‎external/maec_4.1/maec_default_vocabularies.xsd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cyboxCommon="http://cybox.mitre.org/common-2" xmlns:maecVocabs="http://maec.mitre.org/default_vocabularies-1" targetNamespace="http://maec.mitre.org/default_vocabularies-1" elementFormDefault="qualified" version="1.1">
2+
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:cyboxCommon="http://docs.oasis-open.org/cti/ns/cybox/common-2" xmlns:maecVocabs="http://maec.mitre.org/default_vocabularies-1" targetNamespace="http://maec.mitre.org/default_vocabularies-1" elementFormDefault="qualified" version="1.1">
33
<xs:annotation>
44
<xs:documentation>This schema was originally developed by The MITRE Corporation. The MAEC XML Schema implementation is maintained by The MITRE Corporation and developed by the open MAEC Community. For more information, including how to get involved in the effort and how to submit change requests, please visit the MAEC website at http://maec.mitre.org. </xs:documentation>
55
<xs:appinfo>
@@ -10,7 +10,7 @@
1010
<terms_of_use>Copyright (c) 2012-2014, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the MAEC License located at http://maec.mitre.org/about/termsofuse.html. See the MAEC License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the MAEC Schema, this license header must be included. </terms_of_use>
1111
</xs:appinfo>
1212
</xs:annotation>
13-
<xs:import namespace="http://cybox.mitre.org/common-2" schemaLocation="../../cybox/common.xsd"/>
13+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/common-2" schemaLocation="../../cybox/common.xsd"/>
1414
<xs:complexType name="ActionObjectAssociationTypeVocab-1.0">
1515
<xs:annotation>
1616
<xs:documentation>The ActionObjectAssocationVocab is the default MAEC vocabulary for Action-Object association types, captured via the AssociatedObjectType/Association_Type element in CybOX Core.</xs:documentation>

‎external/maec_4.1/maec_package_schema.xsd‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://maec.mitre.org/XMLSchema/maec-package-2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:maecPackage="http://maec.mitre.org/XMLSchema/maec-package-2" xmlns:maecBundle="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:metadata="http://xml/metadataSharing.xsd" xmlns:cybox="http://cybox.mitre.org/cybox-2" xmlns:cyboxCommon="http://cybox.mitre.org/common-2" xmlns:FileObj="http://cybox.mitre.org/objects#FileObject-2" xmlns:URIObj="http://cybox.mitre.org/objects#URIObject-2" xmlns:SystemObj="http://cybox.mitre.org/objects#SystemObject-2" version="2.1">
2+
<xs:schema elementFormDefault="qualified" attributeFormDefault="unqualified" targetNamespace="http://maec.mitre.org/XMLSchema/maec-package-2" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:maecPackage="http://maec.mitre.org/XMLSchema/maec-package-2" xmlns:maecBundle="http://maec.mitre.org/XMLSchema/maec-bundle-4" xmlns:metadata="http://xml/metadataSharing.xsd" xmlns:cybox="http://docs.oasis-open.org/cti/ns/cybox/core-2" xmlns:cyboxCommon="http://docs.oasis-open.org/cti/ns/cybox/common-2" xmlns:FileObj="http://docs.oasis-open.org/cti/ns/cybox/objects/file-2" xmlns:URIObj="http://docs.oasis-open.org/cti/ns/cybox/objects/uri-2" xmlns:SystemObj="http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" version="2.1">
33
<xs:import namespace="http://maec.mitre.org/XMLSchema/maec-bundle-4" schemaLocation="maec_bundle_schema.xsd"/>
44
<xs:import namespace="http://xml/metadataSharing.xsd" schemaLocation="metadataSharing.xsd"/>
5-
<xs:import namespace="http://cybox.mitre.org/cybox-2" schemaLocation="../../cybox/core.xsd"/>
6-
<xs:import namespace="http://cybox.mitre.org/objects#SystemObject-2" schemaLocation="../../cybox/objects/System_Object.xsd"/>
7-
<xs:import namespace="http://cybox.mitre.org/common-2" schemaLocation="../../cybox/common.xsd"/>
5+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/core-2" schemaLocation="../../cybox/core.xsd"/>
6+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/objects/system-2" schemaLocation="../../cybox/objects/System_Object.xsd"/>
7+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/common-2" schemaLocation="../../cybox/common.xsd"/>
88
<xs:annotation>
99
<xs:documentation>The following is a description of the elements, types, and attributes that compose the Malware Attribute Enumeration and Characterization (MAEC) package schema.</xs:documentation>
1010
<xs:documentation>The MAEC Package Schema is maintained by The Mitre Corporation. For more information, including how to get involved in the project, please visit the MAEC website at http://maec.mitre.org.</xs:documentation>
@@ -16,8 +16,8 @@
1616
<terms_of_use>Copyright (c) 2012-2014, The MITRE Corporation. All rights reserved. The contents of this file are subject to the terms of the MAEC License located at http://maec.mitre.org/about/termsofuse.html. See the MAEC License for the specific language governing permissions and limitations for use of this schema. When distributing copies of the MAEC Schema, this license header must be included.</terms_of_use>
1717
</xs:appinfo>
1818
</xs:annotation>
19-
<xs:import namespace="http://cybox.mitre.org/objects#URIObject-2" schemaLocation="../../cybox/objects/URI_Object.xsd"/>
20-
<xs:import namespace="http://cybox.mitre.org/objects#FileObject-2" schemaLocation="../../cybox/objects/File_Object.xsd"/>
19+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/objects/uri-2" schemaLocation="../../cybox/objects/URI_Object.xsd"/>
20+
<xs:import namespace="http://docs.oasis-open.org/cti/ns/cybox/objects/file-2" schemaLocation="../../cybox/objects/File_Object.xsd"/>
2121
<xs:element name="MAEC_Package" type="maecPackage:PackageType">
2222
<xs:annotation>
2323
<xs:documentation>The root element of the MAEC Package schema is the MAEC_Package, which captures a single MAEC Package that encompasses one or more Malware Subjects and all of their associated MAEC entities.</xs:documentation>

0 commit comments

Comments
 (0)