You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by sh...@apache.org on 2016/11/16 09:20:23 UTC
[1/2] incubator-unomi git commit: UNOMI-64 : Add
Region/State/Province and Subregion/County
Repository: incubator-unomi
Updated Branches:
refs/heads/master ea1254f12 -> 2c5c11360
UNOMI-64 : Add Region/State/Province and Subregion/County
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0a6b5a1d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0a6b5a1d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0a6b5a1d
Branch: refs/heads/master
Commit: 0a6b5a1d14648deb881c1171eb3349911854b5a2
Parents: ea1254f
Author: Abdelkader Midani <am...@jahia.com>
Authored: Mon Nov 14 18:47:16 2016 +0100
Committer: Abdelkader Midani <am...@jahia.com>
Committed: Mon Nov 14 18:47:16 2016 +0100
----------------------------------------------------------------------
.../plugins/request/actions/SetRemoteHostInfoAction.java | 3 ++-
.../properties/sessions/geographic/sessionAdminSubDiv1.json | 8 ++++++++
.../properties/sessions/geographic/sessionAdminSubDiv2.json | 8 ++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0a6b5a1d/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 90e7702..0f4d6ef 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
@@ -90,7 +90,8 @@ public class SetRemoteHostInfoAction implements ActionExecutor {
location.put("lon", 6.1282508);
session.setProperty("location", location);
}
- session.setProperty("countryAndCity", session.getProperty("sessionCountryName") + "@@" + session.getProperty("sessionCity"));
+ session.setProperty("countryAndCity", session.getProperty("sessionCountryName") + "@@" + session.getProperty("sessionCity") +
+ "@@" + session.getProperty("sessionAdminSubDiv1") + "@@" + session.getProperty("sessionAdminSubDiv2"));
} catch (Exception e) {
logger.error("Cannot lookup IP", e);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0a6b5a1d/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
new file mode 100644
index 0000000..5383fae
--- /dev/null
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv1.json
@@ -0,0 +1,8 @@
+{
+ "metadata": { "id": "sessionAdminSubDiv1", "name": "State/Region/Province" },
+ "type": "string",
+ "tags": ["geographicSessionProperties"],
+ "defaultValue": "",
+ "automaticMappingsFrom": [ ],
+ "rank": "2.0"
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0a6b5a1d/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
----------------------------------------------------------------------
diff --git a/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
new file mode 100644
index 0000000..816dc2e
--- /dev/null
+++ b/services/src/main/resources/META-INF/cxs/properties/sessions/geographic/sessionAdminSubDiv2.json
@@ -0,0 +1,8 @@
+{
+ "metadata": { "id": "sessionAdminSubDiv2", "name": "SubRegion/County" },
+ "type": "string",
+ "tags": ["geographicSessionProperties"],
+ "defaultValue": "",
+ "automaticMappingsFrom": [ ],
+ "rank": "2.0"
+}
\ No newline at end of file
[2/2] incubator-unomi git commit: Merge PR#19
Posted by sh...@apache.org.
Merge PR#19
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/2c5c1136
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/2c5c1136
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/2c5c1136
Branch: refs/heads/master
Commit: 2c5c113606dcad742fb44736d16ae4eddb97ddd3
Parents: ea1254f 0a6b5a1
Author: Serge Huber <sh...@apache.org>
Authored: Wed Nov 16 10:19:40 2016 +0100
Committer: Serge Huber <sh...@apache.org>
Committed: Wed Nov 16 10:19:40 2016 +0100
----------------------------------------------------------------------
.../plugins/request/actions/SetRemoteHostInfoAction.java | 3 ++-
.../properties/sessions/geographic/sessionAdminSubDiv1.json | 8 ++++++++
.../properties/sessions/geographic/sessionAdminSubDiv2.json | 8 ++++++++
3 files changed, 18 insertions(+), 1 deletion(-)
----------------------------------------------------------------------