Merge 1806 code of vid-common

Change-Id: I75d52abed4a24dfe3827d79edc4a2938726aa87a
Issue-ID: VID-208
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>

1 files changed, 22 insertions, 0 deletions

diff --git a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
index c8fbc4347..93e867d63 100644
--- a/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
+++ b/epsdk-app-onap/src/main/java/org/onap/portalapp/conf/ExternalAppInitializer.java
@@ -37,7 +37,13 @@
  */
 package org.onap.portalapp.conf;
 
+import org.onap.vid.controllers.ChangeManagementController;
+import org.onap.vid.controllers.MaintenanceController;
+import org.onap.vid.controllers.RoleGeneratorController;
 import org.onap.portalsdk.core.conf.AppInitializer;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import java.util.TimeZone;
 
 public class ExternalAppInitializer extends AppInitializer {
 
@@ -62,4 +68,20 @@ public class ExternalAppInitializer extends AppInitializer {
 		return super.getServletMappings();
 	}
 
+//	@Override
+//	public void onStartup(ServletContext servletContext) throws ServletException {
+//		super.onStartup(servletContext);
+//		setDefaultTimeZoneToUTC();
+//		servletContext.addFilter("requestFromLocalhost", LocalhostFilter.class)
+//				.addMappingForUrlPatterns(null, false,
+//						String.format("/%s/%s/*", ChangeManagementController.CHANGE_MANAGEMENT, ChangeManagementController.VNF_WORKFLOW_RELATION),
+//						String.format("/%s/*", RoleGeneratorController.GENERATE_ROLE_SCRIPT),
+//						String.format("/%s/*", MaintenanceController.MAINTENANCE));
+//	}
+
+	//set time zone to UTC so Dates would be written to DB in UTC timezone
+	private void setDefaultTimeZoneToUTC() {
+		System.setProperty("user.timezone", "UTC");
+		TimeZone.setDefault(TimeZone.getTimeZone("UTC")); //since TimeZone cache previous user.timezone
+	}
 }