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 <amid...@apache.org> Authored: Wed Jun 28 02:31:57 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> 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.xml | 11 + wab/pom.xml | 6 +- 74 files changed, 1560 insertions(+), 869 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/27a7288e/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml ---------------------------------------------------------------------- diff --cc extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml index 69fa336,fd36e50..8cd4948 --- a/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml +++ b/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml @@@ -22,20 -22,14 +22,8 @@@ 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://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd";> - <cxf:bus id="cxsServiceBus"> - <cxf:features> - <cxf:logging/> - </cxf:features> - </cxf:bus> + http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.xsd";> - <cm:property-placeholder persistent-id="org.apache.unomi.router" update-strategy="reload"> - <cm:default-properties> - <cm:property name="import.oneshot.uploadDir" value="/tmp/oneshot_import_configs/"/> - </cm:default-properties> - </cm:property-placeholder> - - <cm:property-placeholder persistent-id="org.apache.unomi.cluster" - update-strategy="reload" placeholder-prefix="${cluster."> - <cm:default-properties> - <cm:property name="cluster.contextserver.port" value="8181"/> - </cm:default-properties> - </cm:property-placeholder> <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/> <bean id="jacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
