incubator-unomi git commit: DMF-1343 : Typo

2017-05-29 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/feature-DMF-1343 993652a3f -> e7d3fa877


DMF-1343 : Typo


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e7d3fa87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e7d3fa87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e7d3fa87

Branch: refs/heads/feature-DMF-1343
Commit: e7d3fa877d10dfbb1a38d0adc7176ad276b41789
Parents: 993652a
Author: Abdelkader Midani 
Authored: Mon May 29 16:58:12 2017 +0200
Committer: Abdelkader Midani 
Committed: Mon May 29 16:58:12 2017 +0200

--
 extensions/router/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e7d3fa87/extensions/router/README.md
--
diff --git a/extensions/router/README.md b/extensions/router/README.md
index 8fa1994..0d382d4 100644
--- a/extensions/router/README.md
+++ b/extensions/router/README.md
@@ -26,7 +26,7 @@ This extension is implemented using Apache Camel routes and 
is using Apache Kafk
 
 ## Getting started
 1. Configure your Unomi Router:
-In the `etc/org.apache.unomi.sfdc.cfg` file, you might want to update the 
following settings:
+In the `etc/org.apache.unomi.router.cfg` file, you might want to update 
the following settings:
 Kafka settings 
 >`#Kafka settings`

incubator-unomi git commit: UNOMI-98 Provide an example of integrating with an externally triggered login Add missing license header

2017-05-29 Thread shuber 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master 21a9b34a8 -> 1a9f9cdcb


UNOMI-98 Provide an example of integrating with an externally triggered login
Add missing license header

Signed-off-by: Serge Huber 


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/1a9f9cdc
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1a9f9cdc
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1a9f9cdc

Branch: refs/heads/master
Commit: 1a9f9cdcb2203fd8c740a4700b9a9bbe92c144fd
Parents: 21a9b34
Author: Serge Huber 
Authored: Mon May 29 16:05:42 2017 +0200
Committer: Serge Huber 
Committed: Mon May 29 16:05:42 2017 +0200

--
 samples/README.md | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1a9f9cdc/samples/README.md
--
diff --git a/samples/README.md b/samples/README.md
index 73811d2..6b60dfc 100644
--- a/samples/README.md
+++ b/samples/README.md
@@ -1 +1,18 @@
+
+
 In this directory you can find different samples of how to integrate Unomi.

[jira] [Updated] (UNOMI-98) Provide an example of integrating with an externally triggered login

2017-05-29 Thread Serge Huber (JIRA) 

 [ 
https://issues.apache.org/jira/browse/UNOMI-98?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel
 ]

Serge Huber updated UNOMI-98:
-
Issue Type: Improvement  (was: Bug)

> Provide an example of integrating with an externally triggered login
> 
>
> Key: UNOMI-98
> URL: https://issues.apache.org/jira/browse/UNOMI-98
> Project: Apache Unomi
>  Issue Type: Improvement
>  Components: website
>Affects Versions: 1.2.0-incubating
>Reporter: Serge Huber
> Fix For: 1.2.0-incubating
>
>
> It would be really nice to provide an example of how to integrate with an 
> external login process. In effect this would illustrate how to send a login 
> event to Unomi and how to use a deployed rule to react to the event.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)

incubator-unomi git commit: UNOMI-98 Provide an example of integrating with an externally triggered login - First commit of the login integration example

2017-05-29 Thread shuber 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master 4f4ade0c8 -> ef8603824


UNOMI-98 Provide an example of integrating with an externally triggered login
- First commit of the login integration example

Signed-off-by: Serge Huber 


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/ef860382
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/ef860382
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/ef860382

Branch: refs/heads/master
Commit: ef8603824a887c6ebeb8cf56d27f8cd7c6593cd1
Parents: 4f4ade0
Author: Serge Huber 
Authored: Mon May 29 13:57:03 2017 +0200
Committer: Serge Huber 
Committed: Mon May 29 13:57:03 2017 +0200

--
 samples/login-integration/pom.xml   |  64 +
 .../META-INF/cxs/rules/exampleLogin.json|  34 +
 .../src/main/webapp/WEB-INF/web.xml |  24 
 .../src/main/webapp/index.html  |  70 ++
 .../src/main/webapp/javascript/login-example.js | 136 +++
 samples/pom.xml |   2 +-
 6 files changed, 329 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ef860382/samples/login-integration/pom.xml
--
diff --git a/samples/login-integration/pom.xml 
b/samples/login-integration/pom.xml
new file mode 100644
index 000..675807f
--- /dev/null
+++ b/samples/login-integration/pom.xml
@@ -0,0 +1,64 @@
+
+
+
+http://maven.apache.org/POM/4.0.0; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; 
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 
http://maven.apache.org/xsd/maven-4.0.0.xsd;>
+4.0.0
+
+samples
+org.apache.unomi
+1.2.0-incubating-SNAPSHOT
+
+
+login-integration-sample
+Apache Unomi :: Samples :: External Login plugin
+bundle
+This is a simple Apache Unomi plugin.
+
+
+
+org.apache.unomi
+unomi-api
+1.2.0-incubating-SNAPSHOT
+provided
+
+
+javax.servlet.jsp
+jsp-api
+2.1
+provided
+
+
+
+
+
+
+org.apache.felix
+maven-bundle-plugin
+true
+
+
+<_wab>src/main/webapp
+
*;scope=compile|runtime
+WEB-INF/lib
+/login
+
+
+
+
+
+
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ef860382/samples/login-integration/src/main/resources/META-INF/cxs/rules/exampleLogin.json
--
diff --git 
a/samples/login-integration/src/main/resources/META-INF/cxs/rules/exampleLogin.json
 
b/samples/login-integration/src/main/resources/META-INF/cxs/rules/exampleLogin.json
new file mode 100644
index 000..6e3604b
--- /dev/null
+++ 
b/samples/login-integration/src/main/resources/META-INF/cxs/rules/exampleLogin.json
@@ -0,0 +1,34 @@
+{
+  "metadata": {
+"id": "exampleLogin",
+"name": "Example Login",
+"description": "Copy event properties to profile properties on login"
+  },
+  "condition": {
+"parameterValues": {
+  "subConditions": [
+{
+  "parameterValues": {
+  },
+  "type": "loginEventCondition"
+}
+  ],
+  "operator": "and"
+},
+"type": "booleanCondition"
+  },
+  "actions": [
+{
+  "parameterValues": {
+"mergeProfilePropertyValue": "eventProperty::target.properties(email)",
+"mergeProfilePropertyName": "mergeIdentifier"
+  },
+  "type": "mergeProfilesOnPropertyAction"
+},
+{
+  "parameterValues": {
+  },
+  "type": "allEventToProfilePropertiesAction"
+}
+  ]
+}
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/ef860382/samples/login-integration/src/main/webapp/WEB-INF/web.xml
--
diff --git a/samples/login-integration/src/main/webapp/WEB-INF/web.xml 
b/samples/login-integration/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 000..dc145f2
--- /dev/null
+++ b/samples/login-integration/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,24 @@
+
+http://java.sun.com/xml/ns/javaee;
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance;
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee 
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd;
+

incubator-unomi git commit: DMF-1343 : Handle transforming an import config oneshot <--> recurrent

2017-05-29 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/feature-DMF-1343 9203d36f4 -> 993652a3f


DMF-1343 : Handle transforming an import config oneshot <--> recurrent


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/993652a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/993652a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/993652a3

Branch: refs/heads/feature-DMF-1343
Commit: 993652a3f47c9cd4d6755f72226c66576d25e5d3
Parents: 9203d36
Author: Abdelkader Midani 
Authored: Mon May 29 12:14:20 2017 +0200
Committer: Abdelkader Midani 
Committed: Mon May 29 12:14:20 2017 +0200

--
 .../core/context/ProfileImportCamelContext.java  | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/993652a3/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
--
diff --git 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
index 2f3eaad..df734d3 100644
--- 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
+++ 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
@@ -54,6 +54,8 @@ public class ProfileImportCamelContext implements 
SynchronousBundleListener {
 private String uploadDir;
 private Map kafkaProps;
 
+private final String IMPORT_CONFIG_TYPE_RECURRENT = "recurrent";
+
 private BundleContext bundleContext;
 
 public void setBundleContext(BundleContext bundleContext) {
@@ -109,11 +111,14 @@ public class ProfileImportCamelContext implements 
SynchronousBundleListener {
 if(route!=null && stopRoute(importConfiguration.getItemId())) {
 camelContext.removeRoute(importConfiguration.getItemId());
 }
-ProfileImportSourceToKafkaRouteBuilder builder = new 
ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
-builder.setImportConfigurationList(Arrays.asList(importConfiguration));
-builder.setJacksonDataFormat(jacksonDataFormat);
-builder.setContext(camelContext);
-camelContext.addRoutes(builder);
+//Handle transforming an import config oneshot <--> recurrent
+
if(IMPORT_CONFIG_TYPE_RECURRENT.equals(importConfiguration.getConfigType())){
+ProfileImportSourceToKafkaRouteBuilder builder = new 
ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
+
builder.setImportConfigurationList(Arrays.asList(importConfiguration));
+builder.setJacksonDataFormat(jacksonDataFormat);
+builder.setContext(camelContext);
+camelContext.addRoutes(builder);
+}
 }
 
 public CamelContext getCamelContext() {

[jira] [Created] (UNOMI-98) Provide an example of integrating with an externally triggered login

2017-05-29 Thread Serge Huber (JIRA) 
Serge Huber created UNOMI-98:


 Summary: Provide an example of integrating with an externally 
triggered login
 Key: UNOMI-98
 URL: https://issues.apache.org/jira/browse/UNOMI-98
 Project: Apache Unomi
  Issue Type: Bug
  Components: website
Affects Versions: 1.2.0-incubating
Reporter: Serge Huber
 Fix For: 1.2.0-incubating


It would be really nice to provide an example of how to integrate with an 
external login process. In effect this would illustrate how to send a login 
event to Unomi and how to use a deployed rule to react to the event.



--
This message was sent by Atlassian JIRA
(v6.3.15#6346)