[2/2] incubator-unomi git commit: Merge branch 'pr/29'
Merge branch 'pr/29' Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/8b08f157 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/8b08f157 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/8b08f157 Branch: refs/heads/master Commit: 8b08f15792e5dfe53074826a2002154be3406540 Parents: 5166fc2 f3118ab Author: Abdelkader Midani Authored: Thu Jun 29 03:12:57 2017 +0200 Committer: Abdelkader Midani Committed: Thu Jun 29 03:12:57 2017 +0200 -- services/src/main/resources/META-INF/cxs/tags/autocompleted.json | 4 1 file changed, 4 insertions(+) --
[1/2] incubator-unomi git commit: UNOMI-107 : Add a tag to distinct autocompleted properties.
Repository: incubator-unomi
Updated Branches:
refs/heads/master 5166fc23e -> 8b08f1579
UNOMI-107 : Add a tag to distinct autocompleted properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f3118ab5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f3118ab5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f3118ab5
Branch: refs/heads/master
Commit: f3118ab525d6c51c12753064ab83b8a99d34c75a
Parents: 9db8296
Author: rizak
Authored: Wed Jun 28 16:57:05 2017 +0200
Committer: rizak
Committed: Wed Jun 28 16:57:05 2017 +0200
--
services/src/main/resources/META-INF/cxs/tags/autocompleted.json | 4
1 file changed, 4 insertions(+)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f3118ab5/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
--
diff --git a/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
b/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
new file mode 100644
index 000..089bf12
--- /dev/null
+++ b/services/src/main/resources/META-INF/cxs/tags/autocompleted.json
@@ -0,0 +1,4 @@
+{
+ "id": "autocompleted",
+ "parent": "profileTags"
+}
\ No newline at end of file
[1/3] incubator-unomi git commit: UNOMI-102 : Add Camel config for export features
Repository: incubator-unomi
Updated Branches:
refs/heads/master 9db8296e7 -> 5166fc23e
UNOMI-102 : Add Camel config for export features
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b7194f47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b7194f47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b7194f47
Branch: refs/heads/master
Commit: b7194f470d4ec728f0205b3386571f21d15f2bda
Parents: df59f57
Author: Abdelkader Midani
Authored: Thu Jun 29 03:09:55 2017 +0200
Committer: Abdelkader Midani
Committed: Thu Jun 29 03:09:55 2017 +0200
--
.../unomi/router/api/RouterConstants.java | 9 +-
.../router/core/bean/CollectProfileBean.java| 38 +++
.../router/core/context/RouterCamelContext.java | 33 --
.../core/processor/ConfigUpdateProcessor.java | 1 -
.../ExportRouteCompletionProcessor.java | 76 ++
.../ImportRouteCompletionProcessor.java | 105 +++
.../core/processor/LineBuildProcessor.java | 54 ++
.../processor/RouteCompletionProcessor.java | 105 ---
.../core/route/ConfigUpdateRouteBuilder.java| 1 -
.../route/ProfileExportCollectRouteBuilder.java | 53 +++---
.../ProfileExportProducerRouteBuilder.java | 69
.../ProfileImportAbstractRouteBuilder.java | 83 ---
.../ProfileImportFromSourceRouteBuilder.java| 18 ++--
.../route/ProfileImportOneShotRouteBuilder.java | 26 ++---
.../route/ProfileImportToUnomiRouteBuilder.java | 21 ++--
.../core/route/RouterAbstractRouteBuilder.java | 98 +
.../strategy/ArrayListAggregationStrategy.java | 2 -
.../StringLinesAggregationStrategy.java | 41
.../resources/OSGI-INF/blueprint/blueprint.xml | 43 +---
.../main/resources/org.apache.unomi.router.cfg | 17 ++-
20 files changed, 608 insertions(+), 285 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b7194f47/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
--
diff --git
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
index 45de3d6..7f45228 100644
---
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
+++
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
@@ -32,13 +32,20 @@ public interface RouterConstants {
String IMPORT_EXPORT_CONFIG_TYPE_RECURRENT = "recurrent";
String IMPORT_EXPORT_CONFIG_TYPE_ONESHOT = "oneshot";
-String DIRECT_DEPOSIT_BUFFER = "direct:depositBuffer";
+String DIRECT_IMPORT_DEPOSIT_BUFFER = "direct:depositImportBuffer";
+String DIRECT_EXPORT_DEPOSIT_BUFFER = "direct:depositExportBuffer";
String DIRECTION_FROM = "from";
String DIRECTION_TO = "to";
String HEADER_CONFIG_TYPE = "configType";
+String HEADER_EXPORT_CONFIG = "exportConfig";
String HEADER_FAILED_MESSAGE = "failedMessage";
String HEADER_IMPORT_CONFIG_ONESHOT = "importConfigOneShot";
+
+String IMPORT_ONESHOT_ROUTE_ID = "ONE_SHOT_ROUTE";
+String DEFAULT_FILE_COLUMN_SEPARATOR = ",";
+
+String DEFAULT_FILE_LINE_SEPARATOR = "\n";
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b7194f47/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
new file mode 100644
index 000..4525019
--- /dev/null
+++
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
@@ -0,0 +1,38 @@
+/*
+ * 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 expr
[2/3] incubator-unomi git commit: [jgitflow-maven-plugin]updating poms for unomi_102 version
[jgitflow-maven-plugin]updating poms for unomi_102 version Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/69e249cb Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/69e249cb Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/69e249cb Branch: refs/heads/master Commit: 69e249cbbc4ec7ec5f95f64143be5d19d847803c Parents: b7194f4 Author: Abdelkader Midani Authored: Thu Jun 29 03:11:15 2017 +0200 Committer: Abdelkader Midani Committed: Thu Jun 29 03:11:15 2017 +0200 -- api/pom.xml| 2 +- extensions/geonames/pom.xml| 2 +- extensions/geonames/rest/pom.xml | 8 +++--- extensions/geonames/services/pom.xml | 8 +++--- extensions/lists-extension/actions/pom.xml | 8 +++--- extensions/lists-extension/pom.xml | 4 +-- extensions/lists-extension/rest/pom.xml| 8 +++--- extensions/lists-extension/services/pom.xml| 8 +++--- extensions/pom.xml | 2 +- extensions/privacy-extension/pom.xml | 4 +-- extensions/privacy-extension/rest/pom.xml | 8 +++--- extensions/privacy-extension/services/pom.xml | 8 +++--- extensions/router/pom.xml | 2 +- extensions/router/router-api/pom.xml | 2 +- extensions/router/router-core/pom.xml | 2 +- extensions/router/router-karaf-feature/pom.xml | 2 +- extensions/router/router-rest/pom.xml | 2 +- extensions/router/router-service/pom.xml | 2 +- kar/pom.xml| 32 ++--- lifecycle-watcher/pom.xml | 2 +- package/pom.xml| 6 ++-- persistence-elasticsearch/core/pom.xml | 6 ++-- persistence-elasticsearch/pom.xml | 2 +- persistence-spi/pom.xml| 4 +-- plugins/baseplugin/pom.xml | 6 ++-- plugins/hover-event/pom.xml| 4 +-- plugins/mail/pom.xml | 4 +-- plugins/optimization-test/pom.xml | 2 +- plugins/past-event/pom.xml | 6 ++-- plugins/pom.xml| 4 +-- plugins/request/pom.xml| 2 +- plugins/tracked-event/pom.xml | 6 ++-- pom.xml| 2 +- rest/pom.xml | 6 ++-- samples/login-integration/pom.xml | 4 +-- samples/pom.xml| 2 +- samples/tweet-button-plugin/pom.xml| 4 +-- services/pom.xml | 6 ++-- wab/pom.xml| 6 ++-- 39 files changed, 99 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/69e249cb/api/pom.xml -- diff --git a/api/pom.xml b/api/pom.xml index 1c8ad15..6662b6f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -22,7 +22,7 @@ org.apache.unomi unomi-root -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT unomi-api http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/69e249cb/extensions/geonames/pom.xml -- diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml index 6c24ef8..f601a7c 100644 --- a/extensions/geonames/pom.xml +++ b/extensions/geonames/pom.xml @@ -27,7 +27,7 @@ org.apache.unomi unomi-extensions -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT cxs-geonames http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/69e249cb/extensions/geonames/rest/pom.xml -- diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml index b7938f9..cec5546 100644 --- a/extensions/geonames/rest/pom.xml +++ b/extensions/geonames/rest/pom.xml @@ -20,7 +20,7 @@ org.apache.unomi cxs-geonames -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT 4.0.0 @@ -33,14 +33,14 @@ org.apache.unomi unomi-api -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT provided org.apache.unomi cxs-geonames-services -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT provided @@ -76,7 +76,7 @@ org.apache.unomi
[3/3] incubator-unomi git commit: [jgitflow-maven-plugin]merging 'feature-UNOMI-102' into 'master'
[jgitflow-maven-plugin]merging 'feature-UNOMI-102' into 'master' Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/5166fc23 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/5166fc23 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/5166fc23 Branch: refs/heads/master Commit: 5166fc23ebfd01f5d122c2e75fdbf96823701f3b Parents: 9db8296 69e249c Author: Abdelkader Midani Authored: Thu Jun 29 03:11:16 2017 +0200 Committer: Abdelkader Midani Committed: Thu Jun 29 03:11:16 2017 +0200 -- .../unomi/router/api/RouterConstants.java | 9 +- .../router/core/bean/CollectProfileBean.java| 38 +++ .../router/core/context/RouterCamelContext.java | 33 -- .../core/processor/ConfigUpdateProcessor.java | 1 - .../ExportRouteCompletionProcessor.java | 76 ++ .../ImportRouteCompletionProcessor.java | 105 +++ .../core/processor/LineBuildProcessor.java | 54 ++ .../processor/RouteCompletionProcessor.java | 105 --- .../core/route/ConfigUpdateRouteBuilder.java| 1 - .../route/ProfileExportCollectRouteBuilder.java | 53 +++--- .../ProfileExportProducerRouteBuilder.java | 69 .../ProfileImportAbstractRouteBuilder.java | 83 --- .../ProfileImportFromSourceRouteBuilder.java| 18 ++-- .../route/ProfileImportOneShotRouteBuilder.java | 26 ++--- .../route/ProfileImportToUnomiRouteBuilder.java | 21 ++-- .../core/route/RouterAbstractRouteBuilder.java | 98 + .../strategy/ArrayListAggregationStrategy.java | 2 - .../StringLinesAggregationStrategy.java | 41 .../resources/OSGI-INF/blueprint/blueprint.xml | 43 +--- .../main/resources/org.apache.unomi.router.cfg | 17 ++- 20 files changed, 608 insertions(+), 285 deletions(-) --
incubator-unomi git commit: UNOMI-102 : Add Camel config for export features
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-UNOMI-102 df59f575b -> b7194f470
UNOMI-102 : Add Camel config for export features
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b7194f47
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b7194f47
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b7194f47
Branch: refs/heads/feature-UNOMI-102
Commit: b7194f470d4ec728f0205b3386571f21d15f2bda
Parents: df59f57
Author: Abdelkader Midani
Authored: Thu Jun 29 03:09:55 2017 +0200
Committer: Abdelkader Midani
Committed: Thu Jun 29 03:09:55 2017 +0200
--
.../unomi/router/api/RouterConstants.java | 9 +-
.../router/core/bean/CollectProfileBean.java| 38 +++
.../router/core/context/RouterCamelContext.java | 33 --
.../core/processor/ConfigUpdateProcessor.java | 1 -
.../ExportRouteCompletionProcessor.java | 76 ++
.../ImportRouteCompletionProcessor.java | 105 +++
.../core/processor/LineBuildProcessor.java | 54 ++
.../processor/RouteCompletionProcessor.java | 105 ---
.../core/route/ConfigUpdateRouteBuilder.java| 1 -
.../route/ProfileExportCollectRouteBuilder.java | 53 +++---
.../ProfileExportProducerRouteBuilder.java | 69
.../ProfileImportAbstractRouteBuilder.java | 83 ---
.../ProfileImportFromSourceRouteBuilder.java| 18 ++--
.../route/ProfileImportOneShotRouteBuilder.java | 26 ++---
.../route/ProfileImportToUnomiRouteBuilder.java | 21 ++--
.../core/route/RouterAbstractRouteBuilder.java | 98 +
.../strategy/ArrayListAggregationStrategy.java | 2 -
.../StringLinesAggregationStrategy.java | 41
.../resources/OSGI-INF/blueprint/blueprint.xml | 43 +---
.../main/resources/org.apache.unomi.router.cfg | 17 ++-
20 files changed, 608 insertions(+), 285 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b7194f47/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
--
diff --git
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
index 45de3d6..7f45228 100644
---
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
+++
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterConstants.java
@@ -32,13 +32,20 @@ public interface RouterConstants {
String IMPORT_EXPORT_CONFIG_TYPE_RECURRENT = "recurrent";
String IMPORT_EXPORT_CONFIG_TYPE_ONESHOT = "oneshot";
-String DIRECT_DEPOSIT_BUFFER = "direct:depositBuffer";
+String DIRECT_IMPORT_DEPOSIT_BUFFER = "direct:depositImportBuffer";
+String DIRECT_EXPORT_DEPOSIT_BUFFER = "direct:depositExportBuffer";
String DIRECTION_FROM = "from";
String DIRECTION_TO = "to";
String HEADER_CONFIG_TYPE = "configType";
+String HEADER_EXPORT_CONFIG = "exportConfig";
String HEADER_FAILED_MESSAGE = "failedMessage";
String HEADER_IMPORT_CONFIG_ONESHOT = "importConfigOneShot";
+
+String IMPORT_ONESHOT_ROUTE_ID = "ONE_SHOT_ROUTE";
+String DEFAULT_FILE_COLUMN_SEPARATOR = ",";
+
+String DEFAULT_FILE_LINE_SEPARATOR = "\n";
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b7194f47/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
new file mode 100644
index 000..4525019
--- /dev/null
+++
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/bean/CollectProfileBean.java
@@ -0,0 +1,38 @@
+/*
+ * 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
[jira] [Created] (UNOMI-107) Create a new tag for autocompleted properties
Rizak AHMED created UNOMI-107: - Summary: Create a new tag for autocompleted properties Key: UNOMI-107 URL: https://issues.apache.org/jira/browse/UNOMI-107 Project: Apache Unomi Issue Type: Bug Components: core Affects Versions: 1.2.0-incubating Reporter: Rizak AHMED Using Unomi, As the query endpoint allow us to get all the values for a given property, it will be useful to have a specific tag on properties that will can autocompleted. -- This message was sent by Atlassian JIRA (v6.4.14#64029)
incubator-unomi git commit: Update pom version following the merge of UNOMI-102
Repository: incubator-unomi Updated Branches: refs/heads/master df59f575b -> 9db8296e7 Update pom version following the merge of UNOMI-102 Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9db8296e Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9db8296e Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9db8296e Branch: refs/heads/master Commit: 9db8296e7b9cb02cec1ec2252dba91470eb22dff Parents: df59f57 Author: Abdelkader Midani Authored: Wed Jun 28 13:38:10 2017 +0200 Committer: Abdelkader Midani Committed: Wed Jun 28 13:38:10 2017 +0200 -- api/pom.xml| 2 +- extensions/geonames/pom.xml| 2 +- extensions/geonames/rest/pom.xml | 8 +++--- extensions/geonames/services/pom.xml | 8 +++--- extensions/lists-extension/actions/pom.xml | 8 +++--- extensions/lists-extension/pom.xml | 4 +-- extensions/lists-extension/rest/pom.xml| 8 +++--- extensions/lists-extension/services/pom.xml| 8 +++--- extensions/pom.xml | 2 +- extensions/privacy-extension/pom.xml | 4 +-- extensions/privacy-extension/rest/pom.xml | 8 +++--- extensions/privacy-extension/services/pom.xml | 8 +++--- extensions/router/pom.xml | 2 +- extensions/router/router-api/pom.xml | 2 +- extensions/router/router-core/pom.xml | 2 +- extensions/router/router-karaf-feature/pom.xml | 2 +- extensions/router/router-rest/pom.xml | 2 +- extensions/router/router-service/pom.xml | 2 +- kar/pom.xml| 32 ++--- lifecycle-watcher/pom.xml | 2 +- package/pom.xml| 6 ++-- persistence-elasticsearch/core/pom.xml | 6 ++-- persistence-elasticsearch/pom.xml | 2 +- persistence-spi/pom.xml| 4 +-- plugins/baseplugin/pom.xml | 6 ++-- plugins/hover-event/pom.xml| 4 +-- plugins/mail/pom.xml | 4 +-- plugins/optimization-test/pom.xml | 2 +- plugins/past-event/pom.xml | 6 ++-- plugins/pom.xml| 4 +-- plugins/request/pom.xml| 2 +- plugins/tracked-event/pom.xml | 6 ++-- pom.xml| 2 +- rest/pom.xml | 6 ++-- samples/login-integration/pom.xml | 4 +-- samples/pom.xml| 2 +- samples/tweet-button-plugin/pom.xml| 4 +-- services/pom.xml | 6 ++-- wab/pom.xml| 6 ++-- 39 files changed, 99 insertions(+), 99 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9db8296e/api/pom.xml -- diff --git a/api/pom.xml b/api/pom.xml index 1c8ad15..6662b6f 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -22,7 +22,7 @@ org.apache.unomi unomi-root -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT unomi-api http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9db8296e/extensions/geonames/pom.xml -- diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml index 6c24ef8..f601a7c 100644 --- a/extensions/geonames/pom.xml +++ b/extensions/geonames/pom.xml @@ -27,7 +27,7 @@ org.apache.unomi unomi-extensions -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT cxs-geonames http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9db8296e/extensions/geonames/rest/pom.xml -- diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml index b7938f9..cec5546 100644 --- a/extensions/geonames/rest/pom.xml +++ b/extensions/geonames/rest/pom.xml @@ -20,7 +20,7 @@ org.apache.unomi cxs-geonames -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT 4.0.0 @@ -33,14 +33,14 @@ org.apache.unomi unomi-api -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT provided org.apache.unomi cxs-geonames-services -1.2.0-incubating-unomi_102-SNAPSHOT +1.2.0-incubating-SNAPSHOT provi
[1/4] incubator-unomi git commit: UNOMI-105 set characters encoding to avoid issue in the response
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-UNOMI-102 cb83301ff -> df59f575b
UNOMI-105 set characters encoding to avoid issue in the response
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/74fdd9ce
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/74fdd9ce
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/74fdd9ce
Branch: refs/heads/feature-UNOMI-102
Commit: 74fdd9ce67841f5decb7c627f914302137e0d542
Parents: d19be22
Author: dgaillard
Authored: Mon Jun 26 16:25:17 2017 +0200
Committer: dgaillard
Committed: Mon Jun 26 16:25:17 2017 +0200
--
wab/src/main/java/org/apache/unomi/web/ContextServlet.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/74fdd9ce/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 ad70c18..ba8071e 100644
--- a/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
+++ b/wab/src/main/java/org/apache/unomi/web/ContextServlet.java
@@ -249,12 +249,12 @@ public class ContextServlet extends HttpServlet {
boolean noScript = "json".equals(extension);
String contextAsJSONString =
CustomObjectMapper.getObjectMapper().writeValueAsString(data);
Writer responseWriter;
-if(noScript){
-response.setCharacterEncoding("UTF-8");
+response.setCharacterEncoding("UTF-8");
+if (noScript) {
responseWriter = response.getWriter();
response.setContentType("application/json");
IOUtils.write(contextAsJSONString, responseWriter);
-}else {
+} else {
responseWriter = response.getWriter();
responseWriter.append("window.digitalData = window.digitalData ||
{};\n")
.append("var cxs = ")
[4/4] incubator-unomi git commit: UNOMI-106 Infinite loop on startup - Refactored ConfigSharingService to use a single one across the whole application. It also supports listeners if needed.
UNOMI-106 Infinite loop on startup
- Refactored ConfigSharingService to use a single one across the whole
application. It also supports listeners if needed.
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/df59f575
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/df59f575
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/df59f575
Branch: refs/heads/feature-UNOMI-102
Commit: df59f575bc63ac123de7ca6ad012aafc9eadc3b8
Parents: 27a7288
Author: Serge Huber
Authored: Wed Jun 28 10:21:40 2017 +0200
Committer: Serge Huber
Committed: Wed Jun 28 10:21:40 2017 +0200
--
.../api/services/ConfigSharingService.java | 47 -
.../core/config/ConfigSharingServiceImpl.java | 77 --
.../router/core/context/RouterCamelContext.java | 9 ++
.../resources/OSGI-INF/blueprint/blueprint.xml | 13 +--
.../AbstractConfigurationServiceEndpoint.java | 12 +--
.../ExportConfigurationServiceEndPoint.java | 2 +-
.../ImportConfigurationServiceEndPoint.java | 4 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 17 +--
.../services/ConfigSharingServiceImpl.java | 103 ---
.../resources/OSGI-INF/blueprint/blueprint.xml | 13 +--
10 files changed, 157 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/df59f575/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
--
diff --git
a/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
b/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
index 1bfb050..c1d91af 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
@@ -16,17 +16,54 @@
*/
package org.apache.unomi.api.services;
+import java.util.Set;
+
/**
- * A service to share cfg properties with other bundles.
+ * A service to share configuration properties with other bundles. It also
support listeners that will be called whenever
+ * a property is added/updated/removed. Simply register a service with the
@link ConfigSharingServiceConfigChangeListener interface and it will
+ * be automatically picked up.
*/
public interface ConfigSharingService {
-String getOneshotImportUploadDir();
+Object getProperty(String name);
+Object setProperty(String name, Object value);
+boolean hasProperty(String name);
+Object removeProperty(String name);
+Set getPropertyNames();
+
+class ConfigChangeEvent {
+public enum ConfigChangeEventType { ADDED, UPDATED, REMOVED };
+private ConfigChangeEventType eventType;
+private String name;
+private Object oldValue;
+private Object newValue;
+
+public ConfigChangeEvent(ConfigChangeEventType eventType, String name,
Object oldValue, Object newValue) {
+this.eventType = eventType;
+this.name = name;
+this.oldValue = oldValue;
+this.newValue = newValue;
+}
+
+public ConfigChangeEventType getEventType() {
+return eventType;
+}
+
+public String getName() {
+return name;
+}
-void setOneshotImportUploadDir(String oneshotImportUploadDir);
+public Object getOldValue() {
+return oldValue;
+}
-String getInternalServerPort();
+public Object getNewValue() {
+return newValue;
+}
+}
-void setInternalServerPort(String internalServerPort);
+interface ConfigChangeListener {
+void configChanged(ConfigChangeEvent configChangeEvent);
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/df59f575/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
deleted file mode 100644
index 6aa357e..000
---
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
+++ /dev/null
@@ -1,77 +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
- *
[3/4] incubator-unomi git commit: Merge branch 'feature-UNOMI-102'
Merge branch 'feature-UNOMI-102' Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/27a7288e Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/27a7288e Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/27a7288e Branch: refs/heads/feature-UNOMI-102 Commit: 27a7288e89bce78fb9add5bd9b8b36c76ef6c133 Parents: 8860ddf cb83301 Author: Abdelkader Midani Authored: Wed Jun 28 02:31:57 2017 +0200 Committer: Abdelkader Midani Committed: Wed Jun 28 02:31:57 2017 +0200 -- api/pom.xml | 2 +- .../api/services/ConfigSharingService.java | 32 +++ extensions/geonames/pom.xml | 2 +- extensions/geonames/rest/pom.xml| 8 +- extensions/geonames/services/pom.xml| 8 +- extensions/lists-extension/actions/pom.xml | 8 +- extensions/lists-extension/pom.xml | 4 +- extensions/lists-extension/rest/pom.xml | 8 +- extensions/lists-extension/services/pom.xml | 8 +- extensions/pom.xml | 2 +- extensions/privacy-extension/pom.xml| 4 +- extensions/privacy-extension/rest/pom.xml | 8 +- extensions/privacy-extension/services/pom.xml | 8 +- extensions/router/pom.xml | 6 +- extensions/router/router-api/pom.xml| 6 +- .../unomi/router/api/ExportConfiguration.java | 45 .../unomi/router/api/ImportConfiguration.java | 182 +- .../router/api/ImportExportConfiguration.java | 203 .../unomi/router/api/RouterConstants.java | 44 .../services/ImportConfigurationService.java| 60 - .../ImportExportConfigurationService.java | 61 + extensions/router/router-core/pom.xml | 13 +- .../unomi/router/core/RouterConstants.java | 41 .../core/config/ConfigSharingServiceImpl.java | 77 ++ .../core/context/ProfileImportCamelContext.java | 187 -- .../router/core/context/RouterCamelContext.java | 243 +++ .../core/processor/ConfigUpdateProcessor.java | 12 +- .../ImportConfigByFileNameProcessor.java| 8 +- .../core/processor/LineSplitFailureHandler.java | 2 +- .../core/processor/LineSplitProcessor.java | 2 +- .../processor/RouteCompletionProcessor.java | 8 +- .../core/route/ConfigUpdateRouteBuilder.java| 73 ++ .../route/ProfileExportCollectRouteBuilder.java | 81 +++ .../ProfileImportAbstractRouteBuilder.java | 2 +- .../ProfileImportConfigUpdateRouteBuilder.java | 62 - .../ProfileImportFromSourceRouteBuilder.java| 104 .../route/ProfileImportOneShotRouteBuilder.java | 2 +- .../route/ProfileImportToUnomiRouteBuilder.java | 2 +- .../resources/OSGI-INF/blueprint/blueprint.xml | 39 ++- .../main/resources/org.apache.unomi.router.cfg | 8 +- extensions/router/router-karaf-feature/pom.xml | 8 +- extensions/router/router-rest/pom.xml | 6 +- .../AbstractConfigurationServiceEndpoint.java | 92 +++ .../ExportConfigurationServiceEndPoint.java | 86 +++ .../ImportConfigurationServiceEndPoint.java | 92 ++- .../resources/OSGI-INF/blueprint/blueprint.xml | 46 ++-- extensions/router/router-service/pom.xml| 6 +- .../AbstractConfigurationServiceImpl.java | 73 ++ .../ExportConfigurationServiceImpl.java | 61 + .../ImportConfigurationServiceImpl.java | 56 + .../resources/OSGI-INF/blueprint/blueprint.xml | 17 +- kar/pom.xml | 32 +-- lifecycle-watcher/pom.xml | 6 +- package/pom.xml | 6 +- persistence-elasticsearch/core/pom.xml | 6 +- persistence-elasticsearch/pom.xml | 2 +- persistence-spi/pom.xml | 4 +- plugins/baseplugin/pom.xml | 6 +- plugins/hover-event/pom.xml | 4 +- plugins/mail/pom.xml| 4 +- plugins/optimization-test/pom.xml | 2 +- plugins/past-event/pom.xml | 6 +- plugins/pom.xml | 4 +- plugins/request/pom.xml | 2 +- plugins/tracked-event/pom.xml | 6 +- pom.xml | 2 +- rest/pom.xml| 6 +- samples/login-integration/pom.xml | 4 +- samples/pom.xml | 2 +- samples/tweet-button-plugin/pom.xml | 4 +- services/pom.xml| 6 +- .../services/ConfigSharingServiceImpl.java | 80 ++ .../resources/OSGI-INF/blueprint/blueprint
[2/4] incubator-unomi git commit: UNOMI-106 Infinite loop on startup - Removed CXF bus configuration that might be causing CXF restarts that were noticed in some of the logs.
UNOMI-106 Infinite loop on startup - Removed CXF bus configuration that might be causing CXF restarts that were noticed in some of the logs. 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/8860ddff Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/8860ddff Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/8860ddff Branch: refs/heads/feature-UNOMI-102 Commit: 8860ddffa9bc4387f3e9b7a7973a8345102562a2 Parents: 74fdd9c Author: Serge Huber Authored: Tue Jun 27 11:09:37 2017 +0200 Committer: Serge Huber Committed: Tue Jun 27 11:09:37 2017 +0200 -- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 11 ++- .../src/main/resources/OSGI-INF/blueprint/blueprint.xml | 10 ++ rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml | 2 +- 5 files changed, 9 insertions(+), 36 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml -- diff --git a/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 590fef7..47036b0 100644 --- a/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/geonames/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd";> - - - - - - + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml -- diff --git a/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 7b7e626..01762ad 100644 --- a/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/lists-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"; xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.xsd - http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd - http://cxf.apache.org/blueprint/core http://cxf.apache.org/schemas/blueprint/core.xsd";> - - - - - - + http://cxf.apache.org/blueprint/jaxrs http://cxf.apache.org/schemas/blueprint/jaxrs.xsd";> http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/8860ddff/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml -- diff --git a/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index c7089e6..772f348 100644 --- a/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/privacy-extension/rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@ -17,17 +17,10 @@ --> http://www.w3.org/2001/XMLSchema-instance"; - xmlns:cxf="http://cxf.apache.org/blueprint/core"; xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; + xmlns:jaxrs="http://cxf.apache.org/blueprint/jaxrs"; xmlns="http://www.osgi.org/xmlns/bluep
incubator-unomi git commit: UNOMI-106 Infinite loop on startup - Refactored ConfigSharingService to use a single one across the whole application. It also supports listeners if needed.
Repository: incubator-unomi
Updated Branches:
refs/heads/master 27a7288e8 -> df59f575b
UNOMI-106 Infinite loop on startup
- Refactored ConfigSharingService to use a single one across the whole
application. It also supports listeners if needed.
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/df59f575
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/df59f575
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/df59f575
Branch: refs/heads/master
Commit: df59f575bc63ac123de7ca6ad012aafc9eadc3b8
Parents: 27a7288
Author: Serge Huber
Authored: Wed Jun 28 10:21:40 2017 +0200
Committer: Serge Huber
Committed: Wed Jun 28 10:21:40 2017 +0200
--
.../api/services/ConfigSharingService.java | 47 -
.../core/config/ConfigSharingServiceImpl.java | 77 --
.../router/core/context/RouterCamelContext.java | 9 ++
.../resources/OSGI-INF/blueprint/blueprint.xml | 13 +--
.../AbstractConfigurationServiceEndpoint.java | 12 +--
.../ExportConfigurationServiceEndPoint.java | 2 +-
.../ImportConfigurationServiceEndPoint.java | 4 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 17 +--
.../services/ConfigSharingServiceImpl.java | 103 ---
.../resources/OSGI-INF/blueprint/blueprint.xml | 13 +--
10 files changed, 157 insertions(+), 140 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/df59f575/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
--
diff --git
a/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
b/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
index 1bfb050..c1d91af 100644
--- a/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
+++ b/api/src/main/java/org/apache/unomi/api/services/ConfigSharingService.java
@@ -16,17 +16,54 @@
*/
package org.apache.unomi.api.services;
+import java.util.Set;
+
/**
- * A service to share cfg properties with other bundles.
+ * A service to share configuration properties with other bundles. It also
support listeners that will be called whenever
+ * a property is added/updated/removed. Simply register a service with the
@link ConfigSharingServiceConfigChangeListener interface and it will
+ * be automatically picked up.
*/
public interface ConfigSharingService {
-String getOneshotImportUploadDir();
+Object getProperty(String name);
+Object setProperty(String name, Object value);
+boolean hasProperty(String name);
+Object removeProperty(String name);
+Set getPropertyNames();
+
+class ConfigChangeEvent {
+public enum ConfigChangeEventType { ADDED, UPDATED, REMOVED };
+private ConfigChangeEventType eventType;
+private String name;
+private Object oldValue;
+private Object newValue;
+
+public ConfigChangeEvent(ConfigChangeEventType eventType, String name,
Object oldValue, Object newValue) {
+this.eventType = eventType;
+this.name = name;
+this.oldValue = oldValue;
+this.newValue = newValue;
+}
+
+public ConfigChangeEventType getEventType() {
+return eventType;
+}
+
+public String getName() {
+return name;
+}
-void setOneshotImportUploadDir(String oneshotImportUploadDir);
+public Object getOldValue() {
+return oldValue;
+}
-String getInternalServerPort();
+public Object getNewValue() {
+return newValue;
+}
+}
-void setInternalServerPort(String internalServerPort);
+interface ConfigChangeListener {
+void configChanged(ConfigChangeEvent configChangeEvent);
+}
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/df59f575/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
--
diff --git
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
deleted file mode 100644
index 6aa357e..000
---
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/config/ConfigSharingServiceImpl.java
+++ /dev/null
@@ -1,77 +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.
