Moved files to portal

HIRS_AttestationCA/src/main/java/hirs/attestationca/InitializationListener.java

@@ -1,6 +1,5 @@
 package hirs.attestationca;
 
-import hirs.attestationca.configuration.PersistenceConfiguration;
 import hirs.attestationca.persist.DBAppraiserManager;
 import hirs.attestationca.persist.DBDeviceGroupManager;
 import hirs.attestationca.persist.DBPolicyManager;
@@ -8,7 +7,6 @@ import hirs.utils.HIRSProfiles;
 import org.hibernate.SessionFactory;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.orm.hibernate5.LocalSessionFactoryBean;
-import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
 
 import javax.servlet.ServletContextEvent;
 import javax.servlet.ServletContextListener;
@@ -16,8 +14,7 @@ import javax.servlet.ServletContextListener;
 /**
  * Simply holds a contextInitialized method which will be called when the web app starts.
  */
-public class InitializationListener extends AbstractAnnotationConfigDispatcherServletInitializer
+public class InitializationListener implements ServletContextListener {
-        implements ServletContextListener {
     @Override
     public void contextInitialized(final ServletContextEvent event) {
         AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
@@ -40,25 +37,4 @@ public class InitializationListener extends AbstractAnnotationConfigDispatcherSe
     public void contextDestroyed(final ServletContextEvent event) {
 
     }
-
-    @Override
-    protected Class<?>[] getRootConfigClasses() {
-        return new Class[] {
-                AttestationCertificateAuthorityConfiguration.class
-        };
-    }
-
-    @Override
-    protected Class<?>[] getServletConfigClasses() {
-        return new Class[] {
-                PersistenceConfiguration.class,
-        };
-    }
-
-    @Override
-    protected String[] getServletMappings() {
-        return new String[] {
-                "/"
-        };
-    }
 }

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

@@ -0,0 +1,30 @@
+package hirs.attestationca.portal.page;
+
+import hirs.attestationca.AttestationCertificateAuthorityConfiguration;
+import hirs.attestationca.portal.persistence.PersistenceConfiguration;
+import org.springframework.web.servlet.support.AbstractAnnotationConfigDispatcherServletInitializer;
+
+public class AcaInitializer extends AbstractAnnotationConfigDispatcherServletInitializer {
+
+
+    @Override
+    protected Class<?>[] getRootConfigClasses() {
+        return new Class[] {
+                AttestationCertificateAuthorityConfiguration.class
+        };
+    }
+
+    @Override
+    protected Class<?>[] getServletConfigClasses() {
+        return new Class[] {
+                CommonPageConfiguration.class, AttestationCertificateAuthorityConfiguration.class
+        };
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] {
+                "/"
+        };
+    }
+}

HIRS_AttestationCAPortal/src/main/java/hirs/attestationca/portal/persistence/PersistenceConfiguration.java

@@ -1,4 +1,4 @@
-package hirs.attestationca.configuration;
+package hirs.attestationca.portal.persistence;
 
 import hirs.attestationca.AttestationCertificateAuthorityConfiguration;
 import hirs.attestationca.persist.DBCertificateManager;