[TASK] Updated for 5.0.0

isaaceindhoven · Aug 23, 2018 · 78293c8 · 78293c8
1 parent 98038bb
commit 78293c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 16 deletions.
diff --git a/isaac-dotcms-minifier-core/src/main/java/nl/isaac/dotcms/minify/shared/HostTools.java b/isaac-dotcms-minifier-core/src/main/java/nl/isaac/dotcms/minify/shared/HostTools.java
@@ -16,6 +16,7 @@
 import com.dotmarketing.business.web.WebAPILocator;
 import com.dotmarketing.exception.DotDataException;
 import com.dotmarketing.exception.DotSecurityException;
+import com.dotmarketing.util.PageMode;
 import com.liferay.portal.PortalException;
 import com.liferay.portal.SystemException;
 
@@ -71,18 +72,10 @@ public static Host getHostByIdentifier(String identifier) {
 	}
 
 
-	/**
-	 * @return true if the request has been made from the live mode, false
-	 *         otherwise
-	 */
 	public static boolean isLiveMode(HttpServletRequest request) {
-		Object EDIT_MODE_SESSION = request.getSession().getAttribute(com.dotmarketing.util.WebKeys.EDIT_MODE_SESSION);
-		Object PREVIEW_MODE_SESSION = request.getSession().getAttribute(com.dotmarketing.util.WebKeys.PREVIEW_MODE_SESSION);
-		if (EDIT_MODE_SESSION != null) {
-			return !Boolean.valueOf(EDIT_MODE_SESSION.toString());
-		} else if (PREVIEW_MODE_SESSION != null) {
-			return !Boolean.valueOf(PREVIEW_MODE_SESSION.toString());
-		}
-		return true;
+		boolean EDIT_MODE = PageMode.get(request) == PageMode.EDIT_MODE;
+		boolean PREVIEW_MODE = PageMode.get(request) == PageMode.PREVIEW_MODE;
+
+		return !(EDIT_MODE || PREVIEW_MODE);
 	}
 }
diff --git a/...ifier-dynamic/src/main/java/nl/isaac/dotcms/util/osgi/ExtendedGenericBundleActivator.java b/...ifier-dynamic/src/main/java/nl/isaac/dotcms/util/osgi/ExtendedGenericBundleActivator.java
@@ -26,7 +26,10 @@
 import javax.servlet.Servlet;
 import javax.servlet.ServletException;
 
+import org.apache.commons.lang3.Validate;
 import org.apache.felix.http.api.ExtHttpService;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.core.LoggerContext;
 import org.apache.velocity.app.VelocityEngine;
 import org.apache.velocity.tools.view.context.ViewContext;
 import org.osgi.framework.Bundle;
@@ -42,9 +45,6 @@
 import org.quartz.impl.StdSchedulerFactory;
 import org.springframework.web.servlet.DispatcherServlet;
 
-import com.dotcms.repackage.org.apache.commons.lang.Validate;
-import com.dotcms.repackage.org.apache.logging.log4j.LogManager;
-import com.dotcms.repackage.org.apache.logging.log4j.core.LoggerContext;
 import com.dotcms.rest.WebResource;
 import com.dotcms.rest.config.RestServiceUtil;
 import com.dotmarketing.business.APILocator;

diff --git a/pom.xml b/pom.xml
@@ -18,7 +18,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<project.dotcms.version>4.3.3</project.dotcms.version>
+		<project.dotcms.version>5.0.0</project.dotcms.version>
 	</properties>
 
 	<prerequisites>