Merge branch 'issue-395' of https://github.com/nsacyber/HIRS into issue-395

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/Page.java

@@ -57,7 +57,7 @@ public enum Page {
     /**
      * Page to display RIM event digest table.
      */
-    TPM_EVENTS("RIM Database", "ic_important_devices", "first"),
+    RIM_DATABASE("RIM Database", "ic_important_devices", "first"),
     /**
      * Page that manages Attestation CA Policy.
      */

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/page/controllers/RimDatabasePageController.java

@@ -40,8 +40,8 @@ import java.text.SimpleDateFormat;
  * Controller for the TPM Events page.
  */
 @Controller
-@RequestMapping("/tpm-events")
-public class TpmEventsPageController
+@RequestMapping("/rim-database")
+public class RimDatabasePageController
         extends PageController<NoPageParams> {
 
     private static final String BIOS_RELEASE_DATE_FORMAT = "yyyy-MM-dd";
@@ -51,7 +51,7 @@ public class TpmEventsPageController
     private final ReferenceDigestManager referenceDigestManager;
     private final ReferenceEventManager referenceEventManager;
     private static final Logger LOGGER
-            = LogManager.getLogger(TpmEventsPageController.class);
+            = LogManager.getLogger(RimDatabasePageController.class);
 
     /**
      * This class was created for the purposes of avoiding findbugs message: As
@@ -103,11 +103,11 @@ public class TpmEventsPageController
      * @param referenceEventManager  the referenceEventManager object
      */
     @Autowired
-    public TpmEventsPageController(
+    public RimDatabasePageController(
             final DBReferenceManifestManager referenceManifestManager,
             final DBReferenceDigestManager referenceDigestManager,
             final DBReferenceEventManager referenceEventManager) {
-        super(Page.TPM_EVENTS);
+        super(Page.RIM_DATABASE);
         this.referenceManifestManager = referenceManifestManager;
         this.referenceDigestManager = referenceDigestManager;
         this.referenceEventManager = referenceEventManager;

HIRS_AttestationCAPortal/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -67,6 +67,10 @@
                         <a href="${portal}/devices"><img src="${icons}/ic_devices_black_24dp.png" /> Devices</a>
                     </h3>  
                     <h4>View devices covered by this CA for supply chain validation.</h4>
+                    <h3>
+                        <a href="${portal}/rim-database"><img src="${icons}/ic_devices_black_24dp.png" /> RIM Database</a>
+                    </h3>
+                    <h4>View a list of TPM events </h4>
                 </div>
             </div>
         </div>