incubator-unomi git commit: UNOMI-115 Error in Documentation - Step 6: Five Minute Quick Start - Fix comment that was preventing JavaDocs from generating.
Repository: incubator-unomi
Updated Branches:
refs/heads/master 2c34b5f62 -> a84a12b93
UNOMI-115 Error in Documentation - Step 6: Five Minute Quick Start
- Fix comment that was preventing JavaDocs from generating.
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/a84a12b9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/a84a12b9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/a84a12b9
Branch: refs/heads/master
Commit: a84a12b93f2fca86ba0d4ac8c116f1db586e6085
Parents: 2c34b5f
Author: Serge Huber
Authored: Thu Jul 13 18:01:58 2017 +0200
Committer: Serge Huber
Committed: Thu Jul 13 18:01:58 2017 +0200
--
api/src/main/java/org/apache/unomi/api/ContextRequest.java | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a84a12b9/api/src/main/java/org/apache/unomi/api/ContextRequest.java
--
diff --git a/api/src/main/java/org/apache/unomi/api/ContextRequest.java
b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
index 1803bf6..f273907 100644
--- a/api/src/main/java/org/apache/unomi/api/ContextRequest.java
+++ b/api/src/main/java/org/apache/unomi/api/ContextRequest.java
@@ -26,7 +26,6 @@ import org.apache.unomi.api.services.RulesService;
import java.util.List;
import java.util.Map;
-import java.util.Set;
/**
* An incoming request for context information from clients of the context
server. This allows clients to specify which type of information they are
interested in getting from
@@ -180,18 +179,18 @@ public class ContextRequest {
}
/**
- * Retrieves the overrides.
+ * Retrieves the profile overrides.
*
- * @return the overrides
+ * @return the profile overrides
*/
public Profile getProfileOverrides() {
return profileOverrides;
}
/**
- * Sets the overrides.
+ * Sets the profile overrides.
*
- * @param overrides the collection overrides out of
profileProperties and sessionProperties
+ * @param overrides the profile overrides
*/
public void setProfileOverrides(Profile overrides) {
this.profileOverrides = overrides;
[jira] [Resolved] (UNOMI-115) Error in Documentation - Step 6: Five Minute Quick Start
[ https://issues.apache.org/jira/browse/UNOMI-115?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Serge Huber resolved UNOMI-115. --- Resolution: Fixed Fix Version/s: 1.2.0-incubating I committed the fix and re-uploaded the site. It should be ok now. > Error in Documentation - Step 6: Five Minute Quick Start > > > Key: UNOMI-115 > URL: https://issues.apache.org/jira/browse/UNOMI-115 > Project: Apache Unomi > Issue Type: Bug > Components: website >Reporter: Damon Henry >Assignee: Serge Huber > Fix For: 1.2.0-incubating > > > Step 6 of the _5 Minute Quick Start_ on the home page > (http://unomi.incubator.apache.org/) states: Request your first context by > simply accessing : http://localhost:8181/context.js?session=1234 > The request parameter should be "sessionId" not "session". -- This message was sent by Atlassian JIRA (v6.4.14#64029)
incubator-unomi git commit: UNOMI-115 Error in Documentation - Step 6: Five Minute Quick Start - Correct URL to replace session with sessionId
Repository: incubator-unomi Updated Branches: refs/heads/master 875b6eb54 -> 2c34b5f62 UNOMI-115 Error in Documentation - Step 6: Five Minute Quick Start - Correct URL to replace session with sessionId 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/2c34b5f6 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/2c34b5f6 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/2c34b5f6 Branch: refs/heads/master Commit: 2c34b5f62cc77c5fed4d5a36ca66239cfa9a6053 Parents: 875b6eb Author: Serge Huber Authored: Thu Jul 13 17:23:28 2017 +0200 Committer: Serge Huber Committed: Thu Jul 13 17:23:39 2017 +0200 -- src/site/markdown/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c34b5f6/src/site/markdown/index.md -- diff --git a/src/site/markdown/index.md b/src/site/markdown/index.md index 2be4fe2..1215a61 100644 --- a/src/site/markdown/index.md +++ b/src/site/markdown/index.md @@ -77,7 +77,7 @@ All communication is done using HTTP REST requests and JSON data formats. 3. Start it using : `./bin/karaf` 4. Wait for startup to complete 5. Try accessing [https://localhost:9443/cxs/cluster](https://localhost:9443/cxs/cluster) with username/password: karaf/karaf . You might get a certificate warning in your browser, just accept it despite the warning it is safe. -6. Request your first context by simply accessing : [http://localhost:8181/context.js?session=1234](http://localhost:8181/context.js?session=1234) +6. Request your first context by simply accessing : [http://localhost:8181/context.js?sessionId=1234](http://localhost:8181/context.js?sessionId=1234) ### News
[jira] [Commented] (UNOMI-115) Error in Documentation - Step 6: Five Minute Quick Start
[ https://issues.apache.org/jira/browse/UNOMI-115?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16085859#comment-16085859 ] Serge Huber commented on UNOMI-115: --- Thanks for the report I will correct this in the project. > Error in Documentation - Step 6: Five Minute Quick Start > > > Key: UNOMI-115 > URL: https://issues.apache.org/jira/browse/UNOMI-115 > Project: Apache Unomi > Issue Type: Bug > Components: website >Reporter: Damon Henry >Assignee: Serge Huber > > Step 6 of the _5 Minute Quick Start_ on the home page > (http://unomi.incubator.apache.org/) states: Request your first context by > simply accessing : http://localhost:8181/context.js?session=1234 > The request parameter should be "sessionId" not "session". -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Assigned] (UNOMI-115) Error in Documentation - Step 6: Five Minute Quick Start
[ https://issues.apache.org/jira/browse/UNOMI-115?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Serge Huber reassigned UNOMI-115: - Assignee: Serge Huber > Error in Documentation - Step 6: Five Minute Quick Start > > > Key: UNOMI-115 > URL: https://issues.apache.org/jira/browse/UNOMI-115 > Project: Apache Unomi > Issue Type: Bug > Components: website >Reporter: Damon Henry >Assignee: Serge Huber > > Step 6 of the _5 Minute Quick Start_ on the home page > (http://unomi.incubator.apache.org/) states: Request your first context by > simply accessing : http://localhost:8181/context.js?session=1234 > The request parameter should be "sessionId" not "session". -- This message was sent by Atlassian JIRA (v6.4.14#64029)
[jira] [Created] (UNOMI-115) Error in Documentation - Step 6: Five Minute Quick Start
Damon Henry created UNOMI-115: - Summary: Error in Documentation - Step 6: Five Minute Quick Start Key: UNOMI-115 URL: https://issues.apache.org/jira/browse/UNOMI-115 Project: Apache Unomi Issue Type: Bug Components: website Reporter: Damon Henry Step 6 of the _5 Minute Quick Start_ on the home page (http://unomi.incubator.apache.org/) states: Request your first context by simply accessing : http://localhost:8181/context.js?session=1234 The request parameter should be "sessionId" not "session". -- This message was sent by Atlassian JIRA (v6.4.14#64029)
incubator-unomi git commit: UNOMI-102 : PropertyType validation get recently added propertyTypes
Repository: incubator-unomi
Updated Branches:
refs/heads/master b62084681 -> 875b6eb54
UNOMI-102 : PropertyType validation get recently added propertyTypes
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/875b6eb5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/875b6eb5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/875b6eb5
Branch: refs/heads/master
Commit: 875b6eb54bb2b5d950eb8e4d30313ae9b0c00950
Parents: b620846
Author: Abdelkader Midani
Authored: Thu Jul 13 16:31:12 2017 +0200
Committer: Abdelkader Midani
Committed: Thu Jul 13 16:31:12 2017 +0200
--
.../ImportRouteCompletionProcessor.java | 8 +++---
.../core/processor/LineSplitProcessor.java | 26 +++-
.../core/processor/UnomiStorageProcessor.java | 2 +-
.../ProfileImportFromSourceRouteBuilder.java| 3 +--
.../route/ProfileImportOneShotRouteBuilder.java | 4 +--
.../route/ProfileImportToUnomiRouteBuilder.java | 2 +-
6 files changed, 24 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java
index 325aec4..efefe6b 100644
---
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java
+++
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java
@@ -55,7 +55,7 @@ public class ImportRouteCompletionProcessor implements
Processor {
successCount++;
} else if (line instanceof ImportLineError) {
failureCount++;
-if(errors.size() < execErrReportSize) {
+if (errors.size() < execErrReportSize) {
errors.add(((ImportLineError) line));
}
} else {
@@ -64,7 +64,7 @@ public class ImportRouteCompletionProcessor implements
Processor {
}
Integer nbTotal = (Integer) exchange.getProperty("CamelSplitSize");
-if(importConfiguration.isHasHeader()) {
+if (importConfiguration.isHasHeader()) {
nbTotal--;
}
@@ -75,7 +75,7 @@ public class ImportRouteCompletionProcessor implements
Processor {
execution.put("failureCount", failureCount);
execution.put("errors", errors);
-importConfiguration = (ImportConfiguration)
RouterUtils.addExecutionEntry(importConfiguration,
execution,executionsHistorySize);
+importConfiguration = (ImportConfiguration)
RouterUtils.addExecutionEntry(importConfiguration, execution,
executionsHistorySize);
//Set running to false, route is complete
if (failureCount > 0 && successCount > 0) {
@@ -86,7 +86,7 @@ public class ImportRouteCompletionProcessor implements
Processor {
importConfiguration.setStatus(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS);
}
importConfigurationService.save(importConfiguration);
-logger.info("Processing route {} completed.",
exchange.getFromRouteId());
+logger.info("Processing route {} completed. completion date: {}.",
exchange.getFromRouteId(), new Date());
}
public void
setImportConfigurationService(ImportExportConfigurationService
importConfigurationService) {
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
index df203e3..3dbbf13 100644
---
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
+++
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
@@ -22,6 +22,7 @@ import org.apache.camel.component.kafka.KafkaConstants;
import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.unomi.api.PropertyType;
+import org.apache.unomi.api.services.ProfileService;
import org.apache.unomi.router.api.ImportConfiguration;
im
[2/2] incubator-unomi git commit: UNOMI-102 : Update segments and scores after the import (use batch)
UNOMI-102 : Update segments and scores after the import (use batch)
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/75e89cb7
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/75e89cb7
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/75e89cb7
Branch: refs/heads/master
Commit: 75e89cb738c98c0560d1f7a095752bf8a158c2fc
Parents: 1e605ac
Author: Abdelkader Midani
Authored: Thu Jul 13 12:08:41 2017 +0200
Committer: Abdelkader Midani
Committed: Thu Jul 13 12:09:34 2017 +0200
--
.../org/apache/unomi/router/services/ProfileImportServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/75e89cb7/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
--
diff --git
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
index 7f9b503..51cbc55 100644
---
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
+++
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
@@ -68,6 +68,6 @@ public class ProfileImportServiceImpl extends
AbstractCustomServiceImpl implemen
profileToImport.getMergingProperty(),
profileToImport.getProperties().get(profileToImport.getMergingProperty()));
}
logger.debug("-");
-return persistenceService.save(existingProfile);
+return persistenceService.save(existingProfile, true);
}
}
[1/2] incubator-unomi git commit: UNOMI-102 : Update README
Repository: incubator-unomi Updated Branches: refs/heads/master 1e605ac9c -> b62084681 UNOMI-102 : Update README Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b6208468 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b6208468 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b6208468 Branch: refs/heads/master Commit: b620846815bd4f30518b96153997101c82999bd1 Parents: 75e89cb Author: Abdelkader Midani Authored: Thu Jul 13 12:09:11 2017 +0200 Committer: Abdelkader Midani Committed: Thu Jul 13 12:09:34 2017 +0200 -- extensions/router/README.md | 45 ++-- 1 file changed, 34 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b6208468/extensions/router/README.md -- diff --git a/extensions/router/README.md b/extensions/router/README.md index f47c4bf..cc3d0b8 100644 --- a/extensions/router/README.md +++ b/extensions/router/README.md @@ -81,6 +81,12 @@ This extension is implemented using Apache Camel routes and can use Apache Kafka ... } }, + "columnSeparator": ",", + "lineSeparator": "\\n", + "multiValueSeparator": "|", + "multiValueDelimiter": "", + "hasHeader": false, + "hasDeleteColumn": false, "mergingProperty": "email", "overwriteExistingProfiles": true, "propertiesToOverwrite": ["firstName", "lastName"], @@ -91,33 +97,50 @@ This extension is implemented using Apache Camel routes and can use Apache Kafka Omit the `itemId` when creating new entry, `configType` can be '**recurrent**' for file/ftp/network path polling or '**oneshot**' for one time import (in case of oneshot configuration, omit the properties.source attribute). The `properties.source` attribute is an Apache Camel endpoint uri (See http://camel.apache.org/uris.html for more details). Unomi Router is designed to use **File** and **FTP** Camel components. + + **path** the path to the file + **fileName** is the name of the file to consume, you can use a pattern by using include option instead of fileName (eg. include=.*.csv) + **move** is the folder where you want to move you consumed files (By default they are moved to '.camel' folder) + **consumer.delay** the polling frequency on the specified path, have different format (number of milliseconds, or '2s', '1h', etc.) The attribute `properties.mapping` is a Map of: * Key: Profile property id in Unomi * Value: Index of the column in the imported file to copy the in the previous property. - -The attribute `mergingProperty` is the profile property id in Unomi to use to check for duplication. -The attribute `propertiesToOverwrite` is a list of profile properties ids to overwrite, if **null** all properties -will be overwritten. +The attribute `columnSeparator` is a string that defaults to "," the most common column separator for CSV files. + +The attribute `lineSeparator` is a string that defaults to "\n" the most common line separator for files. + +The attribute `multiValueSeparator` is a string that defaults to "|". + +**ATTENTION:** Be careful not to use the same separator as for column. + +The attribute `multiValueDelimiter` is a string that defaults to an empty string (No delimiter), some CSV producers tend to wrap multivalued column use this attribute to specify your producers' delimiter +(eg. for brackets you can fill the field with "[]", opening and closing are needed). The attribute `hasHeader` is a boolean that defaults to false (the imported file has no header). The attribute `hasDeleteColumn` is a boolean that defaults to false (the imported file' last column is a delete flag). +The attribute `mergingProperty` is the profile property id in Unomi to use to check for duplicates. + +The attribute `overwriteExistingProfiles` is a flag to tell what you want to do if the profile already exist (**Merge -> true / Skip -> false**). + +The attribute `propertiesToOverwrite` is a list of profile properties ids to overwrite (ignored if 'overwriteExistingProfiles' is **false**), if **null** all properties +will be overwritten. + The attribute `active` is the flag to activate or deactivate the import configuration. Concerning oneshot import configuration using the previously described service will only create the import configuration, to send the file to process -you need to call : - +you need to call : +
[jira] [Resolved] (UNOMI-114) Disabled rules are still executed
[ https://issues.apache.org/jira/browse/UNOMI-114?page=com.atlassian.jira.plugin.system.issuetabpanels:all-tabpanel ] Serge Huber resolved UNOMI-114. --- Resolution: Fixed Assignee: Serge Huber Modified code to make sure we don't use disabled rules > Disabled rules are still executed > - > > Key: UNOMI-114 > URL: https://issues.apache.org/jira/browse/UNOMI-114 > Project: Apache Unomi > Issue Type: Bug > Components: core >Affects Versions: 1.2.0-incubating >Reporter: Serge Huber >Assignee: Serge Huber > Fix For: 1.2.0-incubating > > > If a rule is disabled it is still used by the engine. This should not happen. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
incubator-unomi git commit: UNOMI-114 Disabled rules are still executed - Make sure that we don't use disabled rules.
Repository: incubator-unomi
Updated Branches:
refs/heads/master f0f871da4 -> 1e605ac9c
UNOMI-114 Disabled rules are still executed
- Make sure that we don't use disabled rules.
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/1e605ac9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/1e605ac9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/1e605ac9
Branch: refs/heads/master
Commit: 1e605ac9ca45a721ce65a3b3a99184533582642e
Parents: f0f871d
Author: Serge Huber
Authored: Thu Jul 13 10:59:02 2017 +0200
Committer: Serge Huber
Committed: Thu Jul 13 10:59:12 2017 +0200
--
.../org/apache/unomi/services/services/RulesServiceImpl.java | 6 ++
1 file changed, 6 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/1e605ac9/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
--
diff --git
a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
index b3062c1..973a4a1 100644
---
a/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
+++
b/services/src/main/java/org/apache/unomi/services/services/RulesServiceImpl.java
@@ -168,6 +168,9 @@ public class RulesServiceImpl implements RulesService,
EventListenerService, Syn
List allItems = allRules;
for (Rule rule : allItems) {
+if (!rule.getMetadata().isEnabled()) {
+continue;
+}
RuleStatistics ruleStatistics = getLocalRuleStatistics(rule);
long ruleConditionStartTime = System.currentTimeMillis();
String scope = rule.getMetadata().getScope();
@@ -336,6 +339,9 @@ public class RulesServiceImpl implements RulesService,
EventListenerService, Syn
public Set getTrackedConditions(Item source){
Set trackedConditions = new HashSet<>();
for (Rule r : allRules) {
+if (!r.getMetadata().isEnabled()) {
+continue;
+}
Condition trackedCondition =
definitionsService.extractConditionByTag(r.getCondition(), "trackedCondition");
if(trackedCondition != null){
Condition sourceEventPropertyCondition =
definitionsService.extractConditionByTag(r.getCondition(),
"sourceEventCondition");
[jira] [Created] (UNOMI-114) Disabled rules are still executed
Serge Huber created UNOMI-114: - Summary: Disabled rules are still executed Key: UNOMI-114 URL: https://issues.apache.org/jira/browse/UNOMI-114 Project: Apache Unomi Issue Type: Bug Components: core Affects Versions: 1.2.0-incubating Reporter: Serge Huber Fix For: 1.2.0-incubating If a rule is disabled it is still used by the engine. This should not happen. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
