diff --git a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java index 5e5dd96d..df8acdf1 100644 --- a/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java +++ b/HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/ReferenceManifestPageController.java @@ -61,7 +61,7 @@ public class ReferenceManifestPageController extends PageController { private static final String BIOS_RELEASE_DATE_FORMAT = "yyyy-MM-dd"; - private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rim|rimel|bin))$)"; + private static final String LOG_FILE_PATTERN = "([^\\s]+(\\.(?i)(rim|rimel|bin|log))$)"; private final BiosDateValidator biosValidator; private final ReferenceManifestManager referenceManifestManager; @@ -232,10 +232,6 @@ public class ReferenceManifestPageController messages, rim, referenceManifestManager); - - for (SwidResource swidRes : rim.parseResource()) { - System.out.println("testing this section!"); - } } } diff --git a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java index bd1f869d..e2bdeecb 100644 --- a/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java +++ b/HIRS_Utils/src/main/java/hirs/data/persist/ReferenceManifest.java @@ -469,7 +469,7 @@ public class ReferenceManifest extends ArchivableEntity { if (jaxbe != null) { return jaxbe; } else { - throw new IOException("Invalid swidtag file!"); + throw new IOException("Invalid Base RIM, swidtag format expected."); } }