mirror of
https://github.com/nsacyber/HIRS.git
synced 2025-01-03 03:36:49 +00:00
Updated some serialized attributes
This commit is contained in:
parent
3f1a140946
commit
1b80e99de8
@ -6,9 +6,12 @@ import hirs.repository.RepositoryUpdateService;
|
|||||||
import hirs.repository.spacewalk.Credentials;
|
import hirs.repository.spacewalk.Credentials;
|
||||||
import hirs.repository.spacewalk.SpacewalkChannel;
|
import hirs.repository.spacewalk.SpacewalkChannel;
|
||||||
import hirs.repository.spacewalk.SpacewalkChannelRepository;
|
import hirs.repository.spacewalk.SpacewalkChannelRepository;
|
||||||
import hirs.repository.spacewalk.SpacewalkService;
|
|
||||||
import hirs.repository.spacewalk.SpacewalkException;
|
import hirs.repository.spacewalk.SpacewalkException;
|
||||||
import hirs.repository.spacewalk.SpacewalkPackage;
|
import hirs.repository.spacewalk.SpacewalkPackage;
|
||||||
|
import hirs.repository.spacewalk.SpacewalkService;
|
||||||
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.net.MalformedURLException;
|
import java.net.MalformedURLException;
|
||||||
@ -16,10 +19,6 @@ import java.net.URL;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
import org.apache.logging.log4j.LogManager;
|
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Console tester application that exercises the SpacewalkService test by connecting to a real
|
* Console tester application that exercises the SpacewalkService test by connecting to a real
|
||||||
* Spacewalk instance with username / password.
|
* Spacewalk instance with username / password.
|
||||||
@ -71,7 +70,7 @@ public final class SpacewalkServiceConsoleTester {
|
|||||||
|
|
||||||
private static void loadBeansFromSpringContext() {
|
private static void loadBeansFromSpringContext() {
|
||||||
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
|
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
|
||||||
context.register(PersistenceConfiguration.class);
|
// context.register(null);
|
||||||
context.refresh();
|
context.refresh();
|
||||||
|
|
||||||
// register a shutdown hook such that components are properly shutdown when JVM is closing
|
// register a shutdown hook such that components are properly shutdown when JVM is closing
|
||||||
|
@ -16,7 +16,6 @@ import javax.xml.bind.annotation.XmlAccessType;
|
|||||||
import javax.xml.bind.annotation.XmlAccessorType;
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
import javax.xml.bind.annotation.XmlTransient;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* An <code>AppraisalResult</code> represents the result of an appraisal.
|
* An <code>AppraisalResult</code> represents the result of an appraisal.
|
||||||
@ -57,7 +56,6 @@ public class AppraisalResult extends AbstractEntity {
|
|||||||
*/
|
*/
|
||||||
@ManyToOne
|
@ManyToOne
|
||||||
@JoinColumn(name = "reportSummary")
|
@JoinColumn(name = "reportSummary")
|
||||||
@XmlTransient
|
|
||||||
private ReportSummary reportSummary;
|
private ReportSummary reportSummary;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -20,6 +20,7 @@ import javax.xml.bind.annotation.XmlAccessType;
|
|||||||
import javax.xml.bind.annotation.XmlAccessorType;
|
import javax.xml.bind.annotation.XmlAccessorType;
|
||||||
import javax.xml.bind.annotation.XmlElement;
|
import javax.xml.bind.annotation.XmlElement;
|
||||||
import javax.xml.bind.annotation.XmlRootElement;
|
import javax.xml.bind.annotation.XmlRootElement;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -33,7 +34,7 @@ import java.util.Set;
|
|||||||
@Table(name = "ReportSummary")
|
@Table(name = "ReportSummary")
|
||||||
@XmlRootElement
|
@XmlRootElement
|
||||||
@XmlAccessorType(XmlAccessType.NONE)
|
@XmlAccessorType(XmlAccessType.NONE)
|
||||||
public class ReportSummary {
|
public class ReportSummary implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The unique ID of the ReportSummary. The ID is randomly generated when the
|
* The unique ID of the ReportSummary. The ID is randomly generated when the
|
||||||
|
@ -2,6 +2,7 @@ package hirs.data.persist.certificate.attributes;
|
|||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Embeddable;
|
import javax.persistence.Embeddable;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -15,7 +16,7 @@ import java.math.BigInteger;
|
|||||||
* for specifications for TPM 2.0 (pg. 19).
|
* for specifications for TPM 2.0 (pg. 19).
|
||||||
*/
|
*/
|
||||||
@Embeddable
|
@Embeddable
|
||||||
public class TPMSecurityAssertions {
|
public class TPMSecurityAssertions implements Serializable {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* A type to handle the different endorsement key generation types used in the TPM
|
* A type to handle the different endorsement key generation types used in the TPM
|
||||||
|
@ -2,6 +2,7 @@ package hirs.data.persist.certificate.attributes;
|
|||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Embeddable;
|
import javax.persistence.Embeddable;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.math.BigInteger;
|
import java.math.BigInteger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -15,7 +16,7 @@ import java.math.BigInteger;
|
|||||||
* for specifications for TPM 2.0.
|
* for specifications for TPM 2.0.
|
||||||
*/
|
*/
|
||||||
@Embeddable
|
@Embeddable
|
||||||
public class TPMSpecification {
|
public class TPMSpecification implements Serializable {
|
||||||
|
|
||||||
@Column
|
@Column
|
||||||
private String family;
|
private String family;
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
package hirs.data.persist.tpm;
|
package hirs.data.persist.tpm;
|
||||||
|
|
||||||
import java.util.UUID;
|
import org.apache.logging.log4j.LogManager;
|
||||||
|
import org.apache.logging.log4j.Logger;
|
||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Embeddable;
|
import javax.persistence.Embeddable;
|
||||||
@ -14,9 +15,8 @@ import javax.xml.bind.annotation.XmlSchemaType;
|
|||||||
import javax.xml.bind.annotation.XmlType;
|
import javax.xml.bind.annotation.XmlType;
|
||||||
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
|
import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
|
||||||
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
|
||||||
|
import java.io.Serializable;
|
||||||
import org.apache.logging.log4j.LogManager;
|
import java.util.UUID;
|
||||||
import org.apache.logging.log4j.Logger;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Java class for QuoteData complex type, which was modified from code
|
* Java class for QuoteData complex type, which was modified from code
|
||||||
@ -30,7 +30,7 @@ import org.apache.logging.log4j.Logger;
|
|||||||
+ "Integrity_Report_v1_0#", propOrder = {"quote2",
|
+ "Integrity_Report_v1_0#", propOrder = {"quote2",
|
||||||
"tpmSignature" })
|
"tpmSignature" })
|
||||||
@Embeddable
|
@Embeddable
|
||||||
public class QuoteData {
|
public class QuoteData implements Serializable {
|
||||||
|
|
||||||
private static final Logger LOGGER = LogManager.getLogger(QuoteData.class);
|
private static final Logger LOGGER = LogManager.getLogger(QuoteData.class);
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ import org.joda.time.Period;
|
|||||||
|
|
||||||
import javax.persistence.Column;
|
import javax.persistence.Column;
|
||||||
import javax.persistence.Embeddable;
|
import javax.persistence.Embeddable;
|
||||||
|
import java.io.Serializable;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -14,7 +15,7 @@ import java.util.Date;
|
|||||||
* a specified time of day.
|
* a specified time of day.
|
||||||
*/
|
*/
|
||||||
@Embeddable
|
@Embeddable
|
||||||
public class ScheduledJobInfo {
|
public class ScheduledJobInfo implements Serializable {
|
||||||
|
|
||||||
private static final long MINIMUM_FREQUENCY_MILLISECONDS = 1;
|
private static final long MINIMUM_FREQUENCY_MILLISECONDS = 1;
|
||||||
|
|
||||||
|
@ -9,8 +9,6 @@ import javax.persistence.Embedded;
|
|||||||
import javax.persistence.Entity;
|
import javax.persistence.Entity;
|
||||||
import javax.persistence.FetchType;
|
import javax.persistence.FetchType;
|
||||||
import javax.persistence.Id;
|
import javax.persistence.Id;
|
||||||
import javax.persistence.JoinColumn;
|
|
||||||
import javax.persistence.ManyToOne;
|
|
||||||
import javax.persistence.OneToMany;
|
import javax.persistence.OneToMany;
|
||||||
import javax.persistence.Table;
|
import javax.persistence.Table;
|
||||||
import javax.persistence.UniqueConstraint;
|
import javax.persistence.UniqueConstraint;
|
||||||
|
@ -1,10 +1,12 @@
|
|||||||
package hirs.repository.spacewalk;
|
package hirs.repository.spacewalk;
|
||||||
|
|
||||||
|
|
||||||
|
import java.io.Serializable;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wraps credentials for Spacewalk connections.
|
* Wraps credentials for Spacewalk connections.
|
||||||
*/
|
*/
|
||||||
public class Credentials {
|
public class Credentials implements Serializable {
|
||||||
private String userName, password;
|
private String userName, password;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user