Repository: incubator-unomi Updated Branches: refs/heads/master fbb36c838 -> 66f335bbd
UNOMI-173 remove remoteAddr and remoteHost Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/66f335bb Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/66f335bb Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/66f335bb Branch: refs/heads/master Commit: 66f335bbd7fc16af9c9061bbf4524adc65e2978c Parents: fbb36c8 Author: Taybou <[email protected]> Authored: Wed Mar 21 16:47:30 2018 +0100 Committer: Taybou <[email protected]> Committed: Wed Mar 21 16:47:30 2018 +0100 ---------------------------------------------------------------------- .../request/actions/SetRemoteHostInfoAction.java | 2 -- .../src/main/resources/messages_en.properties | 2 -- .../src/main/resources/messages_fr.properties | 2 -- .../META-INF/cxs/personas/europeanVisitor.json | 4 +--- .../resources/META-INF/cxs/personas/usVisitor.json | 4 +--- .../properties/sessions/technical/remoteAddr.json | 15 --------------- .../properties/sessions/technical/remoteHost.json | 15 --------------- services/src/main/resources/messages_de.properties | 2 -- services/src/main/resources/messages_en.properties | 2 -- .../markdown/versions/master/custom-extensions.md | 4 +--- 10 files changed, 3 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java ---------------------------------------------------------------------- diff --git a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java index f0d29a2..c3042e3 100644 --- a/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java +++ b/plugins/request/src/main/java/org/apache/unomi/plugins/request/actions/SetRemoteHostInfoAction.java @@ -117,8 +117,6 @@ public class SetRemoteHostInfoAction implements ActionExecutor { remoteAddr = xff; } - session.setProperty("remoteAddr", remoteAddr); - session.setProperty("remoteHost", httpServletRequest.getRemoteHost()); try { if (isAValidIPAddress(remoteAddr)) { ipLookupInDatabase(remoteAddr, session); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/plugins/request/src/main/resources/messages_en.properties ---------------------------------------------------------------------- diff --git a/plugins/request/src/main/resources/messages_en.properties b/plugins/request/src/main/resources/messages_en.properties index d990f9b..d07eb94 100644 --- a/plugins/request/src/main/resources/messages_en.properties +++ b/plugins/request/src/main/resources/messages_en.properties @@ -22,8 +22,6 @@ PROPERTIES_LATITUDE_LABEL=Latitude PROPERTIES_LONGITUDE_LABEL=Longitude PROPERTIES_OPERATINGSYSTEMFAMILY_LABEL=Operating system family PROPERTIES_OPERATINGSYSTEMNAME_LABEL=Operating system name -PROPERTIES_REMOTEADDR_LABEL=IP address -PROPERTIES_REMOTEHOST_LABEL=Host name PROPERTIES_USERAGENTNAME_LABEL=User agent name PROPERTIES_USERAGENTVERSION_LABEL=User agent version" action.requestHeaderToProfilePropertyAction.copyRequestHeader=Copy request header http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/plugins/request/src/main/resources/messages_fr.properties ---------------------------------------------------------------------- diff --git a/plugins/request/src/main/resources/messages_fr.properties b/plugins/request/src/main/resources/messages_fr.properties index 6859b33..9db2dba 100644 --- a/plugins/request/src/main/resources/messages_fr.properties +++ b/plugins/request/src/main/resources/messages_fr.properties @@ -22,8 +22,6 @@ PROPERTIES_LATITUDE_LABEL=Latitude PROPERTIES_LONGITUDE_LABEL=Longitude PROPERTIES_OPERATINGSYSTEMFAMILY_LABEL=Type de syst�me d'exploitation PROPERTIES_OPERATINGSYSTEMNAME_LABEL=Nom du syst�me d'exploitation -PROPERTIES_REMOTEADDR_LABEL=Adresse IP -PROPERTIES_REMOTEHOST_LABEL=Nom de la machine PROPERTIES_USERAGENTNAME_LABEL=Navigateur PROPERTIES_USERAGENTVERSION_LABEL=Version du navigateur action.requestHeaderToProfilePropertyAction.copyRequestHeader=Copier l'en-t�te de requ�te http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/META-INF/cxs/personas/europeanVisitor.json ---------------------------------------------------------------------- diff --git a/services/src/main/resources/META-INF/cxs/personas/europeanVisitor.json b/services/src/main/resources/META-INF/cxs/personas/europeanVisitor.json index 77c1834..70957c3 100644 --- a/services/src/main/resources/META-INF/cxs/personas/europeanVisitor.json +++ b/services/src/main/resources/META-INF/cxs/personas/europeanVisitor.json @@ -23,9 +23,7 @@ "deviceCategory": "Personal computer", "operatingSystemFamily": "OS X", "userAgentName": "Chrome", - "sessionCity": "Lausanne", - "remoteHost": "www.epfl.ch", - "remoteAddr": "128.178.50.12" + "sessionCity": "Lausanne" }, "timeStamp": "2014-09-18T11:40:54Z", "lastEventDate": "2014-09-18T11:40:59Z", http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/META-INF/cxs/personas/usVisitor.json ---------------------------------------------------------------------- diff --git a/services/src/main/resources/META-INF/cxs/personas/usVisitor.json b/services/src/main/resources/META-INF/cxs/personas/usVisitor.json index 5099e21..0123e47 100644 --- a/services/src/main/resources/META-INF/cxs/personas/usVisitor.json +++ b/services/src/main/resources/META-INF/cxs/personas/usVisitor.json @@ -24,9 +24,7 @@ "deviceCategory": "Personal computer", "operatingSystemFamily": "OS X", "userAgentName": "Chrome", - "sessionCity": "Mountain View", - "remoteHost": "www.google.com", - "remoteAddr": "66.249.66.1" + "sessionCity": "Mountain View" }, "timeStamp": "2014-09-18T11:40:54Z", "lastEventDate": "2014-09-18T11:40:59Z", http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json ---------------------------------------------------------------------- diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json deleted file mode 100644 index c851caf..0000000 --- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteAddr.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "metadata": { - "id": "remoteAddr", - "name": "Remote IP address", - "systemTags": [ - "properties", - "sessionProperties", - "technicalSessionProperties" - ] - }, - "type": "string", - "defaultValue": "", - "automaticMappingsFrom": [ ], - "rank": "106.0" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json ---------------------------------------------------------------------- diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json b/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json deleted file mode 100644 index f9cb4e0..0000000 --- a/services/src/main/resources/META-INF/cxs/properties/sessions/technical/remoteHost.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "metadata": { - "id": "remoteHost", - "name": "Remote host address", - "systemTags": [ - "properties", - "sessionProperties", - "technicalSessionProperties" - ] - }, - "type": "string", - "defaultValue": "", - "automaticMappingsFrom": [ ], - "rank": "107.0" -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/messages_de.properties ---------------------------------------------------------------------- diff --git a/services/src/main/resources/messages_de.properties b/services/src/main/resources/messages_de.properties index 0a610f5..40f4807 100644 --- a/services/src/main/resources/messages_de.properties +++ b/services/src/main/resources/messages_de.properties @@ -68,8 +68,6 @@ sessionsProperty.location=Standort sessionsProperty.longitude=L�nge sessionsProperty.operatingSystemFamily=Betriebssystem-Familie sessionsProperty.operatingSystemName=Name des Betriebssystems -sessionsProperty.remoteAddr=Remote-IP-Adresse -sessionsProperty.remoteHost=Remote-Host-Adresse sessionsProperty.userAgent=Browser-User-Agent sessionsProperty.userAgentName=Browser-User-Agent Name sessionsProperty.userAgentVersion=Browser-User-Agent Version http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/services/src/main/resources/messages_en.properties ---------------------------------------------------------------------- diff --git a/services/src/main/resources/messages_en.properties b/services/src/main/resources/messages_en.properties index 2b94ea2..62d6ba3 100644 --- a/services/src/main/resources/messages_en.properties +++ b/services/src/main/resources/messages_en.properties @@ -73,8 +73,6 @@ sessionsProperty.location=Location sessionsProperty.longitude=Longitude sessionsProperty.operatingSystemFamily=Operating system family sessionsProperty.operatingSystemName=Operating system -sessionsProperty.remoteAddr=Remote IP address -sessionsProperty.remoteHost=Remote host address sessionsProperty.userAgent=Browser user agent sessionsProperty.userAgentName=Browser user agent name sessionsProperty.userAgentVersion=Browser user agent version http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/66f335bb/src/site/markdown/versions/master/custom-extensions.md ---------------------------------------------------------------------- diff --git a/src/site/markdown/versions/master/custom-extensions.md b/src/site/markdown/versions/master/custom-extensions.md index 6f089ec..e688df2 100644 --- a/src/site/markdown/versions/master/custom-extensions.md +++ b/src/site/markdown/versions/master/custom-extensions.md @@ -235,9 +235,7 @@ Here is an example of a persona definition JSON file: "deviceCategory": "Personal computer", "operatingSystemFamily": "OS X", "userAgentName": "Chrome", - "sessionCity": "Mountain View", - "remoteHost": "www.google.com", - "remoteAddr": "66.249.66.1" + "sessionCity": "Mountain View" }, "timeStamp": "2014-09-18T11:40:54Z", "lastEventDate": "2014-09-18T11:40:59Z",
