Repository: incubator-unomi Updated Branches: refs/heads/master b7357f922 -> 3e32a969d
UNOMI-201 : remove scripts inside context.js Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/3e32a969 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/3e32a969 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/3e32a969 Branch: refs/heads/master Commit: 3e32a969d842a582cd95bb4fd51d484b940015e5 Parents: b7357f9 Author: tdraier <[email protected]> Authored: Tue Sep 25 15:46:13 2018 +0200 Committer: tdraier <[email protected]> Committed: Tue Sep 25 15:46:13 2018 +0200 ---------------------------------------------------------------------- .../org/apache/unomi/web/ContextServlet.java | 6 - wab/src/main/resources/javascript/base.js | 174 ------------------- .../resources/javascript/impersonateBase.js | 131 -------------- 3 files changed, 311 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3e32a969/wab/src/main/java/org/apache/unomi/web/ContextServlet.java ---------------------------------------------------------------------- diff --git a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java index 7792180..d4bc05c 100644 --- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java +++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java @@ -46,8 +46,6 @@ public class ContextServlet extends HttpServlet { private static final long serialVersionUID = 2928875830103325238L; private static final Logger logger = LoggerFactory.getLogger(ContextServlet.class.getName()); - private static final String BASE_SCRIPT_LOCATION = "/javascript/base.js"; - private static final String IMPERSONATE_BASE_SCRIPT_LOCATION = "/javascript/impersonateBase.js"; private static final int MAX_COOKIE_AGE_IN_SECONDS = 60 * 60 * 24 * 365; // 1 year private String profileIdCookieName = "context-profile-id"; @@ -287,10 +285,6 @@ public class ContextServlet extends HttpServlet { .append("var cxs = ") .append(contextAsJSONString) .append(";\n"); - - // now we copy the base script source code - InputStream baseScriptStream = getServletContext().getResourceAsStream(profile instanceof Persona ? IMPERSONATE_BASE_SCRIPT_LOCATION : BASE_SCRIPT_LOCATION); - IOUtils.copy(baseScriptStream, responseWriter); } responseWriter.flush(); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3e32a969/wab/src/main/resources/javascript/base.js ---------------------------------------------------------------------- diff --git a/wab/src/main/resources/javascript/base.js b/wab/src/main/resources/javascript/base.js deleted file mode 100644 index 9799771..0000000 --- a/wab/src/main/resources/javascript/base.js +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// base Javascript tag container - -/* - * Recursively merge properties of two objects - */ -cxs.merge = function (obj1, obj2) { - - for (var obj2Property in obj2) { - try { - // Property in destination object set; update its value. - if (obj2[obj2Property].constructor == Object) { - obj1[obj2Property] = this.mergeObjects(obj1[obj2Property], obj2[obj2Property]); - - } else { - obj1[obj2Property] = obj2[obj2Property]; - - } - - } catch (e) { - // Property in destination object not set; create it and set its value. - obj1[obj2Property] = obj2[obj2Property]; - - } - } - - return obj1; -}; - -cxs.createCORSRequest = function (method, url) { - var xhr = new XMLHttpRequest(); - if ("withCredentials" in xhr) { - - // Check if the XMLHttpRequest object has a "withCredentials" property. - // "withCredentials" only exists on XMLHTTPRequest2 objects. - xhr.withCredentials = true; - xhr.open(method, url, true); - - } else if (typeof XDomainRequest != "undefined") { - - // Otherwise, check if XDomainRequest. - // XDomainRequest only exists in IE, and is IE's way of making CORS requests. - xhr = new XDomainRequest(); - xhr.open(method, url); - - } else { - - // Otherwise, CORS is not supported by the browser. - xhr = null; - - } - return xhr; -}; - -cxs.loadXMLDoc = function (url, successCallBack) { - var xhr = this.createCORSRequest("GET", url); - if (!xhr) { - alert("CORS not supported by browser!"); - } - xhr.onreadystatechange = function () { - if (xhr.readyState == 4 && xhr.status == 200) { - successCallBack(xhr); - } - }; - xhr.send(); -}; - -/** - * - * @param event JSONObject: {eventType:"", properties: {}} - * @param successCallBack - */ -cxs.collectEvent = function (event, successCallBack, errorCallback) { - this.collectEvents({events: [event]}, successCallBack, errorCallback); -}; - -/** - * - * @param events JSONObject: {events: [{eventType:"", properties: {}}, ...]} - * @param successCallBack - */ -cxs.collectEvents = function (events, successCallBack, errorCallback) { - data = JSON.stringify(events); - var url = window.digitalData.contextServerPublicUrl + "/eventcollector" + "?sessionId=" + cxs.sessionId; - var xhr = new XMLHttpRequest(); - var isGet = data.length < 100; - if (isGet) { - xhr.withCredentials = true; - xhr.open("GET", url + "&payload=" + encodeURIComponent(data), true); - } else if ("withCredentials" in xhr) { - xhr.open("POST", url, true); - xhr.withCredentials = true; - } else if (typeof XDomainRequest != "undefined") { - xhr = new XDomainRequest(); - xhr.open("POST", url); - } - xhr.onreadystatechange = function () { - if (xhr.readyState != 4) { - return; - } - if (xhr.status == 200) { - var jsonResponse = JSON.parse(xhr.responseText); - successCallBack(xhr); - } else { - console.log("contextserver: " + xhr.status + " ERROR: " + xhr.statusText); - if (errorCallback) { - errorCallback(xhr); - } - } - }; - xhr.setRequestHeader("Content-Type", "text/plain;charset=UTF-8"); // Use text/plain to avoid CORS preflight - if (isGet) { - xhr.send(); - } else { - xhr.send(data); - } -}; - -cxs.createCookie = function (name, value, days) { - if (days) { - var date = new Date(); - date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); - var expires = "; expires=" + date.toGMTString(); - } - else var expires = ""; - document.cookie = name + "=" + value + expires + "; path=/"; -}; - -cxs.readCookie = function (name) { - var nameEQ = name + "="; - var ca = document.cookie.split(';'); - for (var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) == ' ') c = c.substring(1, c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length); - } - return null; -}; - -cxs.eraseCookie = function (name) { - createCookie(name, "", -1); -}; - - -if (window.digitalData.loadCallbacks && window.digitalData.loadCallbacks.length > 0) { - console.log("contextserver: Found context server load callbacks, calling now..."); - if ( window.digitalData.loadCallbacks) { - for (var i = 0; i < window.digitalData.loadCallbacks.length; i++) { - window.digitalData.loadCallbacks[i](digitalData); - } - } - if ( window.digitalData.filterCallback) { - for (var i = 0; i < window.digitalData.filterCallback.length; i++) { - window.digitalData.filterCallback[i].callback(cxs.filteringResults[window.digitalData.filterCallback[i].filter.filterid]); - } - } -} - -console.log("contextserver: context server script successfully initialized"); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/3e32a969/wab/src/main/resources/javascript/impersonateBase.js ---------------------------------------------------------------------- diff --git a/wab/src/main/resources/javascript/impersonateBase.js b/wab/src/main/resources/javascript/impersonateBase.js deleted file mode 100644 index 0406eed..0000000 --- a/wab/src/main/resources/javascript/impersonateBase.js +++ /dev/null @@ -1,131 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -// base Javascript tag container - -/* - * Recursively merge properties of two objects - */ -cxs.merge = function (obj1, obj2) { - - for (var obj2Property in obj2) { - try { - // Property in destination object set; update its value. - if (obj2[obj2Property].constructor == Object) { - obj1[obj2Property] = this.mergeObjects(obj1[obj2Property], obj2[obj2Property]); - - } else { - obj1[obj2Property] = obj2[obj2Property]; - - } - - } catch (e) { - // Property in destination object not set; create it and set its value. - obj1[obj2Property] = obj2[obj2Property]; - - } - } - - return obj1; -}; - -cxs.createCORSRequest = function (method, url) { - var xhr = new XMLHttpRequest(); - if ("withCredentials" in xhr) { - - // Check if the XMLHttpRequest object has a "withCredentials" property. - // "withCredentials" only exists on XMLHTTPRequest2 objects. - xhr.withCredentials = true; - xhr.open(method, url, true); - - } else if (typeof XDomainRequest != "undefined") { - - // Otherwise, check if XDomainRequest. - // XDomainRequest only exists in IE, and is IE's way of making CORS requests. - xhr = new XDomainRequest(); - xhr.open(method, url); - - } else { - - // Otherwise, CORS is not supported by the browser. - xhr = null; - - } - return xhr; -}; - -cxs.loadXMLDoc = function (url, successCallBack) { - var xhr = this.createCORSRequest("GET", url); - if (!xhr) { - alert("CORS not supported by browser!"); - } - xhr.onreadystatechange = function () { - if (xhr.readyState == 4 && xhr.status == 200) { - successCallBack(xhr); - } - } - xhr.send(); -}; - -cxs.collectEvent = function (event, successCallBack) { - successCallBack(); -}; - -cxs.collectEvents = function(events, successCallBack) { - successCallBack(); -}; - -cxs.createCookie = function (name, value, days) { - if (days) { - var date = new Date(); - date.setTime(date.getTime() + (days * 24 * 60 * 60 * 1000)); - var expires = "; expires=" + date.toGMTString(); - } - else var expires = ""; - document.cookie = name + "=" + value + expires + "; path=/"; -}; - -cxs.readCookie = function (name) { - var nameEQ = name + "="; - var ca = document.cookie.split(';'); - for (var i = 0; i < ca.length; i++) { - var c = ca[i]; - while (c.charAt(0) == ' ') c = c.substring(1, c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length, c.length); - } - return null; -}; - -cxs.eraseCookie = function (name) { - createCookie(name, "", -1); -}; - - -if (window.digitalData.loadCallbacks && window.digitalData.loadCallbacks.length > 0) { - console.log("cxs: Found context server load callbacks, calling now..."); - if ( window.digitalData.loadCallbacks) { - for (var i = 0; i < window.digitalData.loadCallbacks.length; i++) { - window.digitalData.loadCallbacks[i](digitalData); - } - } - if ( window.digitalData.filterCallback) { - for (var i = 0; i < window.digitalData.filterCallback.length; i++) { - window.digitalData.filterCallback[i].callback(cxs.filteringResults[window.digitalData.filterCallback[i].filter.filterid]); - } - } -} - -console.log("cxs: context server script successfully initialized");
