0027248: Sometimes the session expires before it should, use a different servlet/url for retrieving content before login

diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT.xml
@@ -39,6 +39,19 @@
 <!--A35DC22EF2B44CDBABB7C0AC22E9D575-->  <NAME><![CDATA[Mobile Logout]]></NAME>
 <!--A35DC22EF2B44CDBABB7C0AC22E9D575--></AD_MODEL_OBJECT>
 
+<!--A91F66A1A66F4AFC823F06352F234439--><AD_MODEL_OBJECT>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <AD_MODEL_OBJECT_ID><![CDATA[A91F66A1A66F4AFC823F06352F234439]]></AD_MODEL_OBJECT_ID>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <ACTION><![CDATA[P]]></ACTION>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <CLASSNAME><![CDATA[org.openbravo.mobile.core.MobileCoreComponentServlet]]></CLASSNAME>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <AD_MODULE_ID><![CDATA[08943B85ADF64E708797A753E5B6AAEE]]></AD_MODULE_ID>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <OBJECT_TYPE><![CDATA[S]]></OBJECT_TYPE>
+<!--A91F66A1A66F4AFC823F06352F234439-->  <NAME><![CDATA[Mobile Core Component Servlet]]></NAME>
+<!--A91F66A1A66F4AFC823F06352F234439--></AD_MODEL_OBJECT>
+
 <!--FC858A1691EA4D91A83D308AC633FBCA--><AD_MODEL_OBJECT>
 <!--FC858A1691EA4D91A83D308AC633FBCA-->  <AD_MODEL_OBJECT_ID><![CDATA[FC858A1691EA4D91A83D308AC633FBCA]]></AD_MODEL_OBJECT_ID>
 <!--FC858A1691EA4D91A83D308AC633FBCA-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
--- a/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
+++ b/src-db/database/sourcedata/AD_MODEL_OBJECT_MAPPING.xml
@@ -1,5 +1,15 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <data>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE--><AD_MODEL_OBJECT_MAPPING>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[013CE9E9AB8943A79840C0AFE9FD03DE]]></AD_MODEL_OBJECT_MAPPING_ID>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <AD_ORG_ID><![CDATA[0]]></AD_ORG_ID>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <ISACTIVE><![CDATA[Y]]></ISACTIVE>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <AD_MODEL_OBJECT_ID><![CDATA[A91F66A1A66F4AFC823F06352F234439]]></AD_MODEL_OBJECT_ID>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <MAPPINGNAME><![CDATA[/org.openbravo.mobile.core/*]]></MAPPINGNAME>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE-->  <ISDEFAULT><![CDATA[N]]></ISDEFAULT>
+<!--013CE9E9AB8943A79840C0AFE9FD03DE--></AD_MODEL_OBJECT_MAPPING>
+
 <!--02BABC887F6D45FF94C1576AD43A0464--><AD_MODEL_OBJECT_MAPPING>
 <!--02BABC887F6D45FF94C1576AD43A0464-->  <AD_MODEL_OBJECT_MAPPING_ID><![CDATA[02BABC887F6D45FF94C1576AD43A0464]]></AD_MODEL_OBJECT_MAPPING_ID>
 <!--02BABC887F6D45FF94C1576AD43A0464-->  <AD_CLIENT_ID><![CDATA[0]]></AD_CLIENT_ID>
diff --git a/src/org/openbravo/mobile/core/MobileCoreComponentServlet.java b/src/org/openbravo/mobile/core/MobileCoreComponentServlet.java
new file mode 100644
--- /dev/null
+++ b/src/org/openbravo/mobile/core/MobileCoreComponentServlet.java
@@ -0,0 +1,213 @@
+/*
+ ************************************************************************************
+ * Copyright (C) 2014 Openbravo S.L.U.
+ * Licensed under the Openbravo Commercial License version 1.0
+ * You may obtain a copy of the License at http://www.openbravo.com/legal/obcl.html
+ * or in the legal folder of this module distribution.
+ ************************************************************************************
+ */
+
+package org.openbravo.mobile.core;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.enterprise.inject.Any;
+import javax.enterprise.inject.Instance;
+import javax.inject.Inject;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.log4j.Logger;
+import org.openbravo.base.HttpBaseUtils;
+import org.openbravo.client.kernel.BaseComponent;
+import org.openbravo.client.kernel.Component;
+import org.openbravo.client.kernel.ComponentGenerator;
+import org.openbravo.client.kernel.ComponentProvider;
+import org.openbravo.client.kernel.KernelConstants;
+import org.openbravo.client.kernel.KernelUtils;
+import org.openbravo.dal.core.OBContext;
+import org.openbravo.service.web.WebServiceUtil;
+
+/**
+ * The mobile core entry point for getting to static resources without needing to login. All
+ * components called by this servlet need to let {@link BaseComponent#bypassAuthentication()} return
+ * true.
+ * 
+ * @author mtaal
+ */
+public class MobileCoreComponentServlet extends HttpServlet {
+  private static final String RESPONSE_HEADER_ETAG = "ETag";
+  private static final String RESPONSE_HEADER_LASTMODIFIED = "Last-Modified";
+  private static final String RESPONSE_HEADER_CACHE_CONTROL = "Cache-Control";
+  private static final String RESPONSE_NO_CACHE = "no-cache";
+  private static final String RESPONSE_HEADER_CONTENTTYPE = "Content-Type";
+
+  private static final String REQUEST_HEADER_IFMODIFIEDSINCE = "If-Modified-Since";
+  private static final String REQUEST_HEADER_IFNONEMATCH = "If-None-Match";
+
+  private static final Logger log = Logger.getLogger(MobileCoreComponentServlet.class);
+
+  private static final long serialVersionUID = 1L;
+
+  private static final String servletPathPart = "org.openbravo.mobile.core";
+
+  private static ServletContext servletContext;
+
+  @Inject
+  @Any
+  private Instance<ComponentProvider> componentProviders;
+
+  public void init(ServletConfig config) throws ServletException {
+    super.init(config);
+    servletContext = config.getServletContext();
+  }
+
+  @Override
+  public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException {
+
+    if (!request.getRequestURI().contains("/" + servletPathPart)) {
+      throw new UnsupportedOperationException("Invalid url " + request.getRequestURI());
+    }
+
+    OBContext.setAdminMode(true);
+    try {
+      processComponentRequest(request, response);
+    } finally {
+      OBContext.restorePreviousMode();
+      OBContext.setOBContext((OBContext) null);
+    }
+  }
+
+  // NOTE: this exact same method is present in the KernelServlet, if changed
+  // here, please also check the method in the KernelServlet class
+  private Component getComponent(HttpServletRequest request) {
+
+    final int nameIndex = request.getRequestURI().indexOf(servletPathPart);
+    final String servicePart = request.getRequestURI().substring(nameIndex);
+    final String[] pathParts = WebServiceUtil.getInstance().getSegments(servicePart);
+    if (pathParts.length < 2) {
+      throw new UnsupportedOperationException("No service name present in url "
+          + request.getRequestURI());
+    }
+    final String componentProviderName = pathParts[1];
+
+    final String componentId;
+    if (pathParts.length > 2) {
+      componentId = pathParts[2];
+    } else {
+      componentId = null;
+    }
+
+    final ComponentProvider componentProvider = componentProviders.select(
+        new ComponentProvider.Selector(componentProviderName)).get();
+
+    final Map<String, Object> parameters = getParameterMap(request);
+    final Component component = componentProvider.getComponent(componentId, parameters);
+
+    // we are not logging in allow only selected components
+    if (!((BaseComponent) component).bypassAuthentication()) {
+      throw new UnsupportedOperationException("Request not supported " + request.getRequestURI());
+    }
+
+    return component;
+  }
+
+  // NOTE: this exact same method is present in the KernelServlet, if changed
+  // here, please also check the method in the KernelServlet class
+  private void processComponentRequest(HttpServletRequest request, HttpServletResponse response)
+      throws IOException, ServletException {
+    Component component = getComponent(request);
+    OBContext.setAdminMode(true);
+    String eTag;
+    try {
+      eTag = component.getETag();
+    } finally {
+      OBContext.restorePreviousMode();
+    }
+    final String requestETag = request.getHeader(REQUEST_HEADER_IFNONEMATCH);
+
+    if (requestETag != null && eTag.equals(requestETag)) {
+      response.sendError(HttpServletResponse.SC_NOT_MODIFIED);
+      response.setDateHeader(RESPONSE_HEADER_LASTMODIFIED,
+          request.getDateHeader(REQUEST_HEADER_IFMODIFIEDSINCE));
+      return;
+    }
+
+    try {
+      final String result = ComponentGenerator.getInstance().generate(component);
+
+      response.setHeader(RESPONSE_HEADER_ETAG, eTag);
+      response.setDateHeader(RESPONSE_HEADER_LASTMODIFIED, component.getLastModified().getTime());
+      response.setContentType(component.getContentType());
+      response.setHeader(RESPONSE_HEADER_CONTENTTYPE, component.getContentType());
+      response.setHeader(RESPONSE_HEADER_CACHE_CONTROL, RESPONSE_NO_CACHE);
+
+      final PrintWriter pw = response.getWriter();
+      pw.write(result);
+      pw.close();
+    } catch (Exception e) {
+      log.error("Generating content using component: "
+          + (component != null ? component.getClass().getName() : "NULL"), e);
+      if (!response.isCommitted()) {
+        response.setContentType(KernelConstants.JAVASCRIPT_CONTENTTYPE);
+        response.setHeader(RESPONSE_HEADER_CONTENTTYPE, KernelConstants.JAVASCRIPT_CONTENTTYPE);
+        response.setHeader(RESPONSE_HEADER_CACHE_CONTROL, RESPONSE_NO_CACHE);
+        response.getWriter().write(KernelUtils.getInstance().createErrorJavaScript(e));
+      }
+    }
+  }
+
+  @Override
+  public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException {
+    doGet(request, response);
+  }
+
+  @Override
+  public void doDelete(HttpServletRequest request, HttpServletResponse response)
+      throws IOException, ServletException {
+    throw new UnsupportedOperationException("Only GET/POST is supported");
+  }
+
+  @Override
+  public void doPut(HttpServletRequest request, HttpServletResponse response) throws IOException,
+      ServletException {
+    throw new UnsupportedOperationException("Only GET/POST is supported");
+  }
+
+  @SuppressWarnings("rawtypes")
+  private Map<String, Object> getParameterMap(HttpServletRequest request) {
+    final Map<String, Object> parameterMap = new HashMap<String, Object>();
+    for (Enumeration keys = request.getParameterNames(); keys.hasMoreElements();) {
+      final String key = (String) keys.nextElement();
+      parameterMap.put(key, request.getParameter(key));
+    }
+
+    if (!parameterMap.containsKey(KernelConstants.CONTEXT_URL)) {
+      parameterMap.put(KernelConstants.CONTEXT_URL, computeContextURL(request));
+    }
+
+    if (!parameterMap.containsKey(KernelConstants.SERVLET_CONTEXT)) {
+      parameterMap.put(KernelConstants.SERVLET_CONTEXT, servletContext);
+    }
+
+    if (!parameterMap.containsKey(KernelConstants.SKIN_PARAMETER)) {
+      parameterMap.put(KernelConstants.SKIN_PARAMETER, KernelConstants.SKIN_DEFAULT);
+    }
+
+    return parameterMap;
+  }
+
+  private String computeContextURL(HttpServletRequest request) {
+    return HttpBaseUtils.getLocalAddress(request);
+  }
+}
diff --git a/src/org/openbravo/mobile/core/templates/cache-manifest.ftl b/src/org/openbravo/mobile/core/templates/cache-manifest.ftl
--- a/src/org/openbravo/mobile/core/templates/cache-manifest.ftl
+++ b/src/org/openbravo/mobile/core/templates/cache-manifest.ftl
@@ -9,12 +9,12 @@
 
 # Core 3rd party libraries
 
-../../org.openbravo.client.kernel/OBMOBC_Main/Lib?_id=Enyo
-../../org.openbravo.client.kernel/OBMOBC_Main/Lib?_id=Deps
+../../org.openbravo.mobile.core/OBMOBC_Main/Lib?_id=Enyo
+../../org.openbravo.mobile.core/OBMOBC_Main/Lib?_id=Deps
 
 <#if data.appName != "">
 # Static resources
-../../org.openbravo.client.kernel/OBMOBC_Main/StaticResources?_appName=${data.appName}
+../../org.openbravo.mobile.core/OBMOBC_Main/StaticResources?_appName=${data.appName}
 ../../web/js/gen/${data.genFileName}.js
 </#if>
 
diff --git a/web/org.openbravo.mobile.core/source/data/ob-model.js b/web/org.openbravo.mobile.core/source/data/ob-model.js
--- a/web/org.openbravo.mobile.core/source/data/ob-model.js
+++ b/web/org.openbravo.mobile.core/source/data/ob-model.js
@@ -33,7 +33,7 @@
           online: true
         });
       } else if (modelParam.prototype.generatedStructure) {
-        var url = '../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel';
+        var url = '../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel';
         url += '?entity=' + modelParam.prototype.entityName;
         url += '&modelName=' + modelParam.prototype.modelName;
         url += '&source=' + modelParam.prototype.source;
@@ -244,4 +244,4 @@
     });
     return '(' + columns + ')';
   }
-});
\ No newline at end of file
+});

diff --git a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
--- a/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
+++ b/src/org/openbravo/retail/posterminal/ApplicationCacheComponent.java
@@ -61,22 +61,22 @@
     // Boot code
 
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=FinancialMgmtTaxRate&modelName=TaxRate&source=org.openbravo.retail.posterminal.master.TaxRate");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=FinancialMgmtTaxRate&modelName=TaxRate&source=org.openbravo.retail.posterminal.master.TaxRate");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=FinancialMgmtTaxZone&modelName=TaxZone&source=org.openbravo.retail.posterminal.master.TaxZone");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=FinancialMgmtTaxZone&modelName=TaxZone&source=org.openbravo.retail.posterminal.master.TaxZone");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingProductPrice&modelName=ProductPrice&source=org.openbravo.retail.posterminal.master.ProductPrice");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingProductPrice&modelName=ProductPrice&source=org.openbravo.retail.posterminal.master.ProductPrice");
 
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingAdjustment&modelName=Discount&source=org.openbravo.retail.posterminal.master.Discount");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingAdjustment&modelName=Discount&source=org.openbravo.retail.posterminal.master.Discount");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingAdjustmentBusinessPartner&modelName=DiscountFilterBusinessPartner&source=org.openbravo.retail.posterminal.master.DiscountFilterBusinessPartner");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingAdjustmentBusinessPartner&modelName=DiscountFilterBusinessPartner&source=org.openbravo.retail.posterminal.master.DiscountFilterBusinessPartner");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingAdjustmentBusinessPartnerGroup&modelName=DiscountFilterBusinessPartnerGroup&source=org.openbravo.retail.posterminal.master.DiscountFilterBusinessPartnerGroup");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingAdjustmentBusinessPartnerGroup&modelName=DiscountFilterBusinessPartnerGroup&source=org.openbravo.retail.posterminal.master.DiscountFilterBusinessPartnerGroup");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingAdjustmentProduct&modelName=DiscountFilterProduct&source=org.openbravo.retail.posterminal.master.DiscountFilterProduct");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingAdjustmentProduct&modelName=DiscountFilterProduct&source=org.openbravo.retail.posterminal.master.DiscountFilterProduct");
     resources
-        .add("../../org.openbravo.client.kernel/OBMOBC_Main/ClientModel?entity=PricingAdjustmentProductCategory&modelName=DiscountFilterProductCategory&source=org.openbravo.retail.posterminal.master.DiscountFilterProductCategory");
+        .add("../../org.openbravo.mobile.core/OBMOBC_Main/ClientModel?entity=PricingAdjustmentProductCategory&modelName=DiscountFilterProductCategory&source=org.openbravo.retail.posterminal.master.DiscountFilterProductCategory");
 
     // default print templates
     resources.add("../../web/org.openbravo.retail.posterminal/res/printcashup.xml");
@@ -102,7 +102,7 @@
     }
 
     resources
-        .add("../../org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_appName=WebPOS");
+        .add("../../org.openbravo.mobile.core/OBCLKER_Kernel/StyleSheetResources?_appName=WebPOS");
 
     // include all resources defined by other modules
     for (POSAppCacheResourceProvider resourceProvider : resourceProviders) {
diff --git a/web/org.openbravo.retail.posterminal/index.html b/web/org.openbravo.retail.posterminal/index.html
--- a/web/org.openbravo.retail.posterminal/index.html
+++ b/web/org.openbravo.retail.posterminal/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" manifest="../../org.openbravo.client.kernel/OBPOS_Main/AppCacheManifest?_appName=WebPOS">
+<html xmlns="http://www.w3.org/1999/xhtml" manifest="../../org.openbravo.mobile.core/OBPOS_Main/AppCacheManifest?_appName=WebPOS">
 <head>
   <title>Openbravo POS</title>
   <meta charset="utf-8">
@@ -19,15 +19,15 @@
   <link rel="apple-touch-icon" sizes="114x114" href="img/openbravopos114x114.png" />
   <link rel="shortcut icon" type="image/x-icon" href="../../web/images/favicon.ico" />
 
-  <link rel="stylesheet" type="text/css" href="../../org.openbravo.client.kernel/OBCLKER_Kernel/StyleSheetResources?_appName=WebPOS"/>
+  <link rel="stylesheet" type="text/css" href="../../org.openbravo.mobile.core/OBCLKER_Kernel/StyleSheetResources?_appName=WebPOS"/>
 </head>
 
 <body class="enyo-body-fit webkitOverflowScrolling ob-body-standard">
 
-  <script src="../../org.openbravo.client.kernel/OBMOBC_Main/Lib?_id=Enyo"></script>
-  <script src="../../org.openbravo.client.kernel/OBMOBC_Main/Lib?_id=Deps"></script>
+  <script src="../../org.openbravo.mobile.core/OBMOBC_Main/Lib?_id=Enyo"></script>
+  <script src="../../org.openbravo.mobile.core/OBMOBC_Main/Lib?_id=Deps"></script>
   <script src="../org.openbravo.client.kernel/js/LAB.min.js"></script>
-  <script src="../../org.openbravo.client.kernel/OBMOBC_Main/StaticResources?_appName=WebPOS"></script>
+  <script src="../../org.openbravo.mobile.core/OBMOBC_Main/StaticResources?_appName=WebPOS"></script>
   <script src="js/libs/jquery-1.7.2.js"></script>
   <script src="js/libs/core-min.js"></script>
   <script src="js/libs/sha1-min.js"></script>