details: https://code.openbravo.com/erp/devel/pi/rev/b06a2c5097c1
changeset: 30565:b06a2c5097c1
user: Martin Taal <martin.taal <at> openbravo.com>
date: Mon Oct 31 09:41:22 2016 +0100
summary: Related to issue 34267: Let the basekernelservlet handle cors
requests
Backout of changeset
diffstat:
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
| 6 +--
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
| 24 +---------
2 files changed, 2 insertions(+), 28 deletions(-)
diffs (75 lines):
diff -r a9ab872b6dee -r b06a2c5097c1
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Thu Oct 27 12:14:29 2016 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/BaseKernelServlet.java
Mon Oct 31 09:41:22 2016 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2009-2016 Openbravo SLU
+ * All portions are Copyright (C) 2009-2014 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -50,10 +50,6 @@
public void service(final HttpServletRequest request, HttpServletResponse
response)
throws ServletException, IOException {
-
- // always set the cors headers
- KernelUtils.getInstance().setCORSHeaders(request, response);
-
// encapsulate the response to catch any redirects
// redirects are done by the authentication manager
final KernelHttpServletResponse localResponse = new
KernelHttpServletResponse(response);
diff -r a9ab872b6dee -r b06a2c5097c1
modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
---
a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
Thu Oct 27 12:14:29 2016 +0200
+++
b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/KernelUtils.java
Mon Oct 31 09:41:22 2016 +0100
@@ -11,21 +11,18 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2010-2016 Openbravo SLU
+ * All portions are Copyright (C) 2010-2015 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
*/
package org.openbravo.client.kernel;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringEscapeUtils;
import org.apache.log4j.Logger;
@@ -512,25 +509,6 @@
}
/**
- * See https://en.wikipedia.org/wiki/Cross-origin_resource_sharing
- */
- public void setCORSHeaders(HttpServletRequest request, HttpServletResponse
response)
- throws ServletException, IOException {
-
- String origin = request.getHeader("Origin");
-
- if (origin != null && !origin.equals("")) {
- response.setHeader("Access-Control-Allow-Origin", origin);
- response.setHeader("Access-Control-Allow-Credentials", "true");
- response.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS");
- response.setHeader("Access-Control-Allow-Headers",
- "Content-Type, Origin, Accept, X-Requested-With,
Access-Control-Allow-Credentials");
-
- response.setHeader("Access-Control-Max-Age", "10000");
- }
- }
-
- /**
* Returns true if any of the identifier properties of the provided entity
is nullable
*
* @param entity
------------------------------------------------------------------------------
The Command Line: Reinvented for Modern Developers
Did the resurgence of CLI tooling catch you by surprise?
Reconnect with the command line and become more productive.
Learn the new .NET and ASP.NET CLI. Get your free copy!
http://sdm.link/telerik
_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
