diff --git a/tools/tcg_rim_tool/build.gradle b/tools/tcg_rim_tool/build.gradle index e68d74b08..f7785668b 100644 --- a/tools/tcg_rim_tool/build.gradle +++ b/tools/tcg_rim_tool/build.gradle @@ -44,7 +44,6 @@ dependencies { testImplementation libs.testng } - test { testLogging.showStandardStreams true } diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java index 3ca76778e..6332f1c1e 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagConstants.java @@ -12,15 +12,15 @@ */ public class SwidTagConstants { - public static final String DEFAULT_KEYSTORE_FILE = "/opt/hirs/rimtool/keystore.jks"; + public static final String DEFAULT_KEYSTORE_FILE = "/opt/hirs/rimtool/data/keystore.jks"; public static final String DEFAULT_KEYSTORE_PASSWORD = "password"; public static final String DEFAULT_PRIVATE_KEY_ALIAS = "selfsigned"; - public static final String DEFAULT_ATTRIBUTES_FILE = "/opt/hirs/rimtool/rim_fields.json"; + public static final String DEFAULT_ATTRIBUTES_FILE = "/opt/hirs/rimtool/data/rim_fields.json"; public static final String DEFAULT_ENGLISH = "en"; public static final String SIGNATURE_ALGORITHM_RSA_SHA256 = "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"; - public static final String SCHEMA_PACKAGE = "hirs.swid.xjc"; + public static final String SCHEMA_PACKAGE = "hirs.utils.xjc"; public static final String SCHEMA_LANGUAGE = XMLConstants.W3C_XML_SCHEMA_NS_URI; public static final String SCHEMA_URL = "swid_schema.xsd"; diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java index 9c9af6050..d596f0fb9 100644 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java +++ b/tools/tcg_rim_tool/src/main/java/hirs/swid/SwidTagGateway.java @@ -1,13 +1,13 @@ package hirs.swid; import hirs.swid.utils.HashSwid; -import hirs.swid.xjc.Directory; -import hirs.swid.xjc.Entity; -import hirs.swid.xjc.Link; -import hirs.swid.xjc.ObjectFactory; -import hirs.swid.xjc.ResourceCollection; -import hirs.swid.xjc.SoftwareIdentity; -import hirs.swid.xjc.SoftwareMeta; +import hirs.utils.xjc.Directory; +import hirs.utils.xjc.Entity; +import hirs.utils.xjc.Link; +import hirs.utils.xjc.ObjectFactory; +import hirs.utils.xjc.ResourceCollection; +import hirs.utils.xjc.SoftwareIdentity; +import hirs.utils.xjc.SoftwareMeta; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -15,10 +15,10 @@ import javax.json.JsonException; import javax.json.JsonObject; import javax.json.JsonReader; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; +import jakarta.xml.bind.JAXBContext; +import jakarta.xml.bind.JAXBElement; +import jakarta.xml.bind.JAXBException; +import jakarta.xml.bind.Marshaller; import javax.xml.crypto.MarshalException; import javax.xml.crypto.XMLStructure; import javax.xml.crypto.dom.DOMStructure; @@ -228,7 +228,7 @@ public void generateSwidTag(final String filename) { configProperties.getJsonObject(SwidTagConstants.PAYLOAD) .getJsonObject(SwidTagConstants.DIRECTORY)); //File - hirs.swid.xjc.File file = createFile( + hirs.utils.xjc.File file = createFile( configProperties.getJsonObject(SwidTagConstants.PAYLOAD) .getJsonObject(SwidTagConstants.DIRECTORY) .getJsonObject(SwidTagConstants.FILE)); @@ -489,15 +489,15 @@ private Directory createDirectory(final JsonObject jsonObject) { } /** - * This method creates a hirs.swid.xjc.File from an indirect payload type + * This method creates a hirs.utils.xjc.File from an indirect payload type * using parameters read in from a properties file and then * calculating the hash of a given event log support RIM. * * @param jsonObject the Properties object containing parameters from file * @return File object created from the properties */ - private hirs.swid.xjc.File createFile(JsonObject jsonObject) throws Exception { - hirs.swid.xjc.File file = objectFactory.createFile(); + private hirs.utils.xjc.File createFile(JsonObject jsonObject) throws Exception { + hirs.utils.xjc.File file = objectFactory.createFile(); file.setName(jsonObject.getString(SwidTagConstants.NAME, "")); Map attributes = file.getOtherAttributes(); String supportRimFormat = jsonObject.getString(SwidTagConstants.SUPPORT_RIM_FORMAT, @@ -549,16 +549,27 @@ private void addNonNullAttribute(final Map attributes, * This method signs a SoftwareIdentity with an xmldsig in compatibility mode. * Current assumptions: digest method SHA256, signature method SHA256, enveloped signature */ - private Document signXMLDocument(JAXBElement swidTag) throws Exception { + private Document signXMLDocument(JAXBElement swidTag) { Document doc = null; try { doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().newDocument(); marshaller.marshal(swidTag, doc); - XMLSignatureFactory sigFactory = XMLSignatureFactory.getInstance("DOM"); - List xmlObjectList = null; - String signatureId = null; + } catch (ParserConfigurationException e) { + System.out.println("Error instantiating Document object for parsing swidtag: " + + e.getMessage()); + System.exit(1); + } catch (JAXBException e) { + System.out.println("Error while marshaling swidtag: " + e.getMessage()); + e.printStackTrace(); + System.exit(1); + } + XMLSignatureFactory sigFactory = XMLSignatureFactory.getInstance("DOM"); + List xmlObjectList = null; + String signatureId = null; - Reference documentRef = sigFactory.newReference( + Reference documentRef = null; + try { + documentRef = sigFactory.newReference( "", sigFactory.newDigestMethod(DigestMethod.SHA256, null), Collections.singletonList(sigFactory.newTransform(Transform.ENVELOPED, @@ -566,78 +577,97 @@ private Document signXMLDocument(JAXBElement swidTag) throws E null, null ); + } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException e) { + System.out.println("Error while creating enveloped signature Reference: " + + e.getMessage()); + System.exit(1); + } - List refList = new ArrayList(); - refList.add(documentRef); + List refList = new ArrayList(); + refList.add(documentRef); - if (!timestampFormat.isEmpty()) { - Reference timestampRef = sigFactory.newReference( + if (!timestampFormat.isEmpty()) { + Reference timestampRef = null; + try { + timestampRef = sigFactory.newReference( "#TST", sigFactory.newDigestMethod(DigestMethod.SHA256, null) ); - refList.add(timestampRef); - xmlObjectList = Collections.singletonList(createXmlTimestamp(doc, sigFactory)); - signatureId = "RimSignature"; + } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException e) { + System.out.println("Error while creating timestamp Reference: " + + e.getMessage()); + System.exit(1); } - - SignedInfo signedInfo = sigFactory.newSignedInfo( + refList.add(timestampRef); + xmlObjectList = Collections.singletonList(createXmlTimestamp(doc, sigFactory)); + signatureId = "RimSignature"; + } + SignedInfo signedInfo = null; + try { + signedInfo = sigFactory.newSignedInfo( sigFactory.newCanonicalizationMethod(CanonicalizationMethod.INCLUSIVE, (C14NMethodParameterSpec) null), sigFactory.newSignatureMethod(SwidTagConstants.SIGNATURE_ALGORITHM_RSA_SHA256, null), refList ); - List keyInfoElements = new ArrayList(); - - KeyInfoFactory kiFactory = sigFactory.getKeyInfoFactory(); - PrivateKey privateKey; - CredentialParser cp = new CredentialParser(); - if (defaultCredentials) { - cp.parseJKSCredentials(jksTruststoreFile); - privateKey = cp.getPrivateKey(); - KeyName keyName = kiFactory.newKeyName(cp.getCertificateSubjectKeyIdentifier()); - keyInfoElements.add(keyName); - } else { + } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException e) { + System.out.println("Error while creating SignedInfo: " + e.getMessage()); + System.exit(1); + } + List keyInfoElements = new ArrayList(); + + KeyInfoFactory kiFactory = sigFactory.getKeyInfoFactory(); + PrivateKey privateKey; + CredentialParser cp = new CredentialParser(); + if (defaultCredentials) { + cp.parseJKSCredentials(jksTruststoreFile); + privateKey = cp.getPrivateKey(); + KeyName keyName = null; + try { + keyName = kiFactory.newKeyName(cp.getCertificateSubjectKeyIdentifier()); + } catch (IOException e) { + System.out.println("Error while getting SKID: " + e.getMessage()); + System.exit(1); + } + keyInfoElements.add(keyName); + } else { + try { cp.parsePEMCredentials(pemCertificateFile, pemPrivateKeyFile); - X509Certificate certificate = cp.getCertificate(); - privateKey = cp.getPrivateKey(); - if (embeddedCert) { - ArrayList x509Content = new ArrayList(); - x509Content.add(certificate.getSubjectX500Principal().getName()); - x509Content.add(certificate); - X509Data data = kiFactory.newX509Data(x509Content); - keyInfoElements.add(data); - } else { + } catch (Exception e) { + System.out.println("Error while parsing PEM files: " + e.getMessage()); + System.exit(1); + } + X509Certificate certificate = cp.getCertificate(); + privateKey = cp.getPrivateKey(); + if (embeddedCert) { + ArrayList x509Content = new ArrayList(); + x509Content.add(certificate.getSubjectX500Principal().getName()); + x509Content.add(certificate); + X509Data data = kiFactory.newX509Data(x509Content); + keyInfoElements.add(data); + } else { + try { keyInfoElements.add(kiFactory.newKeyValue(certificate.getPublicKey())); + } catch (KeyException e) { + System.out.println("Error while creating KeyValue: " + e.getMessage()); } } - KeyInfo keyinfo = kiFactory.newKeyInfo(keyInfoElements); - - DOMSignContext context = new DOMSignContext(privateKey, doc.getDocumentElement()); - XMLSignature signature = sigFactory.newXMLSignature( - signedInfo, - keyinfo, - xmlObjectList, - signatureId, - null - ); + } + KeyInfo keyinfo = kiFactory.newKeyInfo(keyInfoElements); + + DOMSignContext context = new DOMSignContext(privateKey, doc.getDocumentElement()); + XMLSignature signature = sigFactory.newXMLSignature( + signedInfo, + keyinfo, + xmlObjectList, + signatureId, + null + ); + try { signature.sign(context); - } catch (FileNotFoundException e) { - System.out.println("Keystore not found! " + e.getMessage()); - } catch (IOException e) { - System.out.println("Error loading keystore: " + e.getMessage()); - } catch (NoSuchAlgorithmException | InvalidAlgorithmParameterException | - ParserConfigurationException e) { - System.out.println(e.getMessage()); - } catch (CertificateException e) { - System.out.println(e.getMessage()); - } catch (JAXBException e) { - System.out.println("Error marshaling signed swidtag: " + e.getMessage()); } catch (MarshalException | XMLSignatureException e) { - System.out.println("Error while signing SoftwareIdentity: " + e.getMessage()); - } catch (KeyException e) { - System.out.println("Public key algorithm not recognized or supported: " - + e.getMessage()); + System.out.println("Error while signing the swidtag: " + e.getMessage()); } return doc; diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/BaseElement.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/BaseElement.java deleted file mode 100644 index 2053fdc4a..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/BaseElement.java +++ /dev/null @@ -1,97 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.HashMap; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -/** - * - * Attributes common to all Elements in this schema - * - * - *

- * Java class for BaseElement complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="BaseElement">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "BaseElement", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -@XmlSeeAlso({ SoftwareIdentity.class, Entity.class, Link.class, Meta.class, - ResourceCollection.class }) -public class BaseElement { - - @XmlAttribute(name = "lang", namespace = "http://www.w3.org/XML/1998/namespace") - protected String lang; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * - * Allow xml:lang attribute on any element. - * - * - * @return possible object is {@link String } - * - */ - public String getLang() { - return lang; - } - - /** - * Sets the value of the lang property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setLang(String value) { - this.lang = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed - * property on this class. - * - *

- * the map is keyed by the name of the attribute and the value is the string - * value of the attribute. - * - * the map returned by this method is live, and you can add new attribute by - * updating the map directly. Because of this design, there's no setter. - * - * - * @return always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/CanonicalizationMethodType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/CanonicalizationMethodType.java deleted file mode 100644 index fa716d61d..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/CanonicalizationMethodType.java +++ /dev/null @@ -1,105 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for CanonicalizationMethodType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="CanonicalizationMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CanonicalizationMethodType", propOrder = { "content" }) -public class CanonicalizationMethodType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Object } - * {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the algorithm property. - * - * @return possible object is {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DSAKeyValueType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DSAKeyValueType.java deleted file mode 100644 index ab58022a3..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DSAKeyValueType.java +++ /dev/null @@ -1,200 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for DSAKeyValueType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="DSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <sequence minOccurs="0">
- *           <element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *         <element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
- *         <sequence minOccurs="0">
- *           <element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *           <element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         </sequence>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DSAKeyValueType", propOrder = { "p", "q", "g", "y", "j", - "seed", "pgenCounter" }) -public class DSAKeyValueType { - - @XmlElement(name = "P") - protected byte[] p; - @XmlElement(name = "Q") - protected byte[] q; - @XmlElement(name = "G") - protected byte[] g; - @XmlElement(name = "Y", required = true) - protected byte[] y; - @XmlElement(name = "J") - protected byte[] j; - @XmlElement(name = "Seed") - protected byte[] seed; - @XmlElement(name = "PgenCounter") - protected byte[] pgenCounter; - - /** - * Gets the value of the p property. - * - * @return possible object is byte[] - */ - public byte[] getP() { - return p; - } - - /** - * Sets the value of the p property. - * - * @param value - * allowed object is byte[] - */ - public void setP(byte[] value) { - this.p = value; - } - - /** - * Gets the value of the q property. - * - * @return possible object is byte[] - */ - public byte[] getQ() { - return q; - } - - /** - * Sets the value of the q property. - * - * @param value - * allowed object is byte[] - */ - public void setQ(byte[] value) { - this.q = value; - } - - /** - * Gets the value of the g property. - * - * @return possible object is byte[] - */ - public byte[] getG() { - return g; - } - - /** - * Sets the value of the g property. - * - * @param value - * allowed object is byte[] - */ - public void setG(byte[] value) { - this.g = value; - } - - /** - * Gets the value of the y property. - * - * @return possible object is byte[] - */ - public byte[] getY() { - return y; - } - - /** - * Sets the value of the y property. - * - * @param value - * allowed object is byte[] - */ - public void setY(byte[] value) { - this.y = value; - } - - /** - * Gets the value of the j property. - * - * @return possible object is byte[] - */ - public byte[] getJ() { - return j; - } - - /** - * Sets the value of the j property. - * - * @param value - * allowed object is byte[] - */ - public void setJ(byte[] value) { - this.j = value; - } - - /** - * Gets the value of the seed property. - * - * @return possible object is byte[] - */ - public byte[] getSeed() { - return seed; - } - - /** - * Sets the value of the seed property. - * - * @param value - * allowed object is byte[] - */ - public void setSeed(byte[] value) { - this.seed = value; - } - - /** - * Gets the value of the pgenCounter property. - * - * @return possible object is byte[] - */ - public byte[] getPgenCounter() { - return pgenCounter; - } - - /** - * Sets the value of the pgenCounter property. - * - * @param value - * allowed object is byte[] - */ - public void setPgenCounter(byte[] value) { - this.pgenCounter = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DigestMethodType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DigestMethodType.java deleted file mode 100644 index effc1e5d1..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/DigestMethodType.java +++ /dev/null @@ -1,106 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for DigestMethodType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="DigestMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DigestMethodType", propOrder = { "content" }) -public class DigestMethodType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Element } - * {@link Object } {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the algorithm property. - * - * @return possible object is {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Directory.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Directory.java deleted file mode 100644 index 4cef3a38e..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Directory.java +++ /dev/null @@ -1,80 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Directory complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Directory">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}FilesystemItem">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element name="Directory" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Directory"/>
- *         <element name="File" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}File"/>
- *       </choice>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Directory", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", propOrder = { "directoryOrFile" }) -public class Directory extends FilesystemItem { - - @XmlElements({ @XmlElement(name = "Directory", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = Directory.class, required = false), - @XmlElement(name = "File", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = File.class, required = false) }) - protected List directoryOrFile; - - /** - * Gets the value of the directoryOrFile property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the directoryOrFile property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getDirectoryOrFile().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Directory } {@link File } - * - * - */ - public List getDirectoryOrFile() { - if (directoryOrFile == null) { - directoryOrFile = new ArrayList(); - } - return this.directoryOrFile; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Entity.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Entity.java deleted file mode 100644 index 40f159eac..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Entity.java +++ /dev/null @@ -1,188 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Entity complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Entity">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}BaseElement">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <element name="Meta" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Meta"/>
- *       </sequence>
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="regid" type="{http://www.w3.org/2001/XMLSchema}anyURI" default="http://invalid.unavailable" />
- *       <attribute name="role" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKENS" />
- *       <attribute name="thumbprint" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Entity", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", propOrder = { "meta" }) -public class Entity extends BaseElement { - - @XmlElement(name = "Meta") - protected List meta; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "regid") - @XmlSchemaType(name = "anyURI") - protected String regid; - @XmlAttribute(name = "role", required = true) - @XmlSchemaType(name = "NMTOKENS") - protected List role; - @XmlAttribute(name = "thumbprint") - protected String thumbprint; - - /** - * Gets the value of the meta property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the meta property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getMeta().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Meta } - * - * - */ - public List getMeta() { - if (meta == null) { - meta = new ArrayList(); - } - return this.meta; - } - - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the regid property. - * - * @return possible object is {@link String } - * - */ - public String getRegid() { - if (regid == null) { - return "http://invalid.unavailable"; - } else { - return regid; - } - } - - /** - * Sets the value of the regid property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setRegid(String value) { - this.regid = value; - } - - /** - * Gets the value of the role property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the role property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getRole().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link String } - * - * - */ - public List getRole() { - if (role == null) { - role = new ArrayList(); - } - return this.role; - } - - /** - * Gets the value of the thumbprint property. - * - * @return possible object is {@link String } - * - */ - public String getThumbprint() { - return thumbprint; - } - - /** - * Sets the value of the thumbprint property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setThumbprint(String value) { - this.thumbprint = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Evidence.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Evidence.java deleted file mode 100644 index 37e96f3f8..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Evidence.java +++ /dev/null @@ -1,91 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.datatype.XMLGregorianCalendar; - -/** - *

- * Java class for Evidence complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Evidence">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}ResourceCollection">
- *       <attribute name="date" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       <attribute name="deviceId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Evidence", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class Evidence extends ResourceCollection { - - @XmlAttribute(name = "date") - @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar date; - @XmlAttribute(name = "deviceId") - protected String deviceId; - - /** - * Gets the value of the date property. - * - * @return possible object is {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getDate() { - return date; - } - - /** - * Sets the value of the date property. - * - * @param value - * allowed object is {@link XMLGregorianCalendar } - * - */ - public void setDate(XMLGregorianCalendar value) { - this.date = value; - } - - /** - * Gets the value of the deviceId property. - * - * @return possible object is {@link String } - * - */ - public String getDeviceId() { - return deviceId; - } - - /** - * Sets the value of the deviceId property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setDeviceId(String value) { - this.deviceId = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/File.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/File.java deleted file mode 100644 index 3a1411fd2..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/File.java +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for File complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="File">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}FilesystemItem">
- *       <attribute name="size" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "File", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class File extends FilesystemItem { - - @XmlAttribute(name = "size") - protected BigInteger size; - @XmlAttribute(name = "version") - protected String version; - - /** - * Gets the value of the size property. - * - * @return possible object is {@link BigInteger } - * - */ - public BigInteger getSize() { - return size; - } - - /** - * Sets the value of the size property. - * - * @param value - * allowed object is {@link BigInteger } - * - */ - public void setSize(BigInteger value) { - this.size = value; - } - - /** - * Gets the value of the version property. - * - * @return possible object is {@link String } - * - */ - public String getVersion() { - return version; - } - - /** - * Sets the value of the version property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setVersion(String value) { - this.version = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/FilesystemItem.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/FilesystemItem.java deleted file mode 100644 index cc73f2126..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/FilesystemItem.java +++ /dev/null @@ -1,138 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for FilesystemItem complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="FilesystemItem">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Meta">
- *       <attribute name="key" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="location" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="root" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "FilesystemItem", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -@XmlSeeAlso({ File.class, Directory.class }) -public class FilesystemItem extends Meta { - - @XmlAttribute(name = "key") - protected Boolean key; - @XmlAttribute(name = "location") - protected String location; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "root") - protected String root; - - /** - * Gets the value of the key property. - * - * @return possible object is {@link Boolean } - * - */ - public Boolean isKey() { - return key; - } - - /** - * Sets the value of the key property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setKey(Boolean value) { - this.key = value; - } - - /** - * Gets the value of the location property. - * - * @return possible object is {@link String } - * - */ - public String getLocation() { - return location; - } - - /** - * Sets the value of the location property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setLocation(String value) { - this.location = value; - } - - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the root property. - * - * @return possible object is {@link String } - * - */ - public String getRoot() { - return root; - } - - /** - * Sets the value of the root property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setRoot(String value) { - this.root = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyInfoType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyInfoType.java deleted file mode 100644 index 766750ec9..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyInfoType.java +++ /dev/null @@ -1,135 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3c.dom.Element; - -/** - *

- * Java class for KeyInfoType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="KeyInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KeyInfoType", propOrder = { "content" }) -public class KeyInfoType { - - @XmlElementRefs({ - @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link String } - * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >} {@link Element } - * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} - * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement } - * {@code <}{@link X509DataType }{@code >} {@link JAXBElement }{@code <} - * {@link PGPDataType }{@code >} {@link JAXBElement }{@code <}{@link String } - * {@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyValueType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyValueType.java deleted file mode 100644 index d9fa96f7b..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/KeyValueType.java +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for KeyValueType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="KeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "KeyValueType", propOrder = { "content" }) -public class KeyValueType { - - @XmlElementRefs({ - @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Object } - * {@link String } {@link JAXBElement }{@code <}{@link RSAKeyValueType } - * {@code >} {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} - * {@link Element } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Link.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Link.java deleted file mode 100644 index 963f43d66..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Link.java +++ /dev/null @@ -1,214 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for Link complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Link">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}BaseElement">
- *       <attribute name="artifact" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="href" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="media" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Media" />
- *       <attribute name="ownership" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Ownership" />
- *       <attribute name="rel" use="required" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" />
- *       <attribute name="type" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}MediaType" />
- *       <attribute name="use" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Use" />
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Link", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class Link extends BaseElement { - - @XmlAttribute(name = "artifact") - protected String artifact; - @XmlAttribute(name = "href", required = true) - @XmlSchemaType(name = "anyURI") - protected String href; - @XmlAttribute(name = "media") - protected String media; - @XmlAttribute(name = "ownership") - protected Ownership ownership; - @XmlAttribute(name = "rel", required = true) - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlSchemaType(name = "NMTOKEN") - protected String rel; - @XmlAttribute(name = "type") - protected String type; - @XmlAttribute(name = "use") - protected Use use; - - /** - * Gets the value of the artifact property. - * - * @return possible object is {@link String } - * - */ - public String getArtifact() { - return artifact; - } - - /** - * Sets the value of the artifact property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setArtifact(String value) { - this.artifact = value; - } - - /** - * Gets the value of the href property. - * - * @return possible object is {@link String } - * - */ - public String getHref() { - return href; - } - - /** - * Sets the value of the href property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setHref(String value) { - this.href = value; - } - - /** - * Gets the value of the media property. - * - * @return possible object is {@link String } - * - */ - public String getMedia() { - return media; - } - - /** - * Sets the value of the media property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setMedia(String value) { - this.media = value; - } - - /** - * Gets the value of the ownership property. - * - * @return possible object is {@link Ownership } - * - */ - public Ownership getOwnership() { - return ownership; - } - - /** - * Sets the value of the ownership property. - * - * @param value - * allowed object is {@link Ownership } - * - */ - public void setOwnership(Ownership value) { - this.ownership = value; - } - - /** - * Gets the value of the rel property. - * - * @return possible object is {@link String } - * - */ - public String getRel() { - return rel; - } - - /** - * Sets the value of the rel property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setRel(String value) { - this.rel = value; - } - - /** - * Gets the value of the type property. - * - * @return possible object is {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - - /** - * Gets the value of the use property. - * - * @return possible object is {@link Use } - * - */ - public Use getUse() { - return use; - } - - /** - * Sets the value of the use property. - * - * @param value - * allowed object is {@link Use } - * - */ - public void setUse(Use value) { - this.use = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ManifestType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ManifestType.java deleted file mode 100644 index a5b66458b..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ManifestType.java +++ /dev/null @@ -1,108 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for ManifestType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="ManifestType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ManifestType", propOrder = { "reference" }) -public class ManifestType { - - @XmlElement(name = "Reference", required = true) - protected List reference; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the reference property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the reference property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getReference().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ReferenceType } - * - * - */ - public List getReference() { - if (reference == null) { - reference = new ArrayList(); - } - return this.reference; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Meta.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Meta.java deleted file mode 100644 index 7611f9f85..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Meta.java +++ /dev/null @@ -1,41 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Meta complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Meta">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}BaseElement">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Meta", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -@XmlSeeAlso({ SoftwareMeta.class, Resource.class, Process.class, - FilesystemItem.class }) -public class Meta extends BaseElement { - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectFactory.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectFactory.java deleted file mode 100644 index c699be32d..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectFactory.java +++ /dev/null @@ -1,844 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -/** - * This object contains factory methods for each Java content interface and Java - * element interface generated in the hirs.swid.xjc package. - *

- * An ObjectFactory allows you to programatically construct new instances of the - * Java representation for XML content. The Java representation of XML content - * can consist of schema derived interfaces and classes representing the binding - * of schema type definitions, element declarations and model groups. Factory - * methods for each of these are provided in this class. - *

- */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _SPKIData_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SPKIData"); - private final static QName _KeyInfo_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "KeyInfo"); - private final static QName _SignatureValue_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SignatureValue"); - private final static QName _KeyValue_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "KeyValue"); - private final static QName _Transforms_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Transforms"); - private final static QName _DigestMethod_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "DigestMethod"); - private final static QName _X509Data_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509Data"); - private final static QName _SignatureProperty_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SignatureProperty"); - private final static QName _KeyName_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "KeyName"); - private final static QName _RSAKeyValue_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue"); - private final static QName _SoftwareIdentity_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", - "SoftwareIdentity"); - private final static QName _Signature_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Signature"); - private final static QName _MgmtData_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "MgmtData"); - private final static QName _SignatureMethod_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SignatureMethod"); - private final static QName _Object_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Object"); - private final static QName _SignatureProperties_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SignatureProperties"); - private final static QName _Transform_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Transform"); - private final static QName _PGPData_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "PGPData"); - private final static QName _Reference_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Reference"); - private final static QName _RetrievalMethod_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod"); - private final static QName _DSAKeyValue_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue"); - private final static QName _DigestValue_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "DigestValue"); - private final static QName _CanonicalizationMethod_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod"); - private final static QName _SignedInfo_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SignedInfo"); - private final static QName _Manifest_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "Manifest"); - private final static QName _PGPDataTypePGPKeyID_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "PGPKeyID"); - private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket"); - private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength"); - private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial"); - private final static QName _X509DataTypeX509CRL_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509CRL"); - private final static QName _X509DataTypeX509SubjectName_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509SubjectName"); - private final static QName _X509DataTypeX509SKI_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509SKI"); - private final static QName _X509DataTypeX509Certificate_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "X509Certificate"); - private final static QName _SoftwareIdentityLink_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", "Link"); - private final static QName _SoftwareIdentityEvidence_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", "Evidence"); - private final static QName _SoftwareIdentityPayload_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", "Payload"); - private final static QName _SoftwareIdentityEntity_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", "Entity"); - private final static QName _SoftwareIdentityMeta_QNAME = new QName( - "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", "Meta"); - private final static QName _TransformTypeXPath_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "XPath"); - private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName( - "http://www.w3.org/2000/09/xmldsig#", "SPKISexp"); - - /** - * Create a new ObjectFactory that can be used to create new instances of - * schema derived classes for package: hirs.swid.xjc - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link SoftwareIdentity } - * - */ - public SoftwareIdentity createSoftwareIdentity() { - return new SoftwareIdentity(); - } - - /** - * Create an instance of {@link SoftwareMeta } - * - */ - public SoftwareMeta createSoftwareMeta() { - return new SoftwareMeta(); - } - - /** - * Create an instance of {@link Entity } - * - */ - public Entity createEntity() { - return new Entity(); - } - - /** - * Create an instance of {@link Meta } - * - */ - public Meta createMeta() { - return new Meta(); - } - - /** - * Create an instance of {@link FilesystemItem } - * - */ - public FilesystemItem createFilesystemItem() { - return new FilesystemItem(); - } - - /** - * Create an instance of {@link Resource } - * - */ - public Resource createResource() { - return new Resource(); - } - - /** - * Create an instance of {@link Process } - * - */ - public Process createProcess() { - return new Process(); - } - - /** - * Create an instance of {@link BaseElement } - * - */ - public BaseElement createBaseElement() { - return new BaseElement(); - } - - /** - * Create an instance of {@link Evidence } - * - */ - public Evidence createEvidence() { - return new Evidence(); - } - - /** - * Create an instance of {@link File } - * - */ - public File createFile() { - return new File(); - } - - /** - * Create an instance of {@link Link } - * - */ - public Link createLink() { - return new Link(); - } - - /** - * Create an instance of {@link Directory } - * - */ - public Directory createDirectory() { - return new Directory(); - } - - /** - * Create an instance of {@link ResourceCollection } - * - */ - public ResourceCollection createResourceCollection() { - return new ResourceCollection(); - } - - /** - * Create an instance of {@link PGPDataType } - * - */ - public PGPDataType createPGPDataType() { - return new PGPDataType(); - } - - /** - * Create an instance of {@link KeyValueType } - * - */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); - } - - /** - * Create an instance of {@link DSAKeyValueType } - * - */ - public DSAKeyValueType createDSAKeyValueType() { - return new DSAKeyValueType(); - } - - /** - * Create an instance of {@link ReferenceType } - * - */ - public ReferenceType createReferenceType() { - return new ReferenceType(); - } - - /** - * Create an instance of {@link RetrievalMethodType } - * - */ - public RetrievalMethodType createRetrievalMethodType() { - return new RetrievalMethodType(); - } - - /** - * Create an instance of {@link TransformsType } - * - */ - public TransformsType createTransformsType() { - return new TransformsType(); - } - - /** - * Create an instance of {@link CanonicalizationMethodType } - * - */ - public CanonicalizationMethodType createCanonicalizationMethodType() { - return new CanonicalizationMethodType(); - } - - /** - * Create an instance of {@link DigestMethodType } - * - */ - public DigestMethodType createDigestMethodType() { - return new DigestMethodType(); - } - - /** - * Create an instance of {@link ManifestType } - * - */ - public ManifestType createManifestType() { - return new ManifestType(); - } - - /** - * Create an instance of {@link SignaturePropertyType } - * - */ - public SignaturePropertyType createSignaturePropertyType() { - return new SignaturePropertyType(); - } - - /** - * Create an instance of {@link X509DataType } - * - */ - public X509DataType createX509DataType() { - return new X509DataType(); - } - - /** - * Create an instance of {@link SignedInfoType } - * - */ - public SignedInfoType createSignedInfoType() { - return new SignedInfoType(); - } - - /** - * Create an instance of {@link RSAKeyValueType } - * - */ - public RSAKeyValueType createRSAKeyValueType() { - return new RSAKeyValueType(); - } - - /** - * Create an instance of {@link SPKIDataType } - * - */ - public SPKIDataType createSPKIDataType() { - return new SPKIDataType(); - } - - /** - * Create an instance of {@link SignatureValueType } - * - */ - public SignatureValueType createSignatureValueType() { - return new SignatureValueType(); - } - - /** - * Create an instance of {@link KeyInfoType } - * - */ - public KeyInfoType createKeyInfoType() { - return new KeyInfoType(); - } - - /** - * Create an instance of {@link SignatureType } - * - */ - public SignatureType createSignatureType() { - return new SignatureType(); - } - - /** - * Create an instance of {@link SignaturePropertiesType } - * - */ - public SignaturePropertiesType createSignaturePropertiesType() { - return new SignaturePropertiesType(); - } - - /** - * Create an instance of {@link SignatureMethodType } - * - */ - public SignatureMethodType createSignatureMethodType() { - return new SignatureMethodType(); - } - - /** - * Create an instance of {@link ObjectType } - * - */ - public ObjectType createObjectType() { - return new ObjectType(); - } - - /** - * Create an instance of {@link TransformType } - * - */ - public TransformType createTransformType() { - return new TransformType(); - } - - /** - * Create an instance of {@link X509IssuerSerialType } - * - */ - public X509IssuerSerialType createX509IssuerSerialType() { - return new X509IssuerSerialType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData") - public JAXBElement createSPKIData(SPKIDataType value) { - return new JAXBElement(_SPKIData_QNAME, - SPKIDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo") - public JAXBElement createKeyInfo(KeyInfoType value) { - return new JAXBElement(_KeyInfo_QNAME, KeyInfoType.class, - null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link SignatureValueType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue") - public JAXBElement createSignatureValue( - SignatureValueType value) { - return new JAXBElement(_SignatureValue_QNAME, - SignatureValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue") - public JAXBElement createKeyValue(KeyValueType value) { - return new JAXBElement(_KeyValue_QNAME, - KeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms") - public JAXBElement createTransforms(TransformsType value) { - return new JAXBElement(_Transforms_QNAME, - TransformsType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link DigestMethodType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod") - public JAXBElement createDigestMethod( - DigestMethodType value) { - return new JAXBElement(_DigestMethod_QNAME, - DigestMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data") - public JAXBElement createX509Data(X509DataType value) { - return new JAXBElement(_X509Data_QNAME, - X509DataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link SignaturePropertyType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty") - public JAXBElement createSignatureProperty( - SignaturePropertyType value) { - return new JAXBElement(_SignatureProperty_QNAME, - SignaturePropertyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName") - public JAXBElement createKeyName(String value) { - return new JAXBElement(_KeyName_QNAME, String.class, null, - value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue") - public JAXBElement createRSAKeyValue(RSAKeyValueType value) { - return new JAXBElement(_RSAKeyValue_QNAME, - RSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link SoftwareIdentity }{@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "SoftwareIdentity") - public JAXBElement createSoftwareIdentity( - SoftwareIdentity value) { - return new JAXBElement(_SoftwareIdentity_QNAME, - SoftwareIdentity.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature") - public JAXBElement createSignature(SignatureType value) { - return new JAXBElement(_Signature_QNAME, - SignatureType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData") - public JAXBElement createMgmtData(String value) { - return new JAXBElement(_MgmtData_QNAME, String.class, null, - value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link SignatureMethodType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod") - public JAXBElement createSignatureMethod( - SignatureMethodType value) { - return new JAXBElement(_SignatureMethod_QNAME, - SignatureMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object") - public JAXBElement createObject(ObjectType value) { - return new JAXBElement(_Object_QNAME, ObjectType.class, - null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link SignaturePropertiesType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties") - public JAXBElement createSignatureProperties( - SignaturePropertiesType value) { - return new JAXBElement( - _SignatureProperties_QNAME, SignaturePropertiesType.class, - null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TransformType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform") - public JAXBElement createTransform(TransformType value) { - return new JAXBElement(_Transform_QNAME, - TransformType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData") - public JAXBElement createPGPData(PGPDataType value) { - return new JAXBElement(_PGPData_QNAME, PGPDataType.class, - null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference") - public JAXBElement createReference(ReferenceType value) { - return new JAXBElement(_Reference_QNAME, - ReferenceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link RetrievalMethodType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod") - public JAXBElement createRetrievalMethod( - RetrievalMethodType value) { - return new JAXBElement(_RetrievalMethod_QNAME, - RetrievalMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue") - public JAXBElement createDSAKeyValue(DSAKeyValueType value) { - return new JAXBElement(_DSAKeyValue_QNAME, - DSAKeyValueType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue") - public JAXBElement createDigestValue(byte[] value) { - return new JAXBElement(_DigestValue_QNAME, byte[].class, null, - ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link CanonicalizationMethodType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod") - public JAXBElement createCanonicalizationMethod( - CanonicalizationMethodType value) { - return new JAXBElement( - _CanonicalizationMethod_QNAME, - CanonicalizationMethodType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo") - public JAXBElement createSignedInfo(SignedInfoType value) { - return new JAXBElement(_SignedInfo_QNAME, - SignedInfoType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest") - public JAXBElement createManifest(ManifestType value) { - return new JAXBElement(_Manifest_QNAME, - ManifestType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyID(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyID_QNAME, - byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class) - public JAXBElement createPGPDataTypePGPKeyPacket(byte[] value) { - return new JAXBElement(_PGPDataTypePGPKeyPacket_QNAME, - byte[].class, PGPDataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class) - public JAXBElement createSignatureMethodTypeHMACOutputLength( - BigInteger value) { - return new JAXBElement( - _SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, - SignatureMethodType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link X509IssuerSerialType }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509IssuerSerial( - X509IssuerSerialType value) { - return new JAXBElement( - _X509DataTypeX509IssuerSerial_QNAME, - X509IssuerSerialType.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509CRL(byte[] value) { - return new JAXBElement(_X509DataTypeX509CRL_QNAME, - byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509SubjectName(String value) { - return new JAXBElement(_X509DataTypeX509SubjectName_QNAME, - String.class, X509DataType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509SKI(byte[] value) { - return new JAXBElement(_X509DataTypeX509SKI_QNAME, - byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class) - public JAXBElement createX509DataTypeX509Certificate(byte[] value) { - return new JAXBElement(_X509DataTypeX509Certificate_QNAME, - byte[].class, X509DataType.class, ((byte[]) value)); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Link }{@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "Link", scope = SoftwareIdentity.class) - public JAXBElement createSoftwareIdentityLink(Link value) { - return new JAXBElement(_SoftwareIdentityLink_QNAME, Link.class, - SoftwareIdentity.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Evidence } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "Evidence", scope = SoftwareIdentity.class) - public JAXBElement createSoftwareIdentityEvidence(Evidence value) { - return new JAXBElement(_SoftwareIdentityEvidence_QNAME, - Evidence.class, SoftwareIdentity.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <} - * {@link ResourceCollection }{@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "Payload", scope = SoftwareIdentity.class) - public JAXBElement createSoftwareIdentityPayload( - ResourceCollection value) { - return new JAXBElement( - _SoftwareIdentityPayload_QNAME, ResourceCollection.class, - SoftwareIdentity.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Entity }{@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "Entity", scope = SoftwareIdentity.class) - public JAXBElement createSoftwareIdentityEntity(Entity value) { - return new JAXBElement(_SoftwareIdentityEntity_QNAME, - Entity.class, SoftwareIdentity.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SoftwareMeta } - * {@code >} - * - */ - @XmlElementDecl(namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", name = "Meta", scope = SoftwareIdentity.class) - public JAXBElement createSoftwareIdentityMeta( - SoftwareMeta value) { - return new JAXBElement(_SoftwareIdentityMeta_QNAME, - SoftwareMeta.class, SoftwareIdentity.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class) - public JAXBElement createTransformTypeXPath(String value) { - return new JAXBElement(_TransformTypeXPath_QNAME, String.class, - TransformType.class, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - */ - @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class) - public JAXBElement createSPKIDataTypeSPKISexp(byte[] value) { - return new JAXBElement(_SPKIDataTypeSPKISexp_QNAME, - byte[].class, SPKIDataType.class, ((byte[]) value)); - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectType.java deleted file mode 100644 index a3ade9944..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ObjectType.java +++ /dev/null @@ -1,160 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3c.dom.Element; - -/** - *

- * Java class for ObjectType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="ObjectType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax'/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ObjectType", propOrder = { "content" }) -public class ObjectType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAttribute(name = "MimeType") - protected String mimeType; - @XmlAttribute(name = "Encoding") - @XmlSchemaType(name = "anyURI") - protected String encoding; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Element } - * {@link Object } {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the mimeType property. - * - * @return possible object is {@link String } - * - */ - public String getMimeType() { - return mimeType; - } - - /** - * Sets the value of the mimeType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setMimeType(String value) { - this.mimeType = value; - } - - /** - * Gets the value of the encoding property. - * - * @return possible object is {@link String } - * - */ - public String getEncoding() { - return encoding; - } - - /** - * Sets the value of the encoding property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEncoding(String value) { - this.encoding = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Ownership.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Ownership.java deleted file mode 100644 index c789c42b0..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Ownership.java +++ /dev/null @@ -1,85 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Ownership. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- * - *
- * <simpleType name="Ownership">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     <enumeration value="abandon"/>
- *     <enumeration value="private"/>
- *     <enumeration value="shared"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlType(name = "Ownership", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -@XmlEnum -public enum Ownership { - - /** - * - * Determines the relative strength of ownership of the target piece of - * software. - * - * - */ - @XmlEnumValue("abandon") - ABANDON("abandon"), - - /** - * - * If this is uninstalled, then the [Link]'d software should be removed too. - * - * - */ - @XmlEnumValue("private") - PRIVATE("private"), - - /** - * - * If this is uninstalled, then the [Link]'d software should be removed if - * nobody else is sharing it - * - * - */ - @XmlEnumValue("shared") - SHARED("shared"); - private final String value; - - Ownership(String v) { - value = v; - } - - public String value() { - return value; - } - - public static Ownership fromValue(String v) { - for (Ownership c : Ownership.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/PGPDataType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/PGPDataType.java deleted file mode 100644 index d4541faaa..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/PGPDataType.java +++ /dev/null @@ -1,103 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for PGPDataType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="PGPDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <sequence>
- *           <element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
- *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *         <sequence>
- *           <element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *         </sequence>
- *       </choice>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PGPDataType", propOrder = { "content" }) -public class PGPDataType { - - @XmlElementRefs({ - @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) - @XmlAnyElement(lax = true) - protected List content; - - /** - * Gets the rest of the content model. - * - *

- * You are getting this "catch-all" property because of the following - * reason: The field name "PGPKeyPacket" is used by two different parts of a - * schema. See: line 218 of - * http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd line 213 of - * http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd - *

- * To get rid of this property, apply a property customization to one of - * both of the following declarations to change their names: Gets the value - * of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link JAXBElement } - * {@code <}{@link byte[]}{@code >} {@link Object } {@link Element } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Process.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Process.java deleted file mode 100644 index b148fc17c..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Process.java +++ /dev/null @@ -1,89 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Process complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Process">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Meta">
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="pid" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Process", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class Process extends Meta { - - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "pid") - protected BigInteger pid; - - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the pid property. - * - * @return possible object is {@link BigInteger } - * - */ - public BigInteger getPid() { - return pid; - } - - /** - * Sets the value of the pid property. - * - * @param value - * allowed object is {@link BigInteger } - * - */ - public void setPid(BigInteger value) { - this.pid = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RSAKeyValueType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RSAKeyValueType.java deleted file mode 100644 index 1626f2f30..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RSAKeyValueType.java +++ /dev/null @@ -1,85 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for RSAKeyValueType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="RSAKeyValueType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *         <element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RSAKeyValueType", propOrder = { "modulus", "exponent" }) -public class RSAKeyValueType { - - @XmlElement(name = "Modulus", required = true) - protected byte[] modulus; - @XmlElement(name = "Exponent", required = true) - protected byte[] exponent; - - /** - * Gets the value of the modulus property. - * - * @return possible object is byte[] - */ - public byte[] getModulus() { - return modulus; - } - - /** - * Sets the value of the modulus property. - * - * @param value - * allowed object is byte[] - */ - public void setModulus(byte[] value) { - this.modulus = value; - } - - /** - * Gets the value of the exponent property. - * - * @return possible object is byte[] - */ - public byte[] getExponent() { - return exponent; - } - - /** - * Sets the value of the exponent property. - * - * @param value - * allowed object is byte[] - */ - public void setExponent(byte[] value) { - this.exponent = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ReferenceType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ReferenceType.java deleted file mode 100644 index c0b840129..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ReferenceType.java +++ /dev/null @@ -1,194 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for ReferenceType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="ReferenceType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ReferenceType", propOrder = { "transforms", "digestMethod", - "digestValue" }) -public class ReferenceType { - - @XmlElement(name = "Transforms") - protected TransformsType transforms; - @XmlElement(name = "DigestMethod", required = true) - protected DigestMethodType digestMethod; - @XmlElement(name = "DigestValue", required = true) - protected byte[] digestValue; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - @XmlAttribute(name = "URI") - @XmlSchemaType(name = "anyURI") - protected String uri; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") - protected String type; - - /** - * Gets the value of the transforms property. - * - * @return possible object is {@link TransformsType } - * - */ - public TransformsType getTransforms() { - return transforms; - } - - /** - * Sets the value of the transforms property. - * - * @param value - * allowed object is {@link TransformsType } - * - */ - public void setTransforms(TransformsType value) { - this.transforms = value; - } - - /** - * Gets the value of the digestMethod property. - * - * @return possible object is {@link DigestMethodType } - * - */ - public DigestMethodType getDigestMethod() { - return digestMethod; - } - - /** - * Sets the value of the digestMethod property. - * - * @param value - * allowed object is {@link DigestMethodType } - * - */ - public void setDigestMethod(DigestMethodType value) { - this.digestMethod = value; - } - - /** - * Gets the value of the digestValue property. - * - * @return possible object is byte[] - */ - public byte[] getDigestValue() { - return digestValue; - } - - /** - * Sets the value of the digestValue property. - * - * @param value - * allowed object is byte[] - */ - public void setDigestValue(byte[] value) { - this.digestValue = value; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the uri property. - * - * @return possible object is {@link String } - * - */ - public String getURI() { - return uri; - } - - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } - - /** - * Gets the value of the type property. - * - * @return possible object is {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Resource.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Resource.java deleted file mode 100644 index 52f804e6f..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Resource.java +++ /dev/null @@ -1,64 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Resource complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="Resource">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Meta">
- *       <attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Resource", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class Resource extends Meta { - - @XmlAttribute(name = "type", required = true) - protected String type; - - /** - * Gets the value of the type property. - * - * @return possible object is {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ResourceCollection.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ResourceCollection.java deleted file mode 100644 index d005b1487..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/ResourceCollection.java +++ /dev/null @@ -1,86 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for ResourceCollection complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="ResourceCollection">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}BaseElement">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <element name="Directory" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Directory"/>
- *         <element name="File" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}File"/>
- *         <element name="Process" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Process"/>
- *         <element name="Resource" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Resource"/>
- *       </choice>
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ResourceCollection", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", propOrder = { "directoryOrFileOrProcess" }) -@XmlSeeAlso({ Evidence.class }) -public class ResourceCollection extends BaseElement { - - @XmlElements({ @XmlElement(name = "Directory", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = Directory.class, required = false), - @XmlElement(name = "File", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = File.class, required = false), - @XmlElement(name = "Process", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = Process.class, required = false), - @XmlElement(name = "Resource", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = Resource.class, required = false) }) - protected List directoryOrFileOrProcess; - - /** - * Gets the value of the directoryOrFileOrProcess property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the directoryOrFileOrProcess property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getDirectoryOrFileOrProcess().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Directory } {@link File } {@link Process } {@link Resource } - * - * - */ - public List getDirectoryOrFileOrProcess() { - if (directoryOrFileOrProcess == null) { - directoryOrFileOrProcess = new ArrayList(); - } - return this.directoryOrFileOrProcess; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RetrievalMethodType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RetrievalMethodType.java deleted file mode 100644 index 18b7de4e5..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/RetrievalMethodType.java +++ /dev/null @@ -1,117 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for RetrievalMethodType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="RetrievalMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RetrievalMethodType", propOrder = { "transforms" }) -public class RetrievalMethodType { - - @XmlElement(name = "Transforms") - protected TransformsType transforms; - @XmlAttribute(name = "URI") - @XmlSchemaType(name = "anyURI") - protected String uri; - @XmlAttribute(name = "Type") - @XmlSchemaType(name = "anyURI") - protected String type; - - /** - * Gets the value of the transforms property. - * - * @return possible object is {@link TransformsType } - * - */ - public TransformsType getTransforms() { - return transforms; - } - - /** - * Sets the value of the transforms property. - * - * @param value - * allowed object is {@link TransformsType } - * - */ - public void setTransforms(TransformsType value) { - this.transforms = value; - } - - /** - * Gets the value of the uri property. - * - * @return possible object is {@link String } - * - */ - public String getURI() { - return uri; - } - - /** - * Sets the value of the uri property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setURI(String value) { - this.uri = value; - } - - /** - * Gets the value of the type property. - * - * @return possible object is {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SPKIDataType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SPKIDataType.java deleted file mode 100644 index a2596552c..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SPKIDataType.java +++ /dev/null @@ -1,81 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for SPKIDataType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SPKIDataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *         <any processContents='lax' namespace='##other' minOccurs="0"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SPKIDataType", propOrder = { "spkiSexpAndAny" }) -public class SPKIDataType { - - @XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class) - @XmlAnyElement(lax = true) - protected List spkiSexpAndAny; - - /** - * Gets the value of the spkiSexpAndAny property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the spkiSexpAndAny property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getSPKISexpAndAny().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Element } - * {@link Object } {@link JAXBElement }{@code <}{@link byte[]}{@code >} - * - * - */ - public List getSPKISexpAndAny() { - if (spkiSexpAndAny == null) { - spkiSexpAndAny = new ArrayList(); - } - return this.spkiSexpAndAny; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureMethodType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureMethodType.java deleted file mode 100644 index 988dc645b..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureMethodType.java +++ /dev/null @@ -1,110 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for SignatureMethodType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignatureMethodType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
- *         <any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureMethodType", propOrder = { "content" }) -public class SignatureMethodType { - - @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Object } - * {@link String } {@link JAXBElement }{@code <}{@link BigInteger }{@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the algorithm property. - * - * @return possible object is {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertiesType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertiesType.java deleted file mode 100644 index 4366bd684..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertiesType.java +++ /dev/null @@ -1,108 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for SignaturePropertiesType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignaturePropertiesType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignaturePropertiesType", propOrder = { "signatureProperty" }) -public class SignaturePropertiesType { - - @XmlElement(name = "SignatureProperty", required = true) - protected List signatureProperty; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the signatureProperty property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the signatureProperty property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getSignatureProperty().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link SignaturePropertyType } - * - * - */ - public List getSignatureProperty() { - if (signatureProperty == null) { - signatureProperty = new ArrayList(); - } - return this.signatureProperty; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertyType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertyType.java deleted file mode 100644 index 1a0f88f0f..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignaturePropertyType.java +++ /dev/null @@ -1,136 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3c.dom.Element; - -/** - *

- * Java class for SignaturePropertyType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignaturePropertyType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded">
- *         <any processContents='lax' namespace='##other'/>
- *       </choice>
- *       <attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignaturePropertyType", propOrder = { "content" }) -public class SignaturePropertyType { - - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Target", required = true) - @XmlSchemaType(name = "anyURI") - protected String target; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Element } - * {@link Object } {@link String } - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the target property. - * - * @return possible object is {@link String } - * - */ - public String getTarget() { - return target; - } - - /** - * Sets the value of the target property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setTarget(String value) { - this.target = value; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureType.java deleted file mode 100644 index 60bed84a9..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureType.java +++ /dev/null @@ -1,181 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for SignatureType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignatureType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureType", propOrder = { "signedInfo", "signatureValue", - "keyInfo", "object" }) -public class SignatureType { - - @XmlElement(name = "SignedInfo", required = true) - protected SignedInfoType signedInfo; - @XmlElement(name = "SignatureValue", required = true) - protected SignatureValueType signatureValue; - @XmlElement(name = "KeyInfo") - protected KeyInfoType keyInfo; - @XmlElement(name = "Object") - protected List object; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the signedInfo property. - * - * @return possible object is {@link SignedInfoType } - * - */ - public SignedInfoType getSignedInfo() { - return signedInfo; - } - - /** - * Sets the value of the signedInfo property. - * - * @param value - * allowed object is {@link SignedInfoType } - * - */ - public void setSignedInfo(SignedInfoType value) { - this.signedInfo = value; - } - - /** - * Gets the value of the signatureValue property. - * - * @return possible object is {@link SignatureValueType } - * - */ - public SignatureValueType getSignatureValue() { - return signatureValue; - } - - /** - * Sets the value of the signatureValue property. - * - * @param value - * allowed object is {@link SignatureValueType } - * - */ - public void setSignatureValue(SignatureValueType value) { - this.signatureValue = value; - } - - /** - * Gets the value of the keyInfo property. - * - * @return possible object is {@link KeyInfoType } - * - */ - public KeyInfoType getKeyInfo() { - return keyInfo; - } - - /** - * Sets the value of the keyInfo property. - * - * @param value - * allowed object is {@link KeyInfoType } - * - */ - public void setKeyInfo(KeyInfoType value) { - this.keyInfo = value; - } - - /** - * Gets the value of the object property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the object property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getObject().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ObjectType } - * - * - */ - public List getObject() { - if (object == null) { - object = new ArrayList(); - } - return this.object; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureValueType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureValueType.java deleted file mode 100644 index a47d237ed..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignatureValueType.java +++ /dev/null @@ -1,92 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for SignatureValueType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignatureValueType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignatureValueType", propOrder = { "value" }) -public class SignatureValueType { - - @XmlValue - protected byte[] value; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the value property. - * - * @return possible object is byte[] - */ - public byte[] getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is byte[] - */ - public void setValue(byte[] value) { - this.value = value; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignedInfoType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignedInfoType.java deleted file mode 100644 index 9f69e2c91..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SignedInfoType.java +++ /dev/null @@ -1,157 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlID; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -/** - *

- * Java class for SignedInfoType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SignedInfoType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
- *       </sequence>
- *       <attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SignedInfoType", propOrder = { "canonicalizationMethod", - "signatureMethod", "reference" }) -public class SignedInfoType { - - @XmlElement(name = "CanonicalizationMethod", required = true) - protected CanonicalizationMethodType canonicalizationMethod; - @XmlElement(name = "SignatureMethod", required = true) - protected SignatureMethodType signatureMethod; - @XmlElement(name = "Reference", required = true) - protected List reference; - @XmlAttribute(name = "Id") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlID - @XmlSchemaType(name = "ID") - protected String id; - - /** - * Gets the value of the canonicalizationMethod property. - * - * @return possible object is {@link CanonicalizationMethodType } - * - */ - public CanonicalizationMethodType getCanonicalizationMethod() { - return canonicalizationMethod; - } - - /** - * Sets the value of the canonicalizationMethod property. - * - * @param value - * allowed object is {@link CanonicalizationMethodType } - * - */ - public void setCanonicalizationMethod(CanonicalizationMethodType value) { - this.canonicalizationMethod = value; - } - - /** - * Gets the value of the signatureMethod property. - * - * @return possible object is {@link SignatureMethodType } - * - */ - public SignatureMethodType getSignatureMethod() { - return signatureMethod; - } - - /** - * Sets the value of the signatureMethod property. - * - * @param value - * allowed object is {@link SignatureMethodType } - * - */ - public void setSignatureMethod(SignatureMethodType value) { - this.signatureMethod = value; - } - - /** - * Gets the value of the reference property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the reference property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getReference().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ReferenceType } - * - * - */ - public List getReference() { - if (reference == null) { - reference = new ArrayList(); - } - return this.reference; - } - - /** - * Gets the value of the id property. - * - * @return possible object is {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareIdentity.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareIdentity.java deleted file mode 100644 index 8c91164bd..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareIdentity.java +++ /dev/null @@ -1,343 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.w3c.dom.Element; - -/** - *

- * Java class for SoftwareIdentity complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SoftwareIdentity">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}BaseElement">
- *       <choice maxOccurs="unbounded">
- *         <element name="Entity" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Entity" maxOccurs="unbounded"/>
- *         <element name="Evidence" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Evidence" minOccurs="0"/>
- *         <element name="Link" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Link" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Meta" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}SoftwareMeta" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Payload" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}ResourceCollection" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </choice>
- *       <attribute name="corpus" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       <attribute name="patch" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       <attribute name="media" type="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Media" />
- *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="supplemental" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       <attribute name="tagId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="tagVersion" type="{http://www.w3.org/2001/XMLSchema}integer" default="0" />
- *       <attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" default="0.0" />
- *       <attribute name="versionScheme" type="{http://www.w3.org/2001/XMLSchema}NMTOKEN" default="multipartnumeric" />
- *       <anyAttribute processContents='lax' namespace='##other'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SoftwareIdentity", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", propOrder = { "entityOrEvidenceOrLink" }) -public class SoftwareIdentity extends BaseElement { - - @XmlElementRefs({ - @XmlElementRef(name = "Evidence", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Meta", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Entity", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Payload", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = JAXBElement.class, required = false), - @XmlElementRef(name = "Link", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd", type = JAXBElement.class, required = false) }) - @XmlAnyElement(lax = true) - protected List entityOrEvidenceOrLink; - @XmlAttribute(name = "corpus") - protected Boolean corpus; - @XmlAttribute(name = "patch") - protected Boolean patch; - @XmlAttribute(name = "media") - protected String media; - @XmlAttribute(name = "name", required = true) - protected String name; - @XmlAttribute(name = "supplemental") - protected Boolean supplemental; - @XmlAttribute(name = "tagId", required = true) - protected String tagId; - @XmlAttribute(name = "tagVersion") - protected BigInteger tagVersion; - @XmlAttribute(name = "version") - protected String version; - @XmlAttribute(name = "versionScheme") - @XmlJavaTypeAdapter(CollapsedStringAdapter.class) - @XmlSchemaType(name = "NMTOKEN") - protected String versionScheme; - - /** - * Gets the value of the entityOrEvidenceOrLink property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the entityOrEvidenceOrLink property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getEntityOrEvidenceOrLink().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link Evidence }{@code >} {@link JAXBElement } - * {@code <}{@link SoftwareMeta }{@code >} {@link JAXBElement }{@code <} - * {@link Entity }{@code >} {@link Element } {@link JAXBElement }{@code <} - * {@link ResourceCollection }{@code >} {@link Object } {@link JAXBElement } - * {@code <}{@link Link }{@code >} - * - * - */ - public List getEntityOrEvidenceOrLink() { - if (entityOrEvidenceOrLink == null) { - entityOrEvidenceOrLink = new ArrayList(); - } - return this.entityOrEvidenceOrLink; - } - - /** - * Gets the value of the corpus property. - * - * @return possible object is {@link Boolean } - * - */ - public boolean isCorpus() { - if (corpus == null) { - return false; - } else { - return corpus; - } - } - - /** - * Sets the value of the corpus property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setCorpus(Boolean value) { - this.corpus = value; - } - - /** - * Gets the value of the patch property. - * - * @return possible object is {@link Boolean } - * - */ - public boolean isPatch() { - if (patch == null) { - return false; - } else { - return patch; - } - } - - /** - * Sets the value of the patch property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setPatch(Boolean value) { - this.patch = value; - } - - /** - * Gets the value of the media property. - * - * @return possible object is {@link String } - * - */ - public String getMedia() { - return media; - } - - /** - * Sets the value of the media property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setMedia(String value) { - this.media = value; - } - - /** - * Gets the value of the name property. - * - * @return possible object is {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets the value of the supplemental property. - * - * @return possible object is {@link Boolean } - * - */ - public boolean isSupplemental() { - if (supplemental == null) { - return false; - } else { - return supplemental; - } - } - - /** - * Sets the value of the supplemental property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setSupplemental(Boolean value) { - this.supplemental = value; - } - - /** - * Gets the value of the tagId property. - * - * @return possible object is {@link String } - * - */ - public String getTagId() { - return tagId; - } - - /** - * Sets the value of the tagId property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setTagId(String value) { - this.tagId = value; - } - - /** - * Gets the value of the tagVersion property. - * - * @return possible object is {@link BigInteger } - * - */ - public BigInteger getTagVersion() { - if (tagVersion == null) { - return new BigInteger("0"); - } else { - return tagVersion; - } - } - - /** - * Sets the value of the tagVersion property. - * - * @param value - * allowed object is {@link BigInteger } - * - */ - public void setTagVersion(BigInteger value) { - this.tagVersion = value; - } - - /** - * Gets the value of the version property. - * - * @return possible object is {@link String } - * - */ - public String getVersion() { - if (version == null) { - return "0.0"; - } else { - return version; - } - } - - /** - * Sets the value of the version property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setVersion(String value) { - this.version = value; - } - - /** - * Gets the value of the versionScheme property. - * - * @return possible object is {@link String } - * - */ - public String getVersionScheme() { - if (versionScheme == null) { - return "multipartnumeric"; - } else { - return versionScheme; - } - } - - /** - * Sets the value of the versionScheme property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setVersionScheme(String value) { - this.versionScheme = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareMeta.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareMeta.java deleted file mode 100644 index 0f30dcf02..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/SoftwareMeta.java +++ /dev/null @@ -1,400 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for SoftwareMeta complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="SoftwareMeta">
- *   <complexContent>
- *     <extension base="{http://standards.iso.org/iso/19770/-2/2015/schema.xsd}Meta">
- *       <attribute name="activationStatus" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="channelType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="colloquialVersion" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="edition" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="entitlementDataRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       <attribute name="entitlementKey" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="generator" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="persistentId" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="product" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="productFamily" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="revision" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="summary" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="unspscCode" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="unspscVersion" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "SoftwareMeta", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -public class SoftwareMeta extends Meta { - - @XmlAttribute(name = "activationStatus") - protected String activationStatus; - @XmlAttribute(name = "channelType") - protected String channelType; - @XmlAttribute(name = "colloquialVersion") - protected String colloquialVersion; - @XmlAttribute(name = "description") - protected String description; - @XmlAttribute(name = "edition") - protected String edition; - @XmlAttribute(name = "entitlementDataRequired") - protected Boolean entitlementDataRequired; - @XmlAttribute(name = "entitlementKey") - protected String entitlementKey; - @XmlAttribute(name = "generator") - protected String generator; - @XmlAttribute(name = "persistentId") - protected String persistentId; - @XmlAttribute(name = "product") - protected String product; - @XmlAttribute(name = "productFamily") - protected String productFamily; - @XmlAttribute(name = "revision") - protected String revision; - @XmlAttribute(name = "summary") - protected String summary; - @XmlAttribute(name = "unspscCode") - protected String unspscCode; - @XmlAttribute(name = "unspscVersion") - protected String unspscVersion; - - /** - * Gets the value of the activationStatus property. - * - * @return possible object is {@link String } - * - */ - public String getActivationStatus() { - return activationStatus; - } - - /** - * Sets the value of the activationStatus property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setActivationStatus(String value) { - this.activationStatus = value; - } - - /** - * Gets the value of the channelType property. - * - * @return possible object is {@link String } - * - */ - public String getChannelType() { - return channelType; - } - - /** - * Sets the value of the channelType property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setChannelType(String value) { - this.channelType = value; - } - - /** - * Gets the value of the colloquialVersion property. - * - * @return possible object is {@link String } - * - */ - public String getColloquialVersion() { - return colloquialVersion; - } - - /** - * Sets the value of the colloquialVersion property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setColloquialVersion(String value) { - this.colloquialVersion = value; - } - - /** - * Gets the value of the description property. - * - * @return possible object is {@link String } - * - */ - public String getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setDescription(String value) { - this.description = value; - } - - /** - * Gets the value of the edition property. - * - * @return possible object is {@link String } - * - */ - public String getEdition() { - return edition; - } - - /** - * Sets the value of the edition property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEdition(String value) { - this.edition = value; - } - - /** - * Gets the value of the entitlementDataRequired property. - * - * @return possible object is {@link Boolean } - * - */ - public Boolean isEntitlementDataRequired() { - return entitlementDataRequired; - } - - /** - * Sets the value of the entitlementDataRequired property. - * - * @param value - * allowed object is {@link Boolean } - * - */ - public void setEntitlementDataRequired(Boolean value) { - this.entitlementDataRequired = value; - } - - /** - * Gets the value of the entitlementKey property. - * - * @return possible object is {@link String } - * - */ - public String getEntitlementKey() { - return entitlementKey; - } - - /** - * Sets the value of the entitlementKey property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setEntitlementKey(String value) { - this.entitlementKey = value; - } - - /** - * Gets the value of the generator property. - * - * @return possible object is {@link String } - * - */ - public String getGenerator() { - return generator; - } - - /** - * Sets the value of the generator property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setGenerator(String value) { - this.generator = value; - } - - /** - * Gets the value of the persistentId property. - * - * @return possible object is {@link String } - * - */ - public String getPersistentId() { - return persistentId; - } - - /** - * Sets the value of the persistentId property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setPersistentId(String value) { - this.persistentId = value; - } - - /** - * Gets the value of the product property. - * - * @return possible object is {@link String } - * - */ - public String getProduct() { - return product; - } - - /** - * Sets the value of the product property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setProduct(String value) { - this.product = value; - } - - /** - * Gets the value of the productFamily property. - * - * @return possible object is {@link String } - * - */ - public String getProductFamily() { - return productFamily; - } - - /** - * Sets the value of the productFamily property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setProductFamily(String value) { - this.productFamily = value; - } - - /** - * Gets the value of the revision property. - * - * @return possible object is {@link String } - * - */ - public String getRevision() { - return revision; - } - - /** - * Sets the value of the revision property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setRevision(String value) { - this.revision = value; - } - - /** - * Gets the value of the summary property. - * - * @return possible object is {@link String } - * - */ - public String getSummary() { - return summary; - } - - /** - * Sets the value of the summary property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setSummary(String value) { - this.summary = value; - } - - /** - * Gets the value of the unspscCode property. - * - * @return possible object is {@link String } - * - */ - public String getUnspscCode() { - return unspscCode; - } - - /** - * Sets the value of the unspscCode property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setUnspscCode(String value) { - this.unspscCode = value; - } - - /** - * Gets the value of the unspscVersion property. - * - * @return possible object is {@link String } - * - */ - public String getUnspscVersion() { - return unspscVersion; - } - - /** - * Sets the value of the unspscVersion property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setUnspscVersion(String value) { - this.unspscVersion = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformType.java deleted file mode 100644 index ee7c45bb9..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformType.java +++ /dev/null @@ -1,111 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlMixed; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for TransformType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="TransformType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice maxOccurs="unbounded" minOccurs="0">
- *         <any processContents='lax' namespace='##other'/>
- *         <element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *       </choice>
- *       <attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformType", propOrder = { "content" }) -public class TransformType { - - @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) - @XmlMixed - @XmlAnyElement(lax = true) - protected List content; - @XmlAttribute(name = "Algorithm", required = true) - @XmlSchemaType(name = "anyURI") - protected String algorithm; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the content property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getContent().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list {@link Object } - * {@link String } {@link Element } {@link JAXBElement }{@code <}{@link String } - * {@code >} - * - * - */ - public List getContent() { - if (content == null) { - content = new ArrayList(); - } - return this.content; - } - - /** - * Gets the value of the algorithm property. - * - * @return possible object is {@link String } - * - */ - public String getAlgorithm() { - return algorithm; - } - - /** - * Sets the value of the algorithm property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setAlgorithm(String value) { - this.algorithm = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformsType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformsType.java deleted file mode 100644 index dfc8f5dce..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/TransformsType.java +++ /dev/null @@ -1,76 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for TransformsType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="TransformsType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TransformsType", propOrder = { "transform" }) -public class TransformsType { - - @XmlElement(name = "Transform", required = true) - protected List transform; - - /** - * Gets the value of the transform property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the transform property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getTransform().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link TransformType } - * - * - */ - public List getTransform() { - if (transform == null) { - transform = new ArrayList(); - } - return this.transform; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Use.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Use.java deleted file mode 100644 index 10e4e1814..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/Use.java +++ /dev/null @@ -1,83 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import javax.xml.bind.annotation.XmlEnum; -import javax.xml.bind.annotation.XmlEnumValue; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for Use. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- * - *
- * <simpleType name="Use">
- *   <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     <enumeration value="required"/>
- *     <enumeration value="recommended"/>
- *     <enumeration value="optional"/>
- *   </restriction>
- * </simpleType>
- * 
- * - */ -@XmlType(name = "Use", namespace = "http://standards.iso.org/iso/19770/-2/2015/schema.xsd") -@XmlEnum -public enum Use { - - /** - * - * The [Link]'d software is absolutely required for installation - * - * - */ - @XmlEnumValue("required") - REQUIRED("required"), - - /** - * - * Not absolutely required, but install unless directed not to - * - * - */ - @XmlEnumValue("recommended") - RECOMMENDED("recommended"), - - /** - * - * Not absolutely required, install only when asked - * - * - */ - @XmlEnumValue("optional") - OPTIONAL("optional"); - private final String value; - - Use(String v) { - value = v; - } - - public String value() { - return value; - } - - public static Use fromValue(String v) { - for (Use c : Use.values()) { - if (c.value.equals(v)) { - return c; - } - } - throw new IllegalArgumentException(v); - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509DataType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509DataType.java deleted file mode 100644 index d451cf6a3..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509DataType.java +++ /dev/null @@ -1,99 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlElementRefs; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - -/** - *

- * Java class for X509DataType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="X509DataType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence maxOccurs="unbounded">
- *         <choice>
- *           <element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
- *           <element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *           <element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
- *           <any processContents='lax' namespace='##other'/>
- *         </choice>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "X509DataType", propOrder = { "x509IssuerSerialOrX509SKIOrX509SubjectName" }) -public class X509DataType { - - @XmlElementRefs({ - @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false), - @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) }) - @XmlAnyElement(lax = true) - protected List x509IssuerSerialOrX509SKIOrX509SubjectName; - - /** - * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName - * property. - * - *

- * This accessor method returns a reference to the live list, not a - * snapshot. Therefore any modification you make to the returned list will - * be present inside the JAXB object. This is why there is not a - * set method for the - * x509IssuerSerialOrX509SKIOrX509SubjectName property. - * - *

- * For example, to add a new item, do as follows: - * - *

-	 * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-	 * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link JAXBElement } - * {@code <}{@link X509IssuerSerialType }{@code >} {@link Element } - * {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object } - * {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement } - * {@code <}{@link byte[]}{@code >} - * - * - */ - public List getX509IssuerSerialOrX509SKIOrX509SubjectName() { - if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) { - x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList(); - } - return this.x509IssuerSerialOrX509SKIOrX509SubjectName; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509IssuerSerialType.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509IssuerSerialType.java deleted file mode 100644 index 0edbbff29..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/X509IssuerSerialType.java +++ /dev/null @@ -1,91 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -package hirs.swid.xjc; - -import java.math.BigInteger; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -/** - *

- * Java class for X509IssuerSerialType complex type. - *

- *

- * The following schema fragment specifies the expected content contained within - * this class. - *

- *
- * <complexType name="X509IssuerSerialType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
- *       </sequence>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "X509IssuerSerialType", propOrder = { "x509IssuerName", - "x509SerialNumber" }) -public class X509IssuerSerialType { - - @XmlElement(name = "X509IssuerName", required = true) - protected String x509IssuerName; - @XmlElement(name = "X509SerialNumber", required = true) - protected BigInteger x509SerialNumber; - - /** - * Gets the value of the x509IssuerName property. - * - * @return possible object is {@link String } - * - */ - public String getX509IssuerName() { - return x509IssuerName; - } - - /** - * Sets the value of the x509IssuerName property. - * - * @param value - * allowed object is {@link String } - * - */ - public void setX509IssuerName(String value) { - this.x509IssuerName = value; - } - - /** - * Gets the value of the x509SerialNumber property. - * - * @return possible object is {@link BigInteger } - * - */ - public BigInteger getX509SerialNumber() { - return x509SerialNumber; - } - - /** - * Sets the value of the x509SerialNumber property. - * - * @param value - * allowed object is {@link BigInteger } - * - */ - public void setX509SerialNumber(BigInteger value) { - this.x509SerialNumber = value; - } - -} diff --git a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/package-info.java b/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/package-info.java deleted file mode 100644 index 59d16a785..000000000 --- a/tools/tcg_rim_tool/src/main/java/hirs/swid/xjc/package-info.java +++ /dev/null @@ -1,10 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.8-b130911.1802 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2018.03.20 at 08:11:19 AM EDT -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package hirs.swid.xjc; -