You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by am...@apache.org on 2017/06/12 17:24:43 UTC
[01/14] incubator-unomi git commit: UNOMI-100 fix issue with isDay
and isNotDay date wasn't converted as ISO, add unit test [Forced Update!]
Repository: incubator-unomi
Updated Branches:
refs/heads/feature-DMF-1343 1637a9122 -> 63debd5fc (forced update)
UNOMI-100 fix issue with isDay and isNotDay date wasn't converted as ISO, add unit test
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/0f441403
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/0f441403
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/0f441403
Branch: refs/heads/feature-DMF-1343
Commit: 0f4414039274750a3fe2b62fdcbecbfda73eaed4
Parents: 46be002
Author: dgaillard <dg...@jahia.com>
Authored: Wed Jun 7 18:51:09 2017 +0200
Committer: dgaillard <dg...@jahia.com>
Committed: Wed Jun 7 18:51:09 2017 +0200
----------------------------------------------------------------------
.../test/java/org/apache/unomi/itests/ConditionBuilder.java | 8 ++++++++
.../java/org/apache/unomi/itests/ConditionEvaluatorIT.java | 3 +++
.../conditions/PropertyConditionESQueryBuilder.java | 2 +-
3 files changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
index 0fbffcd..38356b5 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionBuilder.java
@@ -129,6 +129,14 @@ public class ConditionBuilder {
return op("in").dateValues(values);
}
+ public ComparisonCondition isDay(Date value) {
+ return op("isDay").dateValue(value);
+ }
+
+ public ComparisonCondition isNotDay(Date value) {
+ return op("isNotDay").dateValue(value);
+ }
+
public ComparisonCondition in(Integer... values) {
return op("in").integerValues(values);
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
----------------------------------------------------------------------
diff --git a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
index b75a8f5..5fb6b6f 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ConditionEvaluatorIT.java
@@ -112,6 +112,9 @@ public class ConditionEvaluatorIT extends BaseIT {
assertTrue(eval(builder.profileProperty("properties.lastVisit").all(lastVisit).build()));
assertFalse(eval(builder.profileProperty("properties.lastVisit")
.all(new Date(lastVisit.getTime() + 10000), lastVisit).build()));
+
+ assertTrue(eval(builder.profileProperty("properties.lastVisit").isDay(lastVisit).build()));
+ assertTrue(eval(builder.profileProperty("properties.lastVisit").isNotDay(new Date(lastVisit.getTime() + 10000)).build()));
}
@Test
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/0f441403/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
index 26e480a..b06c94e 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/conditions/PropertyConditionESQueryBuilder.java
@@ -166,7 +166,7 @@ public class PropertyConditionESQueryBuilder implements ConditionESQueryBuilder
DateTime date = new DateTime(value);
DateTime dayStart = date.withTimeAtStartOfDay();
DateTime dayAfterStart = date.plusDays(1).withTimeAtStartOfDay();
- return QueryBuilders.rangeQuery(name).gte(dayStart.toDate()).lte(dayAfterStart.toDate());
+ return QueryBuilders.rangeQuery(name).gte(convertDateToISO(dayStart.toDate())).lte(convertDateToISO(dayAfterStart.toDate()));
}
private Object convertDateToISO(Object dateValue) {
[03/14] incubator-unomi git commit: DMF-1343 : Move unomi-router
under extensions
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
deleted file mode 100644
index 382b69d..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
+++ /dev/null
@@ -1,119 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.route;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jackson.JacksonDataFormat;
-import org.apache.camel.component.kafka.KafkaComponent;
-import org.apache.camel.component.kafka.KafkaConfiguration;
-import org.apache.camel.component.kafka.KafkaEndpoint;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.core.processor.LineSplitProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by amidani on 26/04/2017.
- */
-
-public class ProfileImportSourceToKafkaRouteBuilder extends RouteBuilder {
-
- private static final Logger logger = LoggerFactory.getLogger(ProfileImportSourceToKafkaRouteBuilder.class.getName());
-
- private List<ImportConfiguration> importConfigurationList;
- private JacksonDataFormat jacksonDataFormat;
- private String kafkaHost;
- private String kafkaPort;
- private String kafkaImportTopic;
- private String kafkaImportGroupId;
-
- public ProfileImportSourceToKafkaRouteBuilder(Map<String, String> kafkaProps) {
- kafkaHost = kafkaProps.get("kafkaHost");
- kafkaPort = kafkaProps.get("kafkaPort");
- kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
- kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
- }
-
- @Override
- public void configure() throws Exception {
- //Prepare Kafka Deposit
- StringBuilder kafkaUri = new StringBuilder("kafka:");
- kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
- if(StringUtils.isNotBlank(kafkaImportGroupId)) {
- kafkaUri.append("&groupId="+ kafkaImportGroupId);
- }
-
- KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
- kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
- kafkaConfiguration.setTopic(kafkaImportTopic);
- kafkaConfiguration.setGroupId(kafkaImportGroupId);
- KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
- endpoint.setConfiguration(kafkaConfiguration);
-
- //Loop on multiple import configuration
- for(ImportConfiguration importConfiguration : importConfigurationList) {
- if(importConfiguration.getProperties().size() > 0 &&
- StringUtils.isNotEmpty((String) importConfiguration.getProperties().get("source"))) {
- //Prepare Split Processor
- LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
- lineSplitProcessor.setFieldsMapping((Map<String, Integer>) importConfiguration.getProperties().get("mapping"));
- lineSplitProcessor.setOverwriteExistingProfiles(importConfiguration.isOverwriteExistingProfiles());
- lineSplitProcessor.setPropertiesToOverwrite(importConfiguration.getPropertiesToOverwrite());
- lineSplitProcessor.setMergingProperty(importConfiguration.getMergingProperty());
-
- from((String) importConfiguration.getProperties().get("source"))
- .routeId(importConfiguration.getItemId())// This allow identification of the route for manual start/stop
- .autoStartup(importConfiguration.isActive())// Auto-start if the import configuration is set active
- .split(bodyAs(String.class).tokenize("\n"))
- .process(lineSplitProcessor)
- .to("log:org.apache.unomi.router?level=INFO")
- .marshal(jacksonDataFormat)
- .convertBodyTo(String.class)
- .to(endpoint);
- }
- }
- }
-
- public void setImportConfigurationList(List<ImportConfiguration> importConfigurationList) {
- this.importConfigurationList = importConfigurationList;
- }
-
- public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
- this.jacksonDataFormat = jacksonDataFormat;
- }
-
- public void setKafkaHost(String kafkaHost) {
- this.kafkaHost = kafkaHost;
- }
-
- public void setKafkaPort(String kafkaPort) {
- this.kafkaPort = kafkaPort;
- }
-
- public void setKafkaImportTopic(String kafkaImportTopic) {
- this.kafkaImportTopic = kafkaImportTopic;
- }
-
- public void setKafkaImportGroupId(String kafkaImportGroupId) {
- this.kafkaImportGroupId = kafkaImportGroupId;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index ff29755..0000000
--- a/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
- xmlns:camel="http://camel.apache.org/schema/blueprint"
- xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.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
- http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
-
- <cm:property-placeholder persistent-id="org.apache.unomi.router" update-strategy="reload">
- <cm:default-properties>
- <cm:property name="kafka.host" value="localhost"/>
- <cm:property name="kafka.port" value="9092"/>
- <cm:property name="kafka.import.topic" value="camel-deposit"/>
- <cm:property name="kafka.import.groupId" value="unomi-import-group"/>
- <cm:property name="import.oneshot.uploadDir" value="/tmp/oneshot_import_configs/"/>
- </cm:default-properties>
- </cm:property-placeholder>
-
- <bean id="unomiStorageProcessor" class="org.apache.unomi.router.core.processor.UnomiStorageProcessor">
- <property name="profileImportService" ref="profileImportService"/>
- </bean>
-
- <bean id="importConfigByFileNameProcessor" class="org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor">
- <property name="importConfigurationService" ref="importConfigurationService"/>
- </bean>
-
- <bean id="jacksonDataFormat" class="org.apache.camel.component.jackson.JacksonDataFormat">
- <property name="unmarshalType" value="org.apache.unomi.router.api.ProfileToImport"/>
- </bean>
-
- <bean id="jacksonDataFormatImportConfig" class="org.apache.camel.model.dataformat.JsonDataFormat">
- <property name="unmarshalType" value="org.apache.unomi.router.api.ImportConfiguration"/>
- <property name="library" value="Jackson"/>
- </bean>
-
- <bean class="org.apache.camel.component.servlet.osgi.OsgiServletRegisterer"
- init-method="register"
- destroy-method="unregister">
- <property name="alias" value="/importConfigAdmin"/>
- <property name="httpService" ref="httpService"/>
- <property name="servlet" ref="camelServlet"/>
- </bean>
-
- <bean id="camelServlet" class="org.apache.camel.component.servlet.CamelHttpTransportServlet"/>
-
-
- <bean id="camelContext" class="org.apache.unomi.router.core.context.ProfileImportCamelContext"
- init-method="initCamelContext" destroy-method="preDestroy">
- <property name="kafkaProps">
- <map>
- <entry key="kafkaHost" value="${kafka.host}"/>
- <entry key="kafkaPort" value="${kafka.port}"/>
- <entry key="kafkaImportTopic" value="${kafka.import.topic}"/>
- <entry key="kafkaImportGroupId" value="${kafka.import.groupId}"/>
- </map>
- </property>
- <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
- <property name="unomiStorageProcessor" ref="unomiStorageProcessor"/>
- <property name="importConfigByFileNameProcessor" ref="importConfigByFileNameProcessor"/>
- <property name="importConfigurationService" ref="importConfigurationService"/>
- <property name="jacksonDataFormat" ref="jacksonDataFormat"/>
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </bean>
-
- <camelContext id="httpEndpoint" xmlns="http://camel.apache.org/schema/blueprint">
- <routeBuilder ref="profileImportConfigUpdateRouteBuilder" />
- </camelContext>
-
- <bean id="profileImportConfigUpdateRouteBuilder" class="org.apache.unomi.router.core.route.ProfileImportConfigUpdateRouteBuilder">
- <property name="profileImportCamelContext" ref="camelContext"/>
- </bean>
-
- <reference id="httpService" interface="org.osgi.service.http.HttpService"/>
- <reference id="profileImportService" interface="org.apache.unomi.router.api.services.ProfileImportService"/>
- <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
-
-</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/resources/org.apache.unomi.router.cfg
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/resources/org.apache.unomi.router.cfg b/router/router-core/src/main/resources/org.apache.unomi.router.cfg
deleted file mode 100644
index b11d983..0000000
--- a/router/router-core/src/main/resources/org.apache.unomi.router.cfg
+++ /dev/null
@@ -1,23 +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
-# (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 express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-kafka.host=localhost
-kafka.port=9092
-kafka.import.topic=camel-deposit
-kafka.import.groupId=unomi-import-group
-
-#Import One Shot upload directory
-import.oneshot.uploadDir=/tmp/unomi_oneshot_import_configs/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-karaf-feature/pom.xml b/router/router-karaf-feature/pom.xml
deleted file mode 100644
index 8a8e62c..0000000
--- a/router/router-karaf-feature/pom.xml
+++ /dev/null
@@ -1,157 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <parent>
- <artifactId>unomi-router</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>unomi-router-karaf-feature</artifactId>
- <name>Apache Unomi :: Extensions :: Router :: Apache Karaf Feature</name>
- <description>Apache Karaf feature for the Apache Unomi Context Server extension</description>
- <packaging>feature</packaging>
- <dependencies>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
- <version>0.1.54_1</version>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.5</version>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.10.1.0</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-blueprint</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-servlet</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-ftp</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-stream</artifactId>
- <version>${camel.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-kafka</artifactId>
- <version>${camel.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-cors</artifactId>
- <version>${cxf.version}</version>
- </dependency>
-
- <!-- UNOMI ROUTER Modules Dependencies -->
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-persistence-spi</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-api</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-core</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-service</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-rest</artifactId>
- <version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <type>bundle</type>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- </dependency>
- </dependencies>
-
- <build>
- <pluginManagement>
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <includeTransitiveDependency>false</includeTransitiveDependency>
- </configuration>
- </plugin>
- </plugins>
- </pluginManagement>
-
- <plugins>
- <plugin>
- <groupId>org.apache.karaf.tooling</groupId>
- <artifactId>karaf-maven-plugin</artifactId>
- <configuration>
- <startLevel>90</startLevel>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-rest/pom.xml b/router/router-rest/pom.xml
deleted file mode 100644
index e39e919..0000000
--- a/router/router-rest/pom.xml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <parent>
- <artifactId>unomi-router</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>unomi-router-rest</artifactId>
- <name>Apache Unomi :: Extensions :: Router :: REST API</name>
- <description>Router REST API</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>javax.ws.rs</groupId>
- <artifactId>javax.ws.rs-api</artifactId>
- <version>2.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.cxf</groupId>
- <artifactId>cxf-rt-rs-security-cors</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient-osgi</artifactId>
- <type>bundle</type>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore-osgi</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.fasterxml.jackson.core</groupId>
- <artifactId>jackson-databind</artifactId>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
deleted file mode 100644
index e81930a..0000000
--- a/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
+++ /dev/null
@@ -1,167 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.rest;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import org.apache.cxf.jaxrs.ext.multipart.Multipart;
-import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
-import org.apache.http.HttpResponse;
-import org.apache.http.client.methods.HttpPut;
-import org.apache.http.entity.StringEntity;
-import org.apache.http.impl.client.CloseableHttpClient;
-import org.apache.http.impl.client.HttpClients;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.api.services.ImportConfigurationService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jws.WebMethod;
-import javax.jws.WebService;
-import javax.ws.rs.*;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.util.List;
-
-/**
- * A JAX-RS endpoint to manage {@link org.apache.unomi.router.api.ImportConfiguration}s.
- */
-@WebService
-@CrossOriginResourceSharing(
- allowAllOrigins = true,
- allowCredentials = true
-)
-public class ImportConfigurationServiceEndPoint {
-
- private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceEndPoint.class.getName());
-
- private ImportConfigurationService importConfigurationService;
- private String uploadDir;
-
- public ImportConfigurationServiceEndPoint () {
- logger.info("Initializing import configuration service endpoint...");
- }
-
- @WebMethod(exclude = true)
- public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
- this.importConfigurationService = importConfigurationService;
- }
-
- @WebMethod(exclude = true)
- public void setUploadDir(String uploadDir) {
- this.uploadDir = uploadDir;
- }
-
- /**
- * Retrieves all the import configurations.
- *
- * @return all the import configurations.
- */
- @GET
- @Path("/")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public List<ImportConfiguration> getImportConfigurations() {
- return importConfigurationService.getImportConfigurations();
- }
-
- /**
- * Retrieves an import configuration by id.
- *
- * @return the import configuration that matches the given id.
- */
- @GET
- @Path("/{configId}")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public ImportConfiguration getImportConfiguration(@PathParam("configId") String configId) {
- return importConfigurationService.load(configId);
- }
-
- /**
- * Delete an import configuration by id.
- *
- * @return the deleted import configuration.
- */
- @DELETE
- @Path("/{configId}")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public void deleteImportConfiguration(@PathParam("configId") String configId) {
- importConfigurationService.delete(configId);
- }
-
-
-
- /**
- * Save the given import configuration.
- *
- * @return the import configuration saved.
- */
- @POST
- @Path("/")
- @Produces(MediaType.APPLICATION_JSON)
- @Consumes(MediaType.APPLICATION_JSON)
- public ImportConfiguration saveImportConfiguration(ImportConfiguration importConfiguration) {
- ImportConfiguration importConfigSaved = importConfigurationService.save(importConfiguration);
- CloseableHttpClient httpClient = HttpClients.createDefault();
- try {
- HttpPut httpPut = new HttpPut("http://localhost:8181/importConfigAdmin/");
- StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
- input.setContentType(MediaType.APPLICATION_JSON);
- httpPut.setEntity(input);
-
- HttpResponse response = httpClient.execute(httpPut);
-
- if (response.getStatusLine().getStatusCode() != 200) {
- throw new RuntimeException("Failed : HTTP error code : "
- + response.getStatusLine().getStatusCode());
- }
- } catch (IOException e) {
- logger.warn("Unable to update Camel route [{}]", importConfiguration.getItemId());
- }
- return importConfigSaved;
- }
-
- /**
- * Save/Update the given import configuration.
- * Prepare the file to be processed with Camel routes
- * @return OK / NOK Http Code.
- */
- @POST
- @Path("/oneshot")
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(MediaType.APPLICATION_JSON)
- public Response processOneshotImportConfigurationCSV(@Multipart(value = "importConfigId") String importConfigId, @Multipart(value = "file") Attachment file) {
- try {
- java.nio.file.Path path = Paths.get(uploadDir+importConfigId+".csv");
- Files.deleteIfExists(path);
- InputStream in = file.getObject(InputStream.class);
-
- Files.copy(in, path);
-
- } catch (IOException e) {
- e.printStackTrace();
- return Response.serverError().build();
- }
- return Response.ok().build();
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index a5cf1be..0000000
--- a/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
- xmlns:cxf="http://cxf.apache.org/blueprint/core" 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://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>
-
- <cxf:bus id="cxsServiceBus">
- <cxf:features>
- <cxf:logging/>
- </cxf:features>
- </cxf:bus>
-
- <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/>
- <bean id="jacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
- <bean id="json-provider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
- <argument index="0" ref="jacksonMapper" type="com.fasterxml.jackson.databind.ObjectMapper"/>
- </bean>
- <bean id="jaas-filter" class="org.apache.cxf.jaxrs.security.JAASAuthenticationFilter">
- <!-- Name of the JAAS Context -->
- <property name="contextName" value="karaf"/>
- <!-- Hint to the filter on how to have Principals representing users and roles separated
- while initializing a SecurityContext -->
- <property name="rolePrefix" value="ROLE_"/>
- <property name="realmName" value="cxs"/>
- </bean>
-
- <jaxrs:server address="/importConfiguration" id="restImportConfigurationService">
- <jaxrs:providers>
- <ref component-id="json-provider"/>
- <ref component-id="cors-filter"/>
- <ref component-id="jaas-filter"/>
- </jaxrs:providers>
-
- <jaxrs:serviceBeans>
- <ref component-id="importConfigurationServiceEndPoint"/>
- </jaxrs:serviceBeans>
- </jaxrs:server>
-
- <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
-
- <bean id="importConfigurationServiceEndPoint" class="org.apache.unomi.router.rest.ImportConfigurationServiceEndPoint">
- <property name="importConfigurationService" ref="importConfigurationService"/>
- <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
- </bean>
-
-</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-service/pom.xml b/router/router-service/pom.xml
deleted file mode 100644
index 0aed70e..0000000
--- a/router/router-service/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <parent>
- <artifactId>unomi-router</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>unomi-router-service</artifactId>
- <name>Apache Unomi :: Extensions :: Router :: Services</name>
- <description>Router Services</description>
- <packaging>bundle</packaging>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Import-Package>
- sun.misc;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-persistence-spi</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>commons-beanutils</groupId>
- <artifactId>commons-beanutils</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-collections</groupId>
- <artifactId>commons-collections</artifactId>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>javax.servlet-api</artifactId>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java b/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
deleted file mode 100644
index a4f6131..0000000
--- a/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
+++ /dev/null
@@ -1,114 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.unomi.router.services;
-
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.api.services.ImportConfigurationService;
-import org.apache.unomi.persistence.spi.PersistenceService;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.List;
-import java.util.UUID;
-
-/**
- * Created by amidani on 28/04/2017.
- */
-public class ImportConfigurationServiceImpl implements ImportConfigurationService,SynchronousBundleListener {
-
- private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceImpl.class.getName());
-
- private BundleContext bundleContext;
- private PersistenceService persistenceService;
-
- public ImportConfigurationServiceImpl() {
- logger.info("Initializing import configuration service...");
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- public void setPersistenceService(PersistenceService persistenceService) {
- this.persistenceService = persistenceService;
- }
-
- public void postConstruct() {
- logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
-
- processBundleStartup(bundleContext);
- for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
- processBundleStartup(bundle.getBundleContext());
- }
- }
- bundleContext.addBundleListener(this);
- logger.info("Import configuration service initialized.");
- }
-
- public void preDestroy() {
- bundleContext.removeBundleListener(this);
- logger.info("Import configuration service shutdown.");
- }
-
- private void processBundleStartup(BundleContext bundleContext) {
- if (bundleContext == null) {
- return;
- }
- }
-
- private void processBundleStop(BundleContext bundleContext) {
- }
-
-
- @Override
- public List<ImportConfiguration> getImportConfigurations() {
- return persistenceService.getAllItems(ImportConfiguration.class);
- }
-
- @Override
- public ImportConfiguration load(String configId) {
- return persistenceService.load(configId, ImportConfiguration.class);
- }
-
- @Override
- public ImportConfiguration save(ImportConfiguration importConfiguration) {
- if (importConfiguration.getItemId() == null) {
- importConfiguration.setItemId(UUID.randomUUID().toString());
- }
- if(persistenceService.save(importConfiguration)) {
-
- }
-
- return persistenceService.load(importConfiguration.getItemId(), ImportConfiguration.class);
- }
-
- @Override
- public void delete(String configId) {
- persistenceService.remove(configId, ImportConfiguration.class);
- }
-
- @Override
- public void bundleChanged(BundleEvent bundleEvent) {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java b/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
deleted file mode 100644
index 8097953..0000000
--- a/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
+++ /dev/null
@@ -1,122 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.services;
-
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.unomi.api.Profile;
-import org.apache.unomi.api.services.EventListenerService;
-import org.apache.unomi.persistence.spi.PersistenceService;
-import org.apache.unomi.router.api.ProfileToImport;
-import org.apache.unomi.router.api.services.ProfileImportService;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
-/**
- * Created by amidani on 18/05/2017.
- */
-public class ProfileImportServiceImpl implements ProfileImportService, SynchronousBundleListener {
-
- private static final Logger logger = LoggerFactory.getLogger(ProfileImportServiceImpl.class.getName());
-
- private PersistenceService persistenceService;
-
- private BundleContext bundleContext;
-
- public void setPersistenceService(PersistenceService persistenceService) {
- this.persistenceService = persistenceService;
- }
-
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- public void postConstruct() {
- logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
-
- processBundleStartup(bundleContext);
- for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
- processBundleStartup(bundle.getBundleContext());
- }
- }
- bundleContext.addBundleListener(this);
- logger.info("Import configuration service initialized.");
- }
-
- public void preDestroy() {
- bundleContext.removeBundleListener(this);
- logger.info("Import configuration service shutdown.");
- }
-
- private void processBundleStartup(BundleContext bundleContext) {
- if (bundleContext == null) {
- return;
- }
- }
-
- private void processBundleStop(BundleContext bundleContext) {
- }
-
-
- public boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException {
- logger.info("Importing profile: {}, {}", profileToImport.getProperties().get("firstName"), profileToImport.getProperties().get("lastName"));
- Profile existingProfile = new Profile();
- List<Profile> existingProfiles = persistenceService.query("properties."+profileToImport.getMergingProperty(), (String)profileToImport.getProperties().get(profileToImport.getMergingProperty()), null, Profile.class);
- logger.info("Query existing profile with mergingProperty: {}", profileToImport.getMergingProperty());
- logger.info("Found: {}", existingProfiles.size());
-
- //Profile already exist, and import config allow to overwrite profiles
- if(existingProfiles.size() == 1) {
- existingProfile = existingProfiles.get(0);
- if(profileToImport.isProfileToDelete()) {
- logger.info("Profile is to delete!");
- persistenceService.remove(existingProfile.getItemId(), Profile.class);
- return true;
- }
- List<String> propertiesToOverwrite = profileToImport.getPropertiesToOverwrite();
- if(profileToImport.isOverwriteExistingProfiles() && propertiesToOverwrite!=null && propertiesToOverwrite.size() > 0) { // We overwrite only properties marked to overwrite
- logger.info("Properties to overwrite: {}", propertiesToOverwrite);
- for(String propName : propertiesToOverwrite) {
- existingProfile.getProperties().put(propName, profileToImport.getProperties().get(propName));
- }
- } else { //If no property is marked to overwrite we replace the whole properties map
- logger.info("Overwrite all properties");
- existingProfile.setProperties(profileToImport.getProperties());
- }
- } else if(existingProfiles.size() == 0) {
- logger.info("New profile to add...");
- BeanUtils.copyProperties(existingProfile, profileToImport);
- } else {
- logger.warn("{} occurences found for profile with {} = {}. Profile import is skipped", existingProfiles.size(),
- profileToImport.getMergingProperty(), profileToImport.getProperties().get("firstName"));
- }
- logger.info("-------------------------------------");
- return persistenceService.save(existingProfile);
- }
-
- @Override
- public void bundleChanged(BundleEvent bundleEvent) {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
deleted file mode 100644
index 61200f2..0000000
--- a/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-
-<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- 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">
-
- <reference id="persistenceService" interface="org.apache.unomi.persistence.spi.PersistenceService"/>
-
- <bean id="importConfigurationServiceImpl" class="org.apache.unomi.router.services.ImportConfigurationServiceImpl"
- init-method="postConstruct" destroy-method="preDestroy">
- <property name="persistenceService" ref="persistenceService"/>
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </bean>
- <service id="importConfigurationService" ref="importConfigurationServiceImpl" auto-export="interfaces"/>
-
- <bean id="profileImportServiceImpl" class="org.apache.unomi.router.services.ProfileImportServiceImpl"
- init-method="postConstruct" destroy-method="preDestroy">
- <property name="persistenceService" ref="persistenceService"/>
- <property name="bundleContext" ref="blueprintBundleContext"/>
- </bean>
- <service id="profileImportService" ref="profileImportServiceImpl" auto-export="interfaces"/>
-
-</blueprint>
[10/14] incubator-unomi git commit: DMF-1343 : Improvement and
documentation
Posted by am...@apache.org.
DMF-1343 : Improvement and documentation
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/77fc9e44
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/77fc9e44
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/77fc9e44
Branch: refs/heads/feature-DMF-1343
Commit: 77fc9e44deb09f470cfad2ac791facd85d50cf50
Parents: 9cffa13
Author: Abdelkader Midani <am...@apache.org>
Authored: Wed May 24 17:26:14 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
extensions/router/README.md | 113 +++++++++++++++++++
.../ProfileImportConfigUpdateRouteBuilder.java | 2 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 6 +-
.../main/resources/org.apache.unomi.router.cfg | 4 +-
.../ImportConfigurationServiceEndPoint.java | 37 +++---
.../resources/OSGI-INF/blueprint/blueprint.xml | 14 ++-
6 files changed, 154 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/README.md
----------------------------------------------------------------------
diff --git a/extensions/router/README.md b/extensions/router/README.md
new file mode 100644
index 0000000..8fa1994
--- /dev/null
+++ b/extensions/router/README.md
@@ -0,0 +1,113 @@
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+Unomi Router
+==========================
+
+## Getting started
+Unomi Router Extension a Karaf Feature that provide an Enterprise Application Integration tool.
+It is optional so you must configure it and install it in Karaf, and can be used for Machine - Machine or Human - Machine integration with Unomi.
+Mainly Unomi Router Extension aim to make it easy to import third party applications/platforms profiles into Unomi.
+This extension is implemented using Apache Camel routes and is using Apache Kafka to buffer import process and make it failsafe.
+
+## Getting started
+1. Configure your Unomi Router:
+ In the `etc/org.apache.unomi.sfdc.cfg` file, you might want to update the following settings:
+ Kafka settings
+ >`#Kafka settings`
+
+ >`kafka.host=localhost`
+
+ >`kafka.port=9092`
+
+ >`kafka.import.topic=camel-deposit`
+
+ >`kafka.import.groupId=unomi-import-group`
+
+ Kafka host and port with the topic name and the groupId ti which the topic is assigned
+
+ >`#Import One Shot upload directory`
+
+ >`import.oneshot.uploadDir=/tmp/unomi_oneshot_import_configs/`
+
+ Path to the folder where unomi should stock file imported for a oneshot processing
+
+
+2. Deploy into Apache Unomi using the following commands from the Apache Karaf shell:
+ ```sh
+ $ feature:repo-add mvn:org.apache.unomi/unomi-router-karaf-feature/${version}/xml/features
+ $ feature:install unomi-router-karaf-feature
+ ```
+
+3. Send your import configuration:
+
+ An import configuration is nothing else than a simple JSON to describe how you want to import your data (Profiles).
+ To create/update an import configuration
+
+ `POST /cxs/importConfiguration`
+ ```json
+ {
+ "itemId": "f57f1f86-97bf-4ba0-b4e4-7d5e77e7c0bd",
+ "itemType": "importConfig",
+ "scope": "integration",
+ "name": "Test Recurrent",
+ "description": "Just test recurrent import",
+ "configType": "recurrent",
+ "properties": {
+ "source": "{file/ftp}://{path}?fileName={file-name}.csv&move=.done&consumer.delay=20000",
+ "mapping": {
+ "firstName": 0,
+ "lastName": 1,
+ ...
+ }
+ },
+ "mergingProperty": "email",
+ "overwriteExistingProfiles": true,
+ "propertiesToOverwrite": ["firstName", "lastName"],
+ "active": true
+ }
+ ```
+
+ Omit the `itemId` when creating new entry, `configType` can be '**recurrent**' for file/ftp/network path polling or '**oneshot**' for one time import.
+
+ 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.
+
+ 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 `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 :
+
+ `POST /cxs/importConfiguration/oneshot`
+
+ `Content-Type : multipart/form-data`
+
+ First multipart with the name '**importConfigId**' is the importConfiguration to use to import the file, second one with the name '**file**' is the file to import.
+
+
+
+
+
+
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
index ac71798..40575d5 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
@@ -38,7 +38,7 @@ public class ProfileImportConfigUpdateRouteBuilder extends RouteBuilder {
logger.info("Preparing REST Configuration for servlet with context path [/importConfigAdmin]");
restConfiguration().component("servlet")
.contextPath("/importConfigAdmin")
- .enableCORS(true)
+ .enableCORS(false)
.bindingMode(RestBindingMode.json)
.dataFormatProperty("prettyPrint", "true");
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
index ff29755..4c36b9e 100644
--- a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -79,9 +79,9 @@
<property name="bundleContext" ref="blueprintBundleContext"/>
</bean>
- <camelContext id="httpEndpoint" xmlns="http://camel.apache.org/schema/blueprint">
- <routeBuilder ref="profileImportConfigUpdateRouteBuilder" />
- </camelContext>
+ <camel:camelContext id="httpEndpoint" xmlns="http://camel.apache.org/schema/blueprint">
+ <camel:routeBuilder ref="profileImportConfigUpdateRouteBuilder" />
+ </camel:camelContext>
<bean id="profileImportConfigUpdateRouteBuilder" class="org.apache.unomi.router.core.route.ProfileImportConfigUpdateRouteBuilder">
<property name="profileImportCamelContext" ref="camelContext"/>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
index b11d983..ff2c8ef 100644
--- a/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
+++ b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
@@ -14,7 +14,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-kafka.host=localhost
+
+#Kafka
+ settingskafka.host=localhost
kafka.port=9092
kafka.import.topic=camel-deposit
kafka.import.groupId=unomi-import-group
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
index e81930a..42670b2 100644
--- a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
+++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -52,9 +52,11 @@ import java.util.List;
public class ImportConfigurationServiceEndPoint {
private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceEndPoint.class.getName());
+ private final String CONFIG_TYPE_RECURRENT = "recurrent";
private ImportConfigurationService importConfigurationService;
private String uploadDir;
+ private String serverPort;
public ImportConfigurationServiceEndPoint () {
logger.info("Initializing import configuration service endpoint...");
@@ -70,6 +72,11 @@ public class ImportConfigurationServiceEndPoint {
this.uploadDir = uploadDir;
}
+ @WebMethod(exclude = true)
+ public void setServerPort(String serverPort) {
+ this.serverPort = serverPort;
+ }
+
/**
* Retrieves all the import configurations.
*
@@ -122,21 +129,23 @@ public class ImportConfigurationServiceEndPoint {
@Consumes(MediaType.APPLICATION_JSON)
public ImportConfiguration saveImportConfiguration(ImportConfiguration importConfiguration) {
ImportConfiguration importConfigSaved = importConfigurationService.save(importConfiguration);
- CloseableHttpClient httpClient = HttpClients.createDefault();
- try {
- HttpPut httpPut = new HttpPut("http://localhost:8181/importConfigAdmin/");
- StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
- input.setContentType(MediaType.APPLICATION_JSON);
- httpPut.setEntity(input);
-
- HttpResponse response = httpClient.execute(httpPut);
-
- if (response.getStatusLine().getStatusCode() != 200) {
- throw new RuntimeException("Failed : HTTP error code : "
- + response.getStatusLine().getStatusCode());
+ if(CONFIG_TYPE_RECURRENT.equals(importConfigSaved.getConfigType())) {
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ try {
+ HttpPut httpPut = new HttpPut("http://localhost:"+serverPort+"/importConfigAdmin/");
+ StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
+ input.setContentType(MediaType.APPLICATION_JSON);
+ httpPut.setEntity(input);
+
+ HttpResponse response = httpClient.execute(httpPut);
+
+ if (response.getStatusLine().getStatusCode() != 200) {
+ throw new RuntimeException("Failed : HTTP error code : "
+ + response.getStatusLine().getStatusCode());
+ }
+ } catch (IOException e) {
+ logger.warn("Unable to update Camel route [{}]", importConfiguration.getItemId());
}
- } catch (IOException e) {
- logger.warn("Unable to update Camel route [{}]", importConfiguration.getItemId());
}
return importConfigSaved;
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/77fc9e44/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git 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
index a5cf1be..7e3b5d1 100644
--- 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
@@ -21,15 +21,22 @@
xmlns:cxf="http://cxf.apache.org/blueprint/core" 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://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0 http://aries.apache.org/schemas/blueprint-cm/blueprint-cm-1.1.0.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">
<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="contextserver.port" value="8181"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
+
<cxf:bus id="cxsServiceBus">
<cxf:features>
<cxf:logging/>
@@ -67,6 +74,7 @@
<bean id="importConfigurationServiceEndPoint" class="org.apache.unomi.router.rest.ImportConfigurationServiceEndPoint">
<property name="importConfigurationService" ref="importConfigurationService"/>
<property name="uploadDir" value="${import.oneshot.uploadDir}"/>
+ <property name="serverPort" value="${contextserver.port}"/>
</bean>
</blueprint>
[09/14] incubator-unomi git commit: DMF-1343 Import profiles from CSV
through API
Posted by am...@apache.org.
DMF-1343 Import profiles from CSV through API
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/b68909b1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b68909b1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b68909b1
Branch: refs/heads/feature-DMF-1343
Commit: b68909b1ef190485430e3f794f6793343d68b34c
Parents: b3c8953
Author: Abdelkader Midani <am...@apache.org>
Authored: Tue May 23 02:30:28 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
pom.xml | 1 +
router/pom.xml | 64 +++++++
router/router-api/pom.xml | 43 +++++
.../unomi/router/api/ImportConfiguration.java | 138 ++++++++++++++
.../unomi/router/api/ProfileToImport.java | 77 ++++++++
.../services/ImportConfigurationService.java | 60 ++++++
.../api/services/ProfileImportService.java | 29 +++
router/router-core/pom.xml | 182 +++++++++++++++++++
.../core/context/ProfileImportCamelContext.java | 165 +++++++++++++++++
.../core/processor/ConfigUpdateProcessor.java | 44 +++++
.../ImportConfigByFileNameProcessor.java | 44 +++++
.../core/processor/LineSplitProcessor.java | 104 +++++++++++
.../core/processor/UnomiStorageProcessor.java | 46 +++++
.../ProfileImportConfigUpdateRouteBuilder.java | 67 +++++++
.../ProfileImportKafkaToUnomiRouteBuilder.java | 77 ++++++++
.../route/ProfileImportOneShotRouteBuilder.java | 99 ++++++++++
.../ProfileImportSourceToKafkaRouteBuilder.java | 119 ++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 94 ++++++++++
.../main/resources/org.apache.unomi.router.cfg | 23 +++
router/router-karaf-feature/pom.xml | 164 +++++++++++++++++
router/router-rest/pom.xml | 75 ++++++++
.../ImportConfigurationServiceEndPoint.java | 167 +++++++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 72 ++++++++
router/router-service/pom.xml | 104 +++++++++++
.../ImportConfigurationServiceImpl.java | 114 ++++++++++++
.../services/ProfileImportServiceImpl.java | 122 +++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 39 ++++
samples/trainingplugin.zip | Bin 0 -> 48508 bytes
samples/trainingplugin/pom.xml | 55 ++++++
.../training/TrainedNotificationAction.java | 61 +++++++
.../cxs/actions/trainingNotifAction.json | 13 ++
.../META-INF/cxs/rules/trainedNotification.json | 20 ++
.../resources/OSGI-INF/blueprint/blueprint.xml | 34 ++++
33 files changed, 2516 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3881b47..cdce2e6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -844,6 +844,7 @@
<module>extensions</module>
<module>kar</module>
<module>samples</module>
+ <module>router</module>
<module>package</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/pom.xml
----------------------------------------------------------------------
diff --git a/router/pom.xml b/router/pom.xml
new file mode 100644
index 0000000..73e9953
--- /dev/null
+++ b/router/pom.xml
@@ -0,0 +1,64 @@
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <artifactId>unomi-root</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>unomi-router</artifactId>
+ <name>Apache Unomi :: Extensions :: Router</name>
+ <description>Apache Camel Router for the Apache Unomi Context server</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <camel.version>2.18.3</camel.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>router-api</module>
+ <module>router-service</module>
+ <module>router-core</module>
+ <module>router-rest</module>
+ <module>router-karaf-feature</module>
+ </modules>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-api/pom.xml b/router/router-api/pom.xml
new file mode 100644
index 0000000..9085a30
--- /dev/null
+++ b/router/router-api/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-api</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: API</name>
+ <description>Router Specification API</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
new file mode 100644
index 0000000..38d139f
--- /dev/null
+++ b/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
@@ -0,0 +1,138 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api;
+
+import org.apache.unomi.api.Item;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amidani on 28/04/2017.
+ */
+public class ImportConfiguration extends Item {
+
+ /**
+ * The ImportConfiguration ITEM_TYPE
+ *
+ * @see Item for a discussion of ITEM_TYPE
+ */
+ public static final String ITEM_TYPE = "importConfig";
+ private Map<String, Object> properties = new HashMap<>();
+ private String mergingProperty;
+ private boolean overwriteExistingProfiles = false;
+ private List<String> propertiesToOverwrite;
+ private boolean active = false;
+
+ /**
+ * Sets the property identified by the specified name to the specified value. If a property with that name already exists, replaces its value, otherwise adds the new
+ * property with the specified name and value.
+ *
+ * @param name the name of the property to set
+ * @param value the value of the property
+ */
+ public void setProperty(String name, Object value) {
+ properties.put(name, value);
+ }
+
+ /**
+ * Retrieves the property identified by the specified name.
+ *
+ * @param name the name of the property to retrieve
+ * @return the value of the specified property or {@code null} if no such property exists
+ */
+ public Object getProperty(String name) {
+ return properties.get(name);
+ }
+
+ /**
+ * Retrieves a Map of all property name - value pairs for this import configuration.
+ *
+ * @return a Map of all property name - value pairs for this import configuration
+ */
+ public Map<String, Object> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Sets the property name - value pairs for this import configuration.
+ *
+ * @param properties a Map containing the property name - value pairs for this import configuration
+ */
+ public void setProperties(Map<String, Object> properties) {
+ this.properties = properties;
+ }
+
+ public String getMergingProperty() {
+ return mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+
+ /**
+ * Retrieves the import configuration active flag.
+ *
+ * @return true if the import configuration is active false if not
+ */
+ public boolean isActive() {
+ return this.active;
+ }
+
+ /**
+ * Sets the active flag true/false.
+ *
+ * @param active a boolean to set to active or inactive the import configuration
+ */
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+ /**
+ * Retrieves the import configuration overwriteExistingProfiles flag.
+ *
+ * @return true if during the import existing profiles must be overwritten
+ */
+ public boolean isOverwriteExistingProfiles() {
+ return this.overwriteExistingProfiles;
+ }
+
+ /**
+ * Sets the overwriteExistingProfiles flag true/false.
+ *
+ * @param overwriteExistingProfiles a boolean to set overwriteExistingProfiles in the import configuration
+ */
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public List<String> getPropertiesToOverwrite() {
+ return propertiesToOverwrite;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java b/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
new file mode 100644
index 0000000..30e40e0
--- /dev/null
+++ b/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
@@ -0,0 +1,77 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.router.api;
+
+import org.apache.unomi.api.Profile;
+
+import java.util.List;
+
+/**
+ * An extension of {@link Profile} to handle merge strategy and deletion when importing profiles
+ */
+public class ProfileToImport extends Profile {
+
+ private List<String> propertiesToOverwrite;
+ private String mergingProperty;
+ private boolean profileToDelete;
+ private boolean overwriteExistingProfiles;
+
+
+ public List<String> getPropertiesToOverwrite() {
+ return this.propertiesToOverwrite;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+ public boolean isProfileToDelete() {
+ return this.profileToDelete;
+ }
+
+ public void setProfileToDelete(boolean profileToDelete) {
+ this.profileToDelete = profileToDelete;
+ }
+
+ public boolean isOverwriteExistingProfiles() {
+ return this.overwriteExistingProfiles;
+ }
+
+ /**
+ * Sets the overwriteExistingProfiles flag.
+ * @param overwriteExistingProfiles flag used to specify if we want to overwrite existing profiles
+ */
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public String getMergingProperty() {
+ return this.mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
new file mode 100644
index 0000000..cacd671
--- /dev/null
+++ b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
@@ -0,0 +1,60 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api.services;
+
+import org.apache.unomi.router.api.ImportConfiguration;
+
+import java.util.List;
+
+/**
+ * A service to access and operate on {@link ImportConfiguration}s.
+ */
+public interface ImportConfigurationService {
+
+ /**
+ * Retrieves all the import configurations.
+ *
+ * @return the list of import configurations
+ */
+ public List<ImportConfiguration> getImportConfigurations();
+
+ /**
+ * Retrieves the import configuration identified by the specified identifier.
+ *
+ * @param configId the identifier of the profile to retrieve
+ * @return the import configuration identified by the specified identifier or
+ * {@code null} if no such import configuration exists
+ */
+ public ImportConfiguration load(String configId);
+
+ /**
+ * Saves the specified import configuration in the context server.
+ *
+ * @param profile the import configuration to be saved
+ * @return the newly saved import configuration
+ */
+ public ImportConfiguration save(ImportConfiguration profile);
+
+ /**
+ * Deletes the import configuration identified by the specified identifier.
+ *
+ * @param configId the identifier of the import configuration to delete
+ */
+ public void delete(String configId);
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
new file mode 100644
index 0000000..aa7d182
--- /dev/null
+++ b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
@@ -0,0 +1,29 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api.services;
+
+import org.apache.unomi.router.api.ProfileToImport;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Created by amidani on 20/05/2017.
+ */
+public interface ProfileImportService {
+
+ boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-core/pom.xml b/router/router-core/pom.xml
new file mode 100644
index 0000000..d1574e9
--- /dev/null
+++ b/router/router-core/pom.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-core</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Core</name>
+ <description>Router Core (Apache Camel Routes)</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-services</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jackson</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http-common</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kafka</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
+ <version>0.1.54_1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>0.10.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ org.osgi.service.event;resolution:=optional,
+ org.apache.camel,
+ org.apache.camel.builder,
+ org.apache.camel.component.file.remote,
+ org.apache.camel.component.file,
+ org.apache.camel.component.jackson,
+ org.apache.camel.component.kafka,
+ org.apache.camel.component.servlet,
+ org.apache.camel.component.servlet.osgi,
+ org.apache.camel.impl,
+ org.apache.camel.model,
+ org.apache.camel.model.dataformat,
+ org.apache.camel.model.rest,
+ org.apache.camel.spi,
+ org.apache.unomi.api,
+ org.apache.unomi.router.api,
+ org.apache.unomi.api.services,
+ org.apache.unomi.router.api.services,
+ org.apache.kafka.clients.producer;resolution:=optional,
+ org.apache.kafka.clients.consumer;resolution:=optional,
+ com.jcraft.jsch,
+ org.osgi.framework,
+ org.osgi.service.http,
+ org.slf4j
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>
+ src/main/resources/org.apache.unomi.router.cfg
+ </file>
+ <type>cfg</type>
+ <classifier>routercfg</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java b/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
new file mode 100644
index 0000000..13d6630
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
@@ -0,0 +1,165 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.context;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
+import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
+import org.apache.unomi.router.core.route.ProfileImportKafkaToUnomiRouteBuilder;
+import org.apache.unomi.router.core.route.ProfileImportOneShotRouteBuilder;
+import org.apache.unomi.router.core.route.ProfileImportSourceToKafkaRouteBuilder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by amidani on 04/05/2017.
+ */
+public class ProfileImportCamelContext implements SynchronousBundleListener {
+
+ private Logger logger = LoggerFactory.getLogger(ProfileImportCamelContext.class.getName());
+
+ private CamelContext camelContext;
+ private UnomiStorageProcessor unomiStorageProcessor;
+ private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
+ private ImportConfigurationService importConfigurationService;
+ private JacksonDataFormat jacksonDataFormat;
+ private String uploadDir;
+ private Map<String, String> kafkaProps;
+
+ private BundleContext bundleContext;
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void initCamelContext() throws Exception {
+ logger.info("------INIT Camel Context...");
+ camelContext = new DefaultCamelContext();
+ List<ImportConfiguration> importConfigurationList = importConfigurationService.getImportConfigurations();
+ ProfileImportSourceToKafkaRouteBuilder builderReader = new ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
+ builderReader.setImportConfigurationList(importConfigurationList);
+ builderReader.setJacksonDataFormat(jacksonDataFormat);
+ builderReader.setContext(camelContext);
+ camelContext.addRoutes(builderReader);
+
+ //One shot import route
+ ProfileImportOneShotRouteBuilder builderOneShot = new ProfileImportOneShotRouteBuilder(kafkaProps);
+ builderOneShot.setImportConfigByFileNameProcessor(importConfigByFileNameProcessor);
+ builderOneShot.setJacksonDataFormat(jacksonDataFormat);
+ builderOneShot.setUploadDir(uploadDir);
+ builderOneShot.setContext(camelContext);
+ camelContext.addRoutes(builderOneShot);
+
+
+ ProfileImportKafkaToUnomiRouteBuilder builderProcessor = new ProfileImportKafkaToUnomiRouteBuilder(kafkaProps);
+ builderProcessor.setUnomiStorageProcessor(unomiStorageProcessor);
+ builderProcessor.setJacksonDataFormat(jacksonDataFormat);
+ builderProcessor.setContext(camelContext);
+ camelContext.addRoutes(builderProcessor);
+
+ camelContext.start();
+
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Import configuration service initialized.");
+
+ }
+
+ private boolean stopRoute(String routeId) throws Exception {
+ return camelContext.stopRoute(routeId, 10L, TimeUnit.SECONDS, true);
+ }
+
+ public void updateProfileImportReaderRoute(ImportConfiguration importConfiguration) throws Exception {
+ Route route = camelContext.getRoute(importConfiguration.getItemId());
+ 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);
+ }
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
+ this.unomiStorageProcessor = unomiStorageProcessor;
+ }
+
+ public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
+ this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
+ }
+
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ public void setKafkaProps(Map<String, String> kafkaProps) {
+ this.kafkaProps = kafkaProps;
+ }
+
+ public void preDestroy() throws Exception {
+ bundleContext.removeBundleListener(this);
+ //This is to shutdown Camel context
+ //(will stop all routes/components/endpoints etc and clear internal state/cache)
+ this.camelContext.stop();
+ logger.info("Camel context for profile import is shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
new file mode 100644
index 0000000..e4eaa19
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
@@ -0,0 +1,44 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.context.ProfileImportCamelContext;
+
+/**
+ * Created by amidani on 10/05/2017.
+ */
+public class ConfigUpdateProcessor implements Processor{
+
+ private ProfileImportCamelContext profileImportCamelContext;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ if (exchange.getIn() != null) {
+ Message message = exchange.getIn();
+ ImportConfiguration importConfiguration = message.getBody(ImportConfiguration.class);
+ profileImportCamelContext.updateProfileImportReaderRoute(importConfiguration);
+ }
+ }
+
+ public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
+ this.profileImportCamelContext = profileImportCamelContext;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
new file mode 100644
index 0000000..7fc7730
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
@@ -0,0 +1,44 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.file.GenericFile;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+
+/**
+ * Created by amidani on 22/05/2017.
+ */
+public class ImportConfigByFileNameProcessor implements Processor{
+
+ private ImportConfigurationService importConfigurationService;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+
+ String fileName = exchange.getIn().getBody(GenericFile.class).getFileName();
+ String importConfigId = fileName.substring(0, fileName.indexOf('.'));
+ ImportConfiguration importConfiguration = importConfigurationService.load(importConfigId);
+ exchange.getIn().setHeader("importConfigOneShot", importConfiguration);
+ }
+
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
new file mode 100644
index 0000000..30f79bf
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
@@ -0,0 +1,104 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kafka.KafkaConstants;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.ProfileToImport;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Created by amidani on 29/12/2016.
+ */
+public class LineSplitProcessor implements Processor {
+
+ private Map<String, Integer> fieldsMapping;
+ private List<String> propertiesToOverwrite;
+ private String mergingProperty;
+ private boolean overwriteExistingProfiles;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ //In case of one shot import we check the header and overwrite import config
+ ImportConfiguration importConfigOneShot = (ImportConfiguration) exchange.getIn().getHeader("importConfigOneShot");
+ if(importConfigOneShot!=null) {
+ fieldsMapping = (Map<String, Integer>)importConfigOneShot.getProperties().get("mapping");
+ propertiesToOverwrite = importConfigOneShot.getPropertiesToOverwrite();
+ mergingProperty = importConfigOneShot.getMergingProperty();
+ overwriteExistingProfiles = importConfigOneShot.isOverwriteExistingProfiles();
+ }
+ String[] profileData = ((String)exchange.getIn().getBody()).split(",");
+ ProfileToImport profileToImport = new ProfileToImport();
+ profileToImport.setItemId(UUID.randomUUID().toString());
+ profileToImport.setItemType("profile");
+ profileToImport.setScope("system");
+ if(profileData.length > 0) {
+ Map<String, Object> properties = new HashMap<>();
+ for(String fieldMappingKey : fieldsMapping.keySet()) {
+ if(profileData.length > fieldsMapping.get(fieldMappingKey)) {
+ properties.put(fieldMappingKey, profileData[fieldsMapping.get(fieldMappingKey)].trim());
+ }
+ }
+ profileToImport.setProperties(properties);
+ profileToImport.setMergingProperty(mergingProperty);
+ profileToImport.setPropertiesToOverwrite(propertiesToOverwrite);
+ profileToImport.setOverwriteExistingProfiles(overwriteExistingProfiles);
+ if(StringUtils.isNotBlank(profileData[profileData.length - 1]) && Boolean.parseBoolean(profileData[profileData.length - 1].trim())) {
+ profileToImport.setProfileToDelete(true);
+ }
+ }
+ exchange.getIn().setBody(profileToImport, ProfileToImport.class);
+ exchange.getIn().setHeader(KafkaConstants.PARTITION_KEY, 0);
+ exchange.getIn().setHeader(KafkaConstants.KEY, "1");
+ }
+
+ /**
+ * Setter of fieldsMapping
+ * @param fieldsMapping map String,Integer fieldName in ES and the matching column index in the import file
+ */
+ public void setFieldsMapping(Map<String, Integer> fieldsMapping) {
+ this.fieldsMapping = fieldsMapping;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public String getMergingProperty() {
+ return this.mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
new file mode 100644
index 0000000..7e55185
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.unomi.router.api.ProfileToImport;
+import org.apache.unomi.router.api.services.ProfileImportService;
+
+/**
+ * Created by amidani on 29/12/2016.
+ */
+public class UnomiStorageProcessor implements Processor {
+
+ private ProfileImportService profileImportService;
+
+ @Override
+ public void process(Exchange exchange)
+ throws Exception {
+ if (exchange.getIn() != null) {
+ Message message = exchange.getIn();
+
+ ProfileToImport profileToImport = (ProfileToImport) message.getBody();
+ profileImportService.saveMergeDeleteImportedProfile(profileToImport);
+ }
+ }
+
+ public void setProfileImportService(ProfileImportService profileImportService) {
+ this.profileImportService = profileImportService;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
new file mode 100644
index 0000000..0dff8ec
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
@@ -0,0 +1,67 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.context.ProfileImportCamelContext;
+import org.apache.unomi.router.core.processor.ConfigUpdateProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by amidani on 10/05/2017.
+ */
+public class ProfileImportConfigUpdateRouteBuilder extends RouteBuilder {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportConfigUpdateRouteBuilder.class.getName());
+
+ private ProfileImportCamelContext profileImportCamelContext;
+
+ @Override
+ public void configure() throws Exception {
+ logger.info("Preparing REST Configuration for servlet with context path [/importConfigAdmin]");
+ restConfiguration().component("servlet")
+ .contextPath("/importConfigAdmin")
+ .enableCORS(true)
+ .bindingMode(RestBindingMode.json)
+ .dataFormatProperty("prettyPrint", "true");
+ rest("/say")
+ .get("/hello/{me}")
+ .to("direct:hello");
+ from("direct:hello")
+ .transform().constant("Hello World");
+
+ rest().put("/").consumes("application/json").type(ImportConfiguration.class)
+ .to("direct:importConfigRestDeposit");
+ ConfigUpdateProcessor profileImportConfigUpdateProcessor = new ConfigUpdateProcessor();
+ profileImportConfigUpdateProcessor.setProfileImportCamelContext(profileImportCamelContext);
+ from("direct:importConfigRestDeposit")
+ .process(profileImportConfigUpdateProcessor)
+ .transform().constant("Success.")
+ .onException(Exception.class)
+ .transform().constant("Failure!");
+
+
+ }
+
+ public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
+ this.profileImportCamelContext = profileImportCamelContext;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
new file mode 100644
index 0000000..1b056fe
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
@@ -0,0 +1,77 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
+
+import java.util.Map;
+
+/**
+ * Created by amidani on 26/04/2017.
+ */
+public class ProfileImportKafkaToUnomiRouteBuilder extends RouteBuilder {
+
+ private UnomiStorageProcessor unomiStorageProcessor;
+ private JacksonDataFormat jacksonDataFormat;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ public ProfileImportKafkaToUnomiRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+kafkaImportGroupId);
+ }
+ kafkaUri.append("&autoCommitEnable=true&consumersCount=10");
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+ from(endpoint)
+ .unmarshal(jacksonDataFormat)
+ .process(unomiStorageProcessor)
+ .to("log:org.apache.unomi.router?level=INFO");
+
+ }
+
+ public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
+ this.unomiStorageProcessor = unomiStorageProcessor;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
new file mode 100644
index 0000000..288d9d1
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
@@ -0,0 +1,99 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
+import org.apache.unomi.router.core.processor.LineSplitProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+/**
+ * Created by amidani on 22/05/2017.
+ */
+public class ProfileImportOneShotRouteBuilder extends RouteBuilder {
+
+ private Logger logger = LoggerFactory.getLogger(ProfileImportOneShotRouteBuilder.class.getName());
+
+ private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
+ private JacksonDataFormat jacksonDataFormat;
+ private String uploadDir;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ private final String IMPORT_ONESHOT_ROUTE_ID = "ONE_SHOT_ROUTE";
+
+ public ProfileImportOneShotRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+
+ //Prepare Kafka Deposit
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+ kafkaImportGroupId);
+ }
+
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+
+ LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
+
+
+ from("file://"+uploadDir+"?include=.*.csv&consumer.delay=1m")
+ .routeId(IMPORT_ONESHOT_ROUTE_ID)
+ .autoStartup(true)
+ .process(importConfigByFileNameProcessor)
+ .split(bodyAs(String.class).tokenize("\n"))
+ .process(lineSplitProcessor)
+ .to("log:org.apache.unomi.router?level=INFO")
+ .marshal(jacksonDataFormat)
+ .convertBodyTo(String.class)
+ .to(endpoint);
+ }
+
+ public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
+ this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
+ }
+
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
new file mode 100644
index 0000000..382b69d
--- /dev/null
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
@@ -0,0 +1,119 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.processor.LineSplitProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amidani on 26/04/2017.
+ */
+
+public class ProfileImportSourceToKafkaRouteBuilder extends RouteBuilder {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportSourceToKafkaRouteBuilder.class.getName());
+
+ private List<ImportConfiguration> importConfigurationList;
+ private JacksonDataFormat jacksonDataFormat;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ public ProfileImportSourceToKafkaRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+ //Prepare Kafka Deposit
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+ kafkaImportGroupId);
+ }
+
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+
+ //Loop on multiple import configuration
+ for(ImportConfiguration importConfiguration : importConfigurationList) {
+ if(importConfiguration.getProperties().size() > 0 &&
+ StringUtils.isNotEmpty((String) importConfiguration.getProperties().get("source"))) {
+ //Prepare Split Processor
+ LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
+ lineSplitProcessor.setFieldsMapping((Map<String, Integer>) importConfiguration.getProperties().get("mapping"));
+ lineSplitProcessor.setOverwriteExistingProfiles(importConfiguration.isOverwriteExistingProfiles());
+ lineSplitProcessor.setPropertiesToOverwrite(importConfiguration.getPropertiesToOverwrite());
+ lineSplitProcessor.setMergingProperty(importConfiguration.getMergingProperty());
+
+ from((String) importConfiguration.getProperties().get("source"))
+ .routeId(importConfiguration.getItemId())// This allow identification of the route for manual start/stop
+ .autoStartup(importConfiguration.isActive())// Auto-start if the import configuration is set active
+ .split(bodyAs(String.class).tokenize("\n"))
+ .process(lineSplitProcessor)
+ .to("log:org.apache.unomi.router?level=INFO")
+ .marshal(jacksonDataFormat)
+ .convertBodyTo(String.class)
+ .to(endpoint);
+ }
+ }
+ }
+
+ public void setImportConfigurationList(List<ImportConfiguration> importConfigurationList) {
+ this.importConfigurationList = importConfigurationList;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+
+ public void setKafkaHost(String kafkaHost) {
+ this.kafkaHost = kafkaHost;
+ }
+
+ public void setKafkaPort(String kafkaPort) {
+ this.kafkaPort = kafkaPort;
+ }
+
+ public void setKafkaImportTopic(String kafkaImportTopic) {
+ this.kafkaImportTopic = kafkaImportTopic;
+ }
+
+ public void setKafkaImportGroupId(String kafkaImportGroupId) {
+ this.kafkaImportGroupId = kafkaImportGroupId;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..ff29755
--- /dev/null
+++ b/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns:camel="http://camel.apache.org/schema/blueprint"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.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
+ http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
+
+ <cm:property-placeholder persistent-id="org.apache.unomi.router" update-strategy="reload">
+ <cm:default-properties>
+ <cm:property name="kafka.host" value="localhost"/>
+ <cm:property name="kafka.port" value="9092"/>
+ <cm:property name="kafka.import.topic" value="camel-deposit"/>
+ <cm:property name="kafka.import.groupId" value="unomi-import-group"/>
+ <cm:property name="import.oneshot.uploadDir" value="/tmp/oneshot_import_configs/"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
+
+ <bean id="unomiStorageProcessor" class="org.apache.unomi.router.core.processor.UnomiStorageProcessor">
+ <property name="profileImportService" ref="profileImportService"/>
+ </bean>
+
+ <bean id="importConfigByFileNameProcessor" class="org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor">
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ </bean>
+
+ <bean id="jacksonDataFormat" class="org.apache.camel.component.jackson.JacksonDataFormat">
+ <property name="unmarshalType" value="org.apache.unomi.router.api.ProfileToImport"/>
+ </bean>
+
+ <bean id="jacksonDataFormatImportConfig" class="org.apache.camel.model.dataformat.JsonDataFormat">
+ <property name="unmarshalType" value="org.apache.unomi.router.api.ImportConfiguration"/>
+ <property name="library" value="Jackson"/>
+ </bean>
+
+ <bean class="org.apache.camel.component.servlet.osgi.OsgiServletRegisterer"
+ init-method="register"
+ destroy-method="unregister">
+ <property name="alias" value="/importConfigAdmin"/>
+ <property name="httpService" ref="httpService"/>
+ <property name="servlet" ref="camelServlet"/>
+ </bean>
+
+ <bean id="camelServlet" class="org.apache.camel.component.servlet.CamelHttpTransportServlet"/>
+
+
+ <bean id="camelContext" class="org.apache.unomi.router.core.context.ProfileImportCamelContext"
+ init-method="initCamelContext" destroy-method="preDestroy">
+ <property name="kafkaProps">
+ <map>
+ <entry key="kafkaHost" value="${kafka.host}"/>
+ <entry key="kafkaPort" value="${kafka.port}"/>
+ <entry key="kafkaImportTopic" value="${kafka.import.topic}"/>
+ <entry key="kafkaImportGroupId" value="${kafka.import.groupId}"/>
+ </map>
+ </property>
+ <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
+ <property name="unomiStorageProcessor" ref="unomiStorageProcessor"/>
+ <property name="importConfigByFileNameProcessor" ref="importConfigByFileNameProcessor"/>
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ <property name="jacksonDataFormat" ref="jacksonDataFormat"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+ <camelContext id="httpEndpoint" xmlns="http://camel.apache.org/schema/blueprint">
+ <routeBuilder ref="profileImportConfigUpdateRouteBuilder" />
+ </camelContext>
+
+ <bean id="profileImportConfigUpdateRouteBuilder" class="org.apache.unomi.router.core.route.ProfileImportConfigUpdateRouteBuilder">
+ <property name="profileImportCamelContext" ref="camelContext"/>
+ </bean>
+
+ <reference id="httpService" interface="org.osgi.service.http.HttpService"/>
+ <reference id="profileImportService" interface="org.apache.unomi.router.api.services.ProfileImportService"/>
+ <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
+
+</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-core/src/main/resources/org.apache.unomi.router.cfg
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/resources/org.apache.unomi.router.cfg b/router/router-core/src/main/resources/org.apache.unomi.router.cfg
new file mode 100644
index 0000000..b11d983
--- /dev/null
+++ b/router/router-core/src/main/resources/org.apache.unomi.router.cfg
@@ -0,0 +1,23 @@
+#
+# 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 express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+kafka.host=localhost
+kafka.port=9092
+kafka.import.topic=camel-deposit
+kafka.import.groupId=unomi-import-group
+
+#Import One Shot upload directory
+import.oneshot.uploadDir=/tmp/unomi_oneshot_import_configs/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-karaf-feature/pom.xml b/router/router-karaf-feature/pom.xml
new file mode 100644
index 0000000..3a1d2fd
--- /dev/null
+++ b/router/router-karaf-feature/pom.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-karaf-feature</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Apache Karaf Feature</name>
+ <description>Apache Karaf feature for the Apache Unomi Context Server extension</description>
+ <packaging>feature</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
+ <version>0.1.54_1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>0.10.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-blueprint</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jackson</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http-common</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ftp</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stream</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kafka</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+
+ <!-- UNOMI ROUTER Modules Dependencies -->
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-core</artifactId>
+ <version>${project.version}</version>
+ <type>cfg</type>
+ <classifier>routercfg</classifier>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeTransitiveDependency>false</includeTransitiveDependency>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <startLevel>90</startLevel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-rest/pom.xml b/router/router-rest/pom.xml
new file mode 100644
index 0000000..fc1065f
--- /dev/null
+++ b/router/router-rest/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-rest</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: REST API</name>
+ <description>Router REST API</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <type>bundle</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
[04/14] incubator-unomi git commit: DMF-1343 : Move unomi-router
under extensions
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
new file mode 100644
index 0000000..e81930a
--- /dev/null
+++ b/extensions/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -0,0 +1,167 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+/**
+ * A JAX-RS endpoint to manage {@link org.apache.unomi.router.api.ImportConfiguration}s.
+ */
+@WebService
+@CrossOriginResourceSharing(
+ allowAllOrigins = true,
+ allowCredentials = true
+)
+public class ImportConfigurationServiceEndPoint {
+
+ private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceEndPoint.class.getName());
+
+ private ImportConfigurationService importConfigurationService;
+ private String uploadDir;
+
+ public ImportConfigurationServiceEndPoint () {
+ logger.info("Initializing import configuration service endpoint...");
+ }
+
+ @WebMethod(exclude = true)
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+
+ @WebMethod(exclude = true)
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ /**
+ * Retrieves all the import configurations.
+ *
+ * @return all the import configurations.
+ */
+ @GET
+ @Path("/")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public List<ImportConfiguration> getImportConfigurations() {
+ return importConfigurationService.getImportConfigurations();
+ }
+
+ /**
+ * Retrieves an import configuration by id.
+ *
+ * @return the import configuration that matches the given id.
+ */
+ @GET
+ @Path("/{configId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ImportConfiguration getImportConfiguration(@PathParam("configId") String configId) {
+ return importConfigurationService.load(configId);
+ }
+
+ /**
+ * Delete an import configuration by id.
+ *
+ * @return the deleted import configuration.
+ */
+ @DELETE
+ @Path("/{configId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void deleteImportConfiguration(@PathParam("configId") String configId) {
+ importConfigurationService.delete(configId);
+ }
+
+
+
+ /**
+ * Save the given import configuration.
+ *
+ * @return the import configuration saved.
+ */
+ @POST
+ @Path("/")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ImportConfiguration saveImportConfiguration(ImportConfiguration importConfiguration) {
+ ImportConfiguration importConfigSaved = importConfigurationService.save(importConfiguration);
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ try {
+ HttpPut httpPut = new HttpPut("http://localhost:8181/importConfigAdmin/");
+ StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
+ input.setContentType(MediaType.APPLICATION_JSON);
+ httpPut.setEntity(input);
+
+ HttpResponse response = httpClient.execute(httpPut);
+
+ if (response.getStatusLine().getStatusCode() != 200) {
+ throw new RuntimeException("Failed : HTTP error code : "
+ + response.getStatusLine().getStatusCode());
+ }
+ } catch (IOException e) {
+ logger.warn("Unable to update Camel route [{}]", importConfiguration.getItemId());
+ }
+ return importConfigSaved;
+ }
+
+ /**
+ * Save/Update the given import configuration.
+ * Prepare the file to be processed with Camel routes
+ * @return OK / NOK Http Code.
+ */
+ @POST
+ @Path("/oneshot")
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response processOneshotImportConfigurationCSV(@Multipart(value = "importConfigId") String importConfigId, @Multipart(value = "file") Attachment file) {
+ try {
+ java.nio.file.Path path = Paths.get(uploadDir+importConfigId+".csv");
+ Files.deleteIfExists(path);
+ InputStream in = file.getObject(InputStream.class);
+
+ Files.copy(in, path);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ return Response.serverError().build();
+ }
+ return Response.ok().build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git 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
new file mode 100644
index 0000000..a5cf1be
--- /dev/null
+++ b/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns:cxf="http://cxf.apache.org/blueprint/core" 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://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>
+
+ <cxf:bus id="cxsServiceBus">
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/>
+ <bean id="jacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
+ <bean id="json-provider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
+ <argument index="0" ref="jacksonMapper" type="com.fasterxml.jackson.databind.ObjectMapper"/>
+ </bean>
+ <bean id="jaas-filter" class="org.apache.cxf.jaxrs.security.JAASAuthenticationFilter">
+ <!-- Name of the JAAS Context -->
+ <property name="contextName" value="karaf"/>
+ <!-- Hint to the filter on how to have Principals representing users and roles separated
+ while initializing a SecurityContext -->
+ <property name="rolePrefix" value="ROLE_"/>
+ <property name="realmName" value="cxs"/>
+ </bean>
+
+ <jaxrs:server address="/importConfiguration" id="restImportConfigurationService">
+ <jaxrs:providers>
+ <ref component-id="json-provider"/>
+ <ref component-id="cors-filter"/>
+ <ref component-id="jaas-filter"/>
+ </jaxrs:providers>
+
+ <jaxrs:serviceBeans>
+ <ref component-id="importConfigurationServiceEndPoint"/>
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
+
+ <bean id="importConfigurationServiceEndPoint" class="org.apache.unomi.router.rest.ImportConfigurationServiceEndPoint">
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
+ </bean>
+
+</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/pom.xml b/extensions/router/router-service/pom.xml
new file mode 100644
index 0000000..0aed70e
--- /dev/null
+++ b/extensions/router/router-service/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-service</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Services</name>
+ <description>Router Services</description>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
new file mode 100644
index 0000000..a4f6131
--- /dev/null
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
@@ -0,0 +1,114 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.router.services;
+
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Created by amidani on 28/04/2017.
+ */
+public class ImportConfigurationServiceImpl implements ImportConfigurationService,SynchronousBundleListener {
+
+ private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceImpl.class.getName());
+
+ private BundleContext bundleContext;
+ private PersistenceService persistenceService;
+
+ public ImportConfigurationServiceImpl() {
+ logger.info("Initializing import configuration service...");
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setPersistenceService(PersistenceService persistenceService) {
+ this.persistenceService = persistenceService;
+ }
+
+ public void postConstruct() {
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Import configuration service initialized.");
+ }
+
+ public void preDestroy() {
+ bundleContext.removeBundleListener(this);
+ logger.info("Import configuration service shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ private void processBundleStop(BundleContext bundleContext) {
+ }
+
+
+ @Override
+ public List<ImportConfiguration> getImportConfigurations() {
+ return persistenceService.getAllItems(ImportConfiguration.class);
+ }
+
+ @Override
+ public ImportConfiguration load(String configId) {
+ return persistenceService.load(configId, ImportConfiguration.class);
+ }
+
+ @Override
+ public ImportConfiguration save(ImportConfiguration importConfiguration) {
+ if (importConfiguration.getItemId() == null) {
+ importConfiguration.setItemId(UUID.randomUUID().toString());
+ }
+ if(persistenceService.save(importConfiguration)) {
+
+ }
+
+ return persistenceService.load(importConfiguration.getItemId(), ImportConfiguration.class);
+ }
+
+ @Override
+ public void delete(String configId) {
+ persistenceService.remove(configId, ImportConfiguration.class);
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/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
new file mode 100644
index 0000000..8097953
--- /dev/null
+++ b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
@@ -0,0 +1,122 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.services;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.services.EventListenerService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.apache.unomi.router.api.ProfileToImport;
+import org.apache.unomi.router.api.services.ProfileImportService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+/**
+ * Created by amidani on 18/05/2017.
+ */
+public class ProfileImportServiceImpl implements ProfileImportService, SynchronousBundleListener {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportServiceImpl.class.getName());
+
+ private PersistenceService persistenceService;
+
+ private BundleContext bundleContext;
+
+ public void setPersistenceService(PersistenceService persistenceService) {
+ this.persistenceService = persistenceService;
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void postConstruct() {
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Import configuration service initialized.");
+ }
+
+ public void preDestroy() {
+ bundleContext.removeBundleListener(this);
+ logger.info("Import configuration service shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ private void processBundleStop(BundleContext bundleContext) {
+ }
+
+
+ public boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException {
+ logger.info("Importing profile: {}, {}", profileToImport.getProperties().get("firstName"), profileToImport.getProperties().get("lastName"));
+ Profile existingProfile = new Profile();
+ List<Profile> existingProfiles = persistenceService.query("properties."+profileToImport.getMergingProperty(), (String)profileToImport.getProperties().get(profileToImport.getMergingProperty()), null, Profile.class);
+ logger.info("Query existing profile with mergingProperty: {}", profileToImport.getMergingProperty());
+ logger.info("Found: {}", existingProfiles.size());
+
+ //Profile already exist, and import config allow to overwrite profiles
+ if(existingProfiles.size() == 1) {
+ existingProfile = existingProfiles.get(0);
+ if(profileToImport.isProfileToDelete()) {
+ logger.info("Profile is to delete!");
+ persistenceService.remove(existingProfile.getItemId(), Profile.class);
+ return true;
+ }
+ List<String> propertiesToOverwrite = profileToImport.getPropertiesToOverwrite();
+ if(profileToImport.isOverwriteExistingProfiles() && propertiesToOverwrite!=null && propertiesToOverwrite.size() > 0) { // We overwrite only properties marked to overwrite
+ logger.info("Properties to overwrite: {}", propertiesToOverwrite);
+ for(String propName : propertiesToOverwrite) {
+ existingProfile.getProperties().put(propName, profileToImport.getProperties().get(propName));
+ }
+ } else { //If no property is marked to overwrite we replace the whole properties map
+ logger.info("Overwrite all properties");
+ existingProfile.setProperties(profileToImport.getProperties());
+ }
+ } else if(existingProfiles.size() == 0) {
+ logger.info("New profile to add...");
+ BeanUtils.copyProperties(existingProfile, profileToImport);
+ } else {
+ logger.warn("{} occurences found for profile with {} = {}. Profile import is skipped", existingProfiles.size(),
+ profileToImport.getMergingProperty(), profileToImport.getProperties().get("firstName"));
+ }
+ logger.info("-------------------------------------");
+ return persistenceService.save(existingProfile);
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..61200f2
--- /dev/null
+++ b/extensions/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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">
+
+ <reference id="persistenceService" interface="org.apache.unomi.persistence.spi.PersistenceService"/>
+
+ <bean id="importConfigurationServiceImpl" class="org.apache.unomi.router.services.ImportConfigurationServiceImpl"
+ init-method="postConstruct" destroy-method="preDestroy">
+ <property name="persistenceService" ref="persistenceService"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <service id="importConfigurationService" ref="importConfigurationServiceImpl" auto-export="interfaces"/>
+
+ <bean id="profileImportServiceImpl" class="org.apache.unomi.router.services.ProfileImportServiceImpl"
+ init-method="postConstruct" destroy-method="preDestroy">
+ <property name="persistenceService" ref="persistenceService"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <service id="profileImportService" ref="profileImportServiceImpl" auto-export="interfaces"/>
+
+</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index cdce2e6..3881b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -844,7 +844,6 @@
<module>extensions</module>
<module>kar</module>
<module>samples</module>
- <module>router</module>
<module>package</module>
</modules>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/pom.xml
----------------------------------------------------------------------
diff --git a/router/pom.xml b/router/pom.xml
deleted file mode 100644
index 5bf43ea..0000000
--- a/router/pom.xml
+++ /dev/null
@@ -1,64 +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
- ~ (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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
- <artifactId>unomi-root</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
-
- <artifactId>unomi-router</artifactId>
- <name>Apache Unomi :: Extensions :: Router</name>
- <description>Apache Camel Router for the Apache Unomi Context server</description>
- <packaging>pom</packaging>
-
- <properties>
- <camel.version>2.18.3</camel.version>
- </properties>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Import-Package>
- sun.misc;resolution:=optional,
- *
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- </plugins>
- </build>
-
- <modules>
- <module>router-api</module>
- <module>router-service</module>
- <module>router-core</module>
- <module>router-rest</module>
- <module>router-karaf-feature</module>
- </modules>
-
-</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-api/pom.xml b/router/router-api/pom.xml
deleted file mode 100644
index 06207b3..0000000
--- a/router/router-api/pom.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <parent>
- <artifactId>unomi-router</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>unomi-router-api</artifactId>
- <name>Apache Unomi :: Extensions :: Router :: API</name>
- <description>Router Specification API</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
deleted file mode 100644
index 770a7b5..0000000
--- a/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
+++ /dev/null
@@ -1,185 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.api;
-
-import org.apache.unomi.api.Item;
-import org.apache.unomi.api.MetadataItem;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by amidani on 28/04/2017.
- */
-public class ImportConfiguration extends Item {
-
- /**
- * The ImportConfiguration ITEM_TYPE
- *
- * @see Item for a discussion of ITEM_TYPE
- */
- public static final String ITEM_TYPE = "importConfig";
- private String name;
- private String description;
- private String configType;
- private Map<String, Object> properties = new HashMap<>();
- private String mergingProperty;
- private boolean overwriteExistingProfiles = false;
- private List<String> propertiesToOverwrite;
- private boolean active = false;
-
- /**
- * Sets the property identified by the specified name to the specified value. If a property with that name already exists, replaces its value, otherwise adds the new
- * property with the specified name and value.
- *
- * @param name the name of the property to set
- * @param value the value of the property
- */
- public void setProperty(String name, Object value) {
- properties.put(name, value);
- }
-
- /**
- * Retrieves the name of the import configuration
- * @return the name of the import configuration
- */
- public String getName() { return this.name; }
-
- /**
- * Sets the name of the import configuration
- * @param name the name of the import configuration
- */
- public void setName(String name) {
- this.name = name;
- }
-
- /**
- * Retrieves the description of the import configuration
- * @return the description of the import configuration
- */
- public String getDescription() { return this.description; }
-
- /**
- * Sets the description of the import configuration
- * @param description the description of the import configuration
- */
- public void setDescription(String description) {
- this.description = description;
- }
-
-
- /**
- * Retrieves the config type of the import configuration
- * @return the config type of the import configuration
- */
- public String getConfigType() { return this.configType; }
-
- /**
- * Sets the config type of the import configuration
- * @param configType the config type of the import configuration
- */
- public void setConfigType(String configType) {
- this.configType = configType;
- }
-
- /**
- * Retrieves the property identified by the specified name.
- *
- * @param name the name of the property to retrieve
- * @return the value of the specified property or {@code null} if no such property exists
- */
- public Object getProperty(String name) {
- return properties.get(name);
- }
-
- /**
- * Retrieves a Map of all property name - value pairs for this import configuration.
- *
- * @return a Map of all property name - value pairs for this import configuration
- */
- public Map<String, Object> getProperties() {
- return properties;
- }
-
- /**
- * Sets the property name - value pairs for this import configuration.
- *
- * @param properties a Map containing the property name - value pairs for this import configuration
- */
- public void setProperties(Map<String, Object> properties) {
- this.properties = properties;
- }
-
- public String getMergingProperty() {
- return mergingProperty;
- }
-
- /**
- * Sets the merging property.
- * @param mergingProperty property used to check if the profile exist when merging
- */
- public void setMergingProperty(String mergingProperty) {
- this.mergingProperty = mergingProperty;
- }
-
-
- /**
- * Retrieves the import configuration active flag.
- *
- * @return true if the import configuration is active false if not
- */
- public boolean isActive() {
- return this.active;
- }
-
- /**
- * Sets the active flag true/false.
- *
- * @param active a boolean to set to active or inactive the import configuration
- */
- public void setActive(boolean active) {
- this.active = active;
- }
-
- /**
- * Retrieves the import configuration overwriteExistingProfiles flag.
- *
- * @return true if during the import existing profiles must be overwritten
- */
- public boolean isOverwriteExistingProfiles() {
- return this.overwriteExistingProfiles;
- }
-
- /**
- * Sets the overwriteExistingProfiles flag true/false.
- *
- * @param overwriteExistingProfiles a boolean to set overwriteExistingProfiles in the import configuration
- */
- public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
- this.overwriteExistingProfiles = overwriteExistingProfiles;
- }
-
- public List<String> getPropertiesToOverwrite() {
- return propertiesToOverwrite;
- }
-
- public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
- this.propertiesToOverwrite = propertiesToOverwrite;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java b/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
deleted file mode 100644
index 30e40e0..0000000
--- a/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.unomi.router.api;
-
-import org.apache.unomi.api.Profile;
-
-import java.util.List;
-
-/**
- * An extension of {@link Profile} to handle merge strategy and deletion when importing profiles
- */
-public class ProfileToImport extends Profile {
-
- private List<String> propertiesToOverwrite;
- private String mergingProperty;
- private boolean profileToDelete;
- private boolean overwriteExistingProfiles;
-
-
- public List<String> getPropertiesToOverwrite() {
- return this.propertiesToOverwrite;
- }
-
- public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
- this.propertiesToOverwrite = propertiesToOverwrite;
- }
-
- public boolean isProfileToDelete() {
- return this.profileToDelete;
- }
-
- public void setProfileToDelete(boolean profileToDelete) {
- this.profileToDelete = profileToDelete;
- }
-
- public boolean isOverwriteExistingProfiles() {
- return this.overwriteExistingProfiles;
- }
-
- /**
- * Sets the overwriteExistingProfiles flag.
- * @param overwriteExistingProfiles flag used to specify if we want to overwrite existing profiles
- */
- public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
- this.overwriteExistingProfiles = overwriteExistingProfiles;
- }
-
- public String getMergingProperty() {
- return this.mergingProperty;
- }
-
- /**
- * Sets the merging property.
- * @param mergingProperty property used to check if the profile exist when merging
- */
- public void setMergingProperty(String mergingProperty) {
- this.mergingProperty = mergingProperty;
- }
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
deleted file mode 100644
index cacd671..0000000
--- a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
+++ /dev/null
@@ -1,60 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.api.services;
-
-import org.apache.unomi.router.api.ImportConfiguration;
-
-import java.util.List;
-
-/**
- * A service to access and operate on {@link ImportConfiguration}s.
- */
-public interface ImportConfigurationService {
-
- /**
- * Retrieves all the import configurations.
- *
- * @return the list of import configurations
- */
- public List<ImportConfiguration> getImportConfigurations();
-
- /**
- * Retrieves the import configuration identified by the specified identifier.
- *
- * @param configId the identifier of the profile to retrieve
- * @return the import configuration identified by the specified identifier or
- * {@code null} if no such import configuration exists
- */
- public ImportConfiguration load(String configId);
-
- /**
- * Saves the specified import configuration in the context server.
- *
- * @param profile the import configuration to be saved
- * @return the newly saved import configuration
- */
- public ImportConfiguration save(ImportConfiguration profile);
-
- /**
- * Deletes the import configuration identified by the specified identifier.
- *
- * @param configId the identifier of the import configuration to delete
- */
- public void delete(String configId);
-
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java b/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
deleted file mode 100644
index aa7d182..0000000
--- a/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
+++ /dev/null
@@ -1,29 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.api.services;
-
-import org.apache.unomi.router.api.ProfileToImport;
-
-import java.lang.reflect.InvocationTargetException;
-
-/**
- * Created by amidani on 20/05/2017.
- */
-public interface ProfileImportService {
-
- boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException;
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-core/pom.xml b/router/router-core/pom.xml
deleted file mode 100644
index b0b97c4..0000000
--- a/router/router-core/pom.xml
+++ /dev/null
@@ -1,182 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- ~ 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 express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
-<project xmlns="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">
- <parent>
- <artifactId>unomi-router</artifactId>
- <groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
- </parent>
- <modelVersion>4.0.0</modelVersion>
-
- <artifactId>unomi-router-core</artifactId>
- <name>Apache Unomi :: Extensions :: Router :: Core</name>
- <description>Router Core (Apache Camel Routes)</description>
- <packaging>bundle</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.core</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.osgi</groupId>
- <artifactId>org.osgi.compendium</artifactId>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-api</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-services</artifactId>
- <version>${project.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <version>${camel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-jackson</artifactId>
- <version>${camel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-http-common</artifactId>
- <version>${camel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-servlet</artifactId>
- <version>${camel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.camel</groupId>
- <artifactId>camel-kafka</artifactId>
- <version>${camel.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-net</groupId>
- <artifactId>commons-net</artifactId>
- <version>3.5</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.servicemix.bundles</groupId>
- <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
- <version>0.1.54_1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.kafka</groupId>
- <artifactId>kafka-clients</artifactId>
- <version>0.10.1.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
- <configuration>
- <instructions>
- <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
- <Import-Package>
- org.osgi.service.event;resolution:=optional,
- org.apache.camel,
- org.apache.camel.builder,
- org.apache.camel.component.file.remote,
- org.apache.camel.component.file,
- org.apache.camel.component.jackson,
- org.apache.camel.component.kafka,
- org.apache.camel.component.servlet,
- org.apache.camel.component.servlet.osgi,
- org.apache.camel.impl,
- org.apache.camel.model,
- org.apache.camel.model.dataformat,
- org.apache.camel.model.rest,
- org.apache.camel.spi,
- org.apache.unomi.api,
- org.apache.unomi.router.api,
- org.apache.unomi.api.services,
- org.apache.unomi.router.api.services,
- org.apache.kafka.clients.producer;resolution:=optional,
- org.apache.kafka.clients.consumer;resolution:=optional,
- com.jcraft.jsch,
- org.osgi.framework,
- org.osgi.service.http,
- org.slf4j
- </Import-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>attach-artifacts</id>
- <phase>package</phase>
- <goals>
- <goal>attach-artifact</goal>
- </goals>
- <configuration>
- <artifacts>
- <artifact>
- <file>
- src/main/resources/org.apache.unomi.router.cfg
- </file>
- <type>cfg</type>
- <classifier>routercfg</classifier>
- </artifact>
- </artifacts>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-
-
-</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java b/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
deleted file mode 100644
index 2f3eaad..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
+++ /dev/null
@@ -1,165 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.context;
-
-import org.apache.camel.CamelContext;
-import org.apache.camel.Route;
-import org.apache.camel.component.jackson.JacksonDataFormat;
-import org.apache.camel.impl.DefaultCamelContext;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.api.services.ImportConfigurationService;
-import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
-import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
-import org.apache.unomi.router.core.route.ProfileImportKafkaToUnomiRouteBuilder;
-import org.apache.unomi.router.core.route.ProfileImportOneShotRouteBuilder;
-import org.apache.unomi.router.core.route.ProfileImportSourceToKafkaRouteBuilder;
-import org.osgi.framework.Bundle;
-import org.osgi.framework.BundleContext;
-import org.osgi.framework.BundleEvent;
-import org.osgi.framework.SynchronousBundleListener;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
-/**
- * Created by amidani on 04/05/2017.
- */
-public class ProfileImportCamelContext implements SynchronousBundleListener {
-
- private Logger logger = LoggerFactory.getLogger(ProfileImportCamelContext.class.getName());
-
- private CamelContext camelContext;
- private UnomiStorageProcessor unomiStorageProcessor;
- private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
- private ImportConfigurationService importConfigurationService;
- private JacksonDataFormat jacksonDataFormat;
- private String uploadDir;
- private Map<String, String> kafkaProps;
-
- private BundleContext bundleContext;
-
- public void setBundleContext(BundleContext bundleContext) {
- this.bundleContext = bundleContext;
- }
-
- public void initCamelContext() throws Exception {
- logger.info("Initialize Camel Context...");
- camelContext = new DefaultCamelContext();
- List<ImportConfiguration> importConfigurationList = importConfigurationService.getImportConfigurations();
- ProfileImportSourceToKafkaRouteBuilder builderReader = new ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
- builderReader.setImportConfigurationList(importConfigurationList);
- builderReader.setJacksonDataFormat(jacksonDataFormat);
- builderReader.setContext(camelContext);
- camelContext.addRoutes(builderReader);
-
- //One shot import route
- ProfileImportOneShotRouteBuilder builderOneShot = new ProfileImportOneShotRouteBuilder(kafkaProps);
- builderOneShot.setImportConfigByFileNameProcessor(importConfigByFileNameProcessor);
- builderOneShot.setJacksonDataFormat(jacksonDataFormat);
- builderOneShot.setUploadDir(uploadDir);
- builderOneShot.setContext(camelContext);
- camelContext.addRoutes(builderOneShot);
-
-
- ProfileImportKafkaToUnomiRouteBuilder builderProcessor = new ProfileImportKafkaToUnomiRouteBuilder(kafkaProps);
- builderProcessor.setUnomiStorageProcessor(unomiStorageProcessor);
- builderProcessor.setJacksonDataFormat(jacksonDataFormat);
- builderProcessor.setContext(camelContext);
- camelContext.addRoutes(builderProcessor);
-
- camelContext.start();
-
- logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
-
- processBundleStartup(bundleContext);
- for (Bundle bundle : bundleContext.getBundles()) {
- if (bundle.getBundleContext() != null) {
- processBundleStartup(bundle.getBundleContext());
- }
- }
- bundleContext.addBundleListener(this);
- logger.info("Camel Context {} initialized successfully.");
-
- }
-
- private boolean stopRoute(String routeId) throws Exception {
- return camelContext.stopRoute(routeId, 10L, TimeUnit.SECONDS, true);
- }
-
- public void updateProfileImportReaderRoute(ImportConfiguration importConfiguration) throws Exception {
- Route route = camelContext.getRoute(importConfiguration.getItemId());
- 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);
- }
-
- public CamelContext getCamelContext() {
- return camelContext;
- }
-
- public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
- this.unomiStorageProcessor = unomiStorageProcessor;
- }
-
- public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
- this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
- }
-
- public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
- this.importConfigurationService = importConfigurationService;
- }
-
- public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
- this.jacksonDataFormat = jacksonDataFormat;
- }
-
- public void setUploadDir(String uploadDir) {
- this.uploadDir = uploadDir;
- }
-
- public void setKafkaProps(Map<String, String> kafkaProps) {
- this.kafkaProps = kafkaProps;
- }
-
- public void preDestroy() throws Exception {
- bundleContext.removeBundleListener(this);
- //This is to shutdown Camel context
- //(will stop all routes/components/endpoints etc and clear internal state/cache)
- this.camelContext.stop();
- logger.info("Camel context for profile import is shutdown.");
- }
-
- private void processBundleStartup(BundleContext bundleContext) {
- if (bundleContext == null) {
- return;
- }
- }
-
- @Override
- public void bundleChanged(BundleEvent bundleEvent) {
-
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
deleted file mode 100644
index e4eaa19..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
+++ /dev/null
@@ -1,44 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.processor;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.core.context.ProfileImportCamelContext;
-
-/**
- * Created by amidani on 10/05/2017.
- */
-public class ConfigUpdateProcessor implements Processor{
-
- private ProfileImportCamelContext profileImportCamelContext;
-
- @Override
- public void process(Exchange exchange) throws Exception {
- if (exchange.getIn() != null) {
- Message message = exchange.getIn();
- ImportConfiguration importConfiguration = message.getBody(ImportConfiguration.class);
- profileImportCamelContext.updateProfileImportReaderRoute(importConfiguration);
- }
- }
-
- public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
- this.profileImportCamelContext = profileImportCamelContext;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
deleted file mode 100644
index 7fc7730..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
+++ /dev/null
@@ -1,44 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.processor;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.file.GenericFile;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.api.services.ImportConfigurationService;
-
-/**
- * Created by amidani on 22/05/2017.
- */
-public class ImportConfigByFileNameProcessor implements Processor{
-
- private ImportConfigurationService importConfigurationService;
-
- @Override
- public void process(Exchange exchange) throws Exception {
-
- String fileName = exchange.getIn().getBody(GenericFile.class).getFileName();
- String importConfigId = fileName.substring(0, fileName.indexOf('.'));
- ImportConfiguration importConfiguration = importConfigurationService.load(importConfigId);
- exchange.getIn().setHeader("importConfigOneShot", importConfiguration);
- }
-
- public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
- this.importConfigurationService = importConfigurationService;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
deleted file mode 100644
index 30f79bf..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
+++ /dev/null
@@ -1,104 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.processor;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Processor;
-import org.apache.camel.component.kafka.KafkaConstants;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.api.ProfileToImport;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
-
-/**
- * Created by amidani on 29/12/2016.
- */
-public class LineSplitProcessor implements Processor {
-
- private Map<String, Integer> fieldsMapping;
- private List<String> propertiesToOverwrite;
- private String mergingProperty;
- private boolean overwriteExistingProfiles;
-
- @Override
- public void process(Exchange exchange) throws Exception {
- //In case of one shot import we check the header and overwrite import config
- ImportConfiguration importConfigOneShot = (ImportConfiguration) exchange.getIn().getHeader("importConfigOneShot");
- if(importConfigOneShot!=null) {
- fieldsMapping = (Map<String, Integer>)importConfigOneShot.getProperties().get("mapping");
- propertiesToOverwrite = importConfigOneShot.getPropertiesToOverwrite();
- mergingProperty = importConfigOneShot.getMergingProperty();
- overwriteExistingProfiles = importConfigOneShot.isOverwriteExistingProfiles();
- }
- String[] profileData = ((String)exchange.getIn().getBody()).split(",");
- ProfileToImport profileToImport = new ProfileToImport();
- profileToImport.setItemId(UUID.randomUUID().toString());
- profileToImport.setItemType("profile");
- profileToImport.setScope("system");
- if(profileData.length > 0) {
- Map<String, Object> properties = new HashMap<>();
- for(String fieldMappingKey : fieldsMapping.keySet()) {
- if(profileData.length > fieldsMapping.get(fieldMappingKey)) {
- properties.put(fieldMappingKey, profileData[fieldsMapping.get(fieldMappingKey)].trim());
- }
- }
- profileToImport.setProperties(properties);
- profileToImport.setMergingProperty(mergingProperty);
- profileToImport.setPropertiesToOverwrite(propertiesToOverwrite);
- profileToImport.setOverwriteExistingProfiles(overwriteExistingProfiles);
- if(StringUtils.isNotBlank(profileData[profileData.length - 1]) && Boolean.parseBoolean(profileData[profileData.length - 1].trim())) {
- profileToImport.setProfileToDelete(true);
- }
- }
- exchange.getIn().setBody(profileToImport, ProfileToImport.class);
- exchange.getIn().setHeader(KafkaConstants.PARTITION_KEY, 0);
- exchange.getIn().setHeader(KafkaConstants.KEY, "1");
- }
-
- /**
- * Setter of fieldsMapping
- * @param fieldsMapping map String,Integer fieldName in ES and the matching column index in the import file
- */
- public void setFieldsMapping(Map<String, Integer> fieldsMapping) {
- this.fieldsMapping = fieldsMapping;
- }
-
- public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
- this.propertiesToOverwrite = propertiesToOverwrite;
- }
-
- public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
- this.overwriteExistingProfiles = overwriteExistingProfiles;
- }
-
- public String getMergingProperty() {
- return this.mergingProperty;
- }
-
- /**
- * Sets the merging property.
- * @param mergingProperty property used to check if the profile exist when merging
- */
- public void setMergingProperty(String mergingProperty) {
- this.mergingProperty = mergingProperty;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java b/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
deleted file mode 100644
index 7e55185..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
+++ /dev/null
@@ -1,46 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.processor;
-
-import org.apache.camel.Exchange;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.unomi.router.api.ProfileToImport;
-import org.apache.unomi.router.api.services.ProfileImportService;
-
-/**
- * Created by amidani on 29/12/2016.
- */
-public class UnomiStorageProcessor implements Processor {
-
- private ProfileImportService profileImportService;
-
- @Override
- public void process(Exchange exchange)
- throws Exception {
- if (exchange.getIn() != null) {
- Message message = exchange.getIn();
-
- ProfileToImport profileToImport = (ProfileToImport) message.getBody();
- profileImportService.saveMergeDeleteImportedProfile(profileToImport);
- }
- }
-
- public void setProfileImportService(ProfileImportService profileImportService) {
- this.profileImportService = profileImportService;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
deleted file mode 100644
index ac71798..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
+++ /dev/null
@@ -1,62 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.route;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.model.rest.RestBindingMode;
-import org.apache.unomi.router.api.ImportConfiguration;
-import org.apache.unomi.router.core.context.ProfileImportCamelContext;
-import org.apache.unomi.router.core.processor.ConfigUpdateProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * Created by amidani on 10/05/2017.
- */
-public class ProfileImportConfigUpdateRouteBuilder extends RouteBuilder {
-
- private static final Logger logger = LoggerFactory.getLogger(ProfileImportConfigUpdateRouteBuilder.class.getName());
-
- private ProfileImportCamelContext profileImportCamelContext;
-
- @Override
- public void configure() throws Exception {
- logger.info("Preparing REST Configuration for servlet with context path [/importConfigAdmin]");
- restConfiguration().component("servlet")
- .contextPath("/importConfigAdmin")
- .enableCORS(true)
- .bindingMode(RestBindingMode.json)
- .dataFormatProperty("prettyPrint", "true");
-
- rest().put("/").consumes("application/json").type(ImportConfiguration.class)
- .to("direct:importConfigRestDeposit");
- ConfigUpdateProcessor profileImportConfigUpdateProcessor = new ConfigUpdateProcessor();
- profileImportConfigUpdateProcessor.setProfileImportCamelContext(profileImportCamelContext);
- from("direct:importConfigRestDeposit")
- .process(profileImportConfigUpdateProcessor)
- .transform().constant("Success.")
- .onException(Exception.class)
- .transform().constant("Failure!");
-
-
- }
-
- public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
- this.profileImportCamelContext = profileImportCamelContext;
- }
-
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
deleted file mode 100644
index 1b056fe..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.route;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jackson.JacksonDataFormat;
-import org.apache.camel.component.kafka.KafkaComponent;
-import org.apache.camel.component.kafka.KafkaConfiguration;
-import org.apache.camel.component.kafka.KafkaEndpoint;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
-
-import java.util.Map;
-
-/**
- * Created by amidani on 26/04/2017.
- */
-public class ProfileImportKafkaToUnomiRouteBuilder extends RouteBuilder {
-
- private UnomiStorageProcessor unomiStorageProcessor;
- private JacksonDataFormat jacksonDataFormat;
- private String kafkaHost;
- private String kafkaPort;
- private String kafkaImportTopic;
- private String kafkaImportGroupId;
-
- public ProfileImportKafkaToUnomiRouteBuilder(Map<String, String> kafkaProps) {
- kafkaHost = kafkaProps.get("kafkaHost");
- kafkaPort = kafkaProps.get("kafkaPort");
- kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
- kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
- }
-
- @Override
- public void configure() throws Exception {
-
- StringBuilder kafkaUri = new StringBuilder("kafka:");
- kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
- if(StringUtils.isNotBlank(kafkaImportGroupId)) {
- kafkaUri.append("&groupId="+kafkaImportGroupId);
- }
- kafkaUri.append("&autoCommitEnable=true&consumersCount=10");
- KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
- kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
- kafkaConfiguration.setTopic(kafkaImportTopic);
- kafkaConfiguration.setGroupId(kafkaImportGroupId);
- KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
- endpoint.setConfiguration(kafkaConfiguration);
- from(endpoint)
- .unmarshal(jacksonDataFormat)
- .process(unomiStorageProcessor)
- .to("log:org.apache.unomi.router?level=INFO");
-
- }
-
- public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
- this.unomiStorageProcessor = unomiStorageProcessor;
- }
-
- public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
- this.jacksonDataFormat = jacksonDataFormat;
- }
-}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
deleted file mode 100644
index 288d9d1..0000000
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
+++ /dev/null
@@ -1,99 +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
- * (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 express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.unomi.router.core.route;
-
-import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.component.jackson.JacksonDataFormat;
-import org.apache.camel.component.kafka.KafkaComponent;
-import org.apache.camel.component.kafka.KafkaConfiguration;
-import org.apache.camel.component.kafka.KafkaEndpoint;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
-import org.apache.unomi.router.core.processor.LineSplitProcessor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.Map;
-
-/**
- * Created by amidani on 22/05/2017.
- */
-public class ProfileImportOneShotRouteBuilder extends RouteBuilder {
-
- private Logger logger = LoggerFactory.getLogger(ProfileImportOneShotRouteBuilder.class.getName());
-
- private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
- private JacksonDataFormat jacksonDataFormat;
- private String uploadDir;
- private String kafkaHost;
- private String kafkaPort;
- private String kafkaImportTopic;
- private String kafkaImportGroupId;
-
- private final String IMPORT_ONESHOT_ROUTE_ID = "ONE_SHOT_ROUTE";
-
- public ProfileImportOneShotRouteBuilder(Map<String, String> kafkaProps) {
- kafkaHost = kafkaProps.get("kafkaHost");
- kafkaPort = kafkaProps.get("kafkaPort");
- kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
- kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
- }
-
- @Override
- public void configure() throws Exception {
-
- //Prepare Kafka Deposit
- StringBuilder kafkaUri = new StringBuilder("kafka:");
- kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
- if(StringUtils.isNotBlank(kafkaImportGroupId)) {
- kafkaUri.append("&groupId="+ kafkaImportGroupId);
- }
-
- KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
- kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
- kafkaConfiguration.setTopic(kafkaImportTopic);
- kafkaConfiguration.setGroupId(kafkaImportGroupId);
- KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
- endpoint.setConfiguration(kafkaConfiguration);
-
- LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
-
-
- from("file://"+uploadDir+"?include=.*.csv&consumer.delay=1m")
- .routeId(IMPORT_ONESHOT_ROUTE_ID)
- .autoStartup(true)
- .process(importConfigByFileNameProcessor)
- .split(bodyAs(String.class).tokenize("\n"))
- .process(lineSplitProcessor)
- .to("log:org.apache.unomi.router?level=INFO")
- .marshal(jacksonDataFormat)
- .convertBodyTo(String.class)
- .to(endpoint);
- }
-
- public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
- this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
- }
-
- public void setUploadDir(String uploadDir) {
- this.uploadDir = uploadDir;
- }
-
- public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
- this.jacksonDataFormat = jacksonDataFormat;
- }
-}
[14/14] incubator-unomi git commit: DMF-1343 : Typo
Posted by am...@apache.org.
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/4f3b17f0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/4f3b17f0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/4f3b17f0
Branch: refs/heads/feature-DMF-1343
Commit: 4f3b17f0a64e0141be70b59c568e2a8e71b80808
Parents: e193b51
Author: Abdelkader Midani <am...@apache.org>
Authored: Mon May 29 16:58:12 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 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/4f3b17f0/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`
[08/14] incubator-unomi git commit: DMF-1343 Import profiles from CSV
through API
Posted by am...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
----------------------------------------------------------------------
diff --git a/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java b/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
new file mode 100644
index 0000000..e81930a
--- /dev/null
+++ b/router/router-rest/src/main/java/org/apache/unomi/router/rest/ImportConfigurationServiceEndPoint.java
@@ -0,0 +1,167 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.rest;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.apache.cxf.jaxrs.ext.multipart.Multipart;
+import org.apache.cxf.jaxrs.ext.multipart.Attachment;
+import org.apache.cxf.rs.security.cors.CrossOriginResourceSharing;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.entity.StringEntity;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.jws.WebMethod;
+import javax.jws.WebService;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.List;
+
+/**
+ * A JAX-RS endpoint to manage {@link org.apache.unomi.router.api.ImportConfiguration}s.
+ */
+@WebService
+@CrossOriginResourceSharing(
+ allowAllOrigins = true,
+ allowCredentials = true
+)
+public class ImportConfigurationServiceEndPoint {
+
+ private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceEndPoint.class.getName());
+
+ private ImportConfigurationService importConfigurationService;
+ private String uploadDir;
+
+ public ImportConfigurationServiceEndPoint () {
+ logger.info("Initializing import configuration service endpoint...");
+ }
+
+ @WebMethod(exclude = true)
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+
+ @WebMethod(exclude = true)
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ /**
+ * Retrieves all the import configurations.
+ *
+ * @return all the import configurations.
+ */
+ @GET
+ @Path("/")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public List<ImportConfiguration> getImportConfigurations() {
+ return importConfigurationService.getImportConfigurations();
+ }
+
+ /**
+ * Retrieves an import configuration by id.
+ *
+ * @return the import configuration that matches the given id.
+ */
+ @GET
+ @Path("/{configId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ImportConfiguration getImportConfiguration(@PathParam("configId") String configId) {
+ return importConfigurationService.load(configId);
+ }
+
+ /**
+ * Delete an import configuration by id.
+ *
+ * @return the deleted import configuration.
+ */
+ @DELETE
+ @Path("/{configId}")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public void deleteImportConfiguration(@PathParam("configId") String configId) {
+ importConfigurationService.delete(configId);
+ }
+
+
+
+ /**
+ * Save the given import configuration.
+ *
+ * @return the import configuration saved.
+ */
+ @POST
+ @Path("/")
+ @Produces(MediaType.APPLICATION_JSON)
+ @Consumes(MediaType.APPLICATION_JSON)
+ public ImportConfiguration saveImportConfiguration(ImportConfiguration importConfiguration) {
+ ImportConfiguration importConfigSaved = importConfigurationService.save(importConfiguration);
+ CloseableHttpClient httpClient = HttpClients.createDefault();
+ try {
+ HttpPut httpPut = new HttpPut("http://localhost:8181/importConfigAdmin/");
+ StringEntity input = new StringEntity(new ObjectMapper().writeValueAsString(importConfigSaved));
+ input.setContentType(MediaType.APPLICATION_JSON);
+ httpPut.setEntity(input);
+
+ HttpResponse response = httpClient.execute(httpPut);
+
+ if (response.getStatusLine().getStatusCode() != 200) {
+ throw new RuntimeException("Failed : HTTP error code : "
+ + response.getStatusLine().getStatusCode());
+ }
+ } catch (IOException e) {
+ logger.warn("Unable to update Camel route [{}]", importConfiguration.getItemId());
+ }
+ return importConfigSaved;
+ }
+
+ /**
+ * Save/Update the given import configuration.
+ * Prepare the file to be processed with Camel routes
+ * @return OK / NOK Http Code.
+ */
+ @POST
+ @Path("/oneshot")
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response processOneshotImportConfigurationCSV(@Multipart(value = "importConfigId") String importConfigId, @Multipart(value = "file") Attachment file) {
+ try {
+ java.nio.file.Path path = Paths.get(uploadDir+importConfigId+".csv");
+ Files.deleteIfExists(path);
+ InputStream in = file.getObject(InputStream.class);
+
+ Files.copy(in, path);
+
+ } catch (IOException e) {
+ e.printStackTrace();
+ return Response.serverError().build();
+ }
+ return Response.ok().build();
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..a5cf1be
--- /dev/null
+++ b/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns:cxf="http://cxf.apache.org/blueprint/core" 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://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>
+
+ <cxf:bus id="cxsServiceBus">
+ <cxf:features>
+ <cxf:logging/>
+ </cxf:features>
+ </cxf:bus>
+
+ <bean id="cors-filter" class="org.apache.cxf.rs.security.cors.CrossOriginResourceSharingFilter"/>
+ <bean id="jacksonMapper" class="com.fasterxml.jackson.databind.ObjectMapper"/>
+ <bean id="json-provider" class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">
+ <argument index="0" ref="jacksonMapper" type="com.fasterxml.jackson.databind.ObjectMapper"/>
+ </bean>
+ <bean id="jaas-filter" class="org.apache.cxf.jaxrs.security.JAASAuthenticationFilter">
+ <!-- Name of the JAAS Context -->
+ <property name="contextName" value="karaf"/>
+ <!-- Hint to the filter on how to have Principals representing users and roles separated
+ while initializing a SecurityContext -->
+ <property name="rolePrefix" value="ROLE_"/>
+ <property name="realmName" value="cxs"/>
+ </bean>
+
+ <jaxrs:server address="/importConfiguration" id="restImportConfigurationService">
+ <jaxrs:providers>
+ <ref component-id="json-provider"/>
+ <ref component-id="cors-filter"/>
+ <ref component-id="jaas-filter"/>
+ </jaxrs:providers>
+
+ <jaxrs:serviceBeans>
+ <ref component-id="importConfigurationServiceEndPoint"/>
+ </jaxrs:serviceBeans>
+ </jaxrs:server>
+
+ <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
+
+ <bean id="importConfigurationServiceEndPoint" class="org.apache.unomi.router.rest.ImportConfigurationServiceEndPoint">
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
+ </bean>
+
+</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-service/pom.xml b/router/router-service/pom.xml
new file mode 100644
index 0000000..750cd1e
--- /dev/null
+++ b/router/router-service/pom.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-service</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Services</name>
+ <description>Router Services</description>
+ <packaging>bundle</packaging>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-beanutils</groupId>
+ <artifactId>commons-beanutils</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ </dependencies>
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java b/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
new file mode 100644
index 0000000..a4f6131
--- /dev/null
+++ b/router/router-service/src/main/java/org/apache/unomi/router/services/ImportConfigurationServiceImpl.java
@@ -0,0 +1,114 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.router.services;
+
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.UUID;
+
+/**
+ * Created by amidani on 28/04/2017.
+ */
+public class ImportConfigurationServiceImpl implements ImportConfigurationService,SynchronousBundleListener {
+
+ private static final Logger logger = LoggerFactory.getLogger(ImportConfigurationServiceImpl.class.getName());
+
+ private BundleContext bundleContext;
+ private PersistenceService persistenceService;
+
+ public ImportConfigurationServiceImpl() {
+ logger.info("Initializing import configuration service...");
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void setPersistenceService(PersistenceService persistenceService) {
+ this.persistenceService = persistenceService;
+ }
+
+ public void postConstruct() {
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Import configuration service initialized.");
+ }
+
+ public void preDestroy() {
+ bundleContext.removeBundleListener(this);
+ logger.info("Import configuration service shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ private void processBundleStop(BundleContext bundleContext) {
+ }
+
+
+ @Override
+ public List<ImportConfiguration> getImportConfigurations() {
+ return persistenceService.getAllItems(ImportConfiguration.class);
+ }
+
+ @Override
+ public ImportConfiguration load(String configId) {
+ return persistenceService.load(configId, ImportConfiguration.class);
+ }
+
+ @Override
+ public ImportConfiguration save(ImportConfiguration importConfiguration) {
+ if (importConfiguration.getItemId() == null) {
+ importConfiguration.setItemId(UUID.randomUUID().toString());
+ }
+ if(persistenceService.save(importConfiguration)) {
+
+ }
+
+ return persistenceService.load(importConfiguration.getItemId(), ImportConfiguration.class);
+ }
+
+ @Override
+ public void delete(String configId) {
+ persistenceService.remove(configId, ImportConfiguration.class);
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java b/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
new file mode 100644
index 0000000..8097953
--- /dev/null
+++ b/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
@@ -0,0 +1,122 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.services;
+
+import org.apache.commons.beanutils.BeanUtils;
+import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.services.EventListenerService;
+import org.apache.unomi.persistence.spi.PersistenceService;
+import org.apache.unomi.router.api.ProfileToImport;
+import org.apache.unomi.router.api.services.ProfileImportService;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
+
+/**
+ * Created by amidani on 18/05/2017.
+ */
+public class ProfileImportServiceImpl implements ProfileImportService, SynchronousBundleListener {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportServiceImpl.class.getName());
+
+ private PersistenceService persistenceService;
+
+ private BundleContext bundleContext;
+
+ public void setPersistenceService(PersistenceService persistenceService) {
+ this.persistenceService = persistenceService;
+ }
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void postConstruct() {
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Import configuration service initialized.");
+ }
+
+ public void preDestroy() {
+ bundleContext.removeBundleListener(this);
+ logger.info("Import configuration service shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ private void processBundleStop(BundleContext bundleContext) {
+ }
+
+
+ public boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException {
+ logger.info("Importing profile: {}, {}", profileToImport.getProperties().get("firstName"), profileToImport.getProperties().get("lastName"));
+ Profile existingProfile = new Profile();
+ List<Profile> existingProfiles = persistenceService.query("properties."+profileToImport.getMergingProperty(), (String)profileToImport.getProperties().get(profileToImport.getMergingProperty()), null, Profile.class);
+ logger.info("Query existing profile with mergingProperty: {}", profileToImport.getMergingProperty());
+ logger.info("Found: {}", existingProfiles.size());
+
+ //Profile already exist, and import config allow to overwrite profiles
+ if(existingProfiles.size() == 1) {
+ existingProfile = existingProfiles.get(0);
+ if(profileToImport.isProfileToDelete()) {
+ logger.info("Profile is to delete!");
+ persistenceService.remove(existingProfile.getItemId(), Profile.class);
+ return true;
+ }
+ List<String> propertiesToOverwrite = profileToImport.getPropertiesToOverwrite();
+ if(profileToImport.isOverwriteExistingProfiles() && propertiesToOverwrite!=null && propertiesToOverwrite.size() > 0) { // We overwrite only properties marked to overwrite
+ logger.info("Properties to overwrite: {}", propertiesToOverwrite);
+ for(String propName : propertiesToOverwrite) {
+ existingProfile.getProperties().put(propName, profileToImport.getProperties().get(propName));
+ }
+ } else { //If no property is marked to overwrite we replace the whole properties map
+ logger.info("Overwrite all properties");
+ existingProfile.setProperties(profileToImport.getProperties());
+ }
+ } else if(existingProfiles.size() == 0) {
+ logger.info("New profile to add...");
+ BeanUtils.copyProperties(existingProfile, profileToImport);
+ } else {
+ logger.warn("{} occurences found for profile with {} = {}. Profile import is skipped", existingProfiles.size(),
+ profileToImport.getMergingProperty(), profileToImport.getProperties().get("firstName"));
+ }
+ logger.info("-------------------------------------");
+ return persistenceService.save(existingProfile);
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..61200f2
--- /dev/null
+++ b/router/router-service/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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">
+
+ <reference id="persistenceService" interface="org.apache.unomi.persistence.spi.PersistenceService"/>
+
+ <bean id="importConfigurationServiceImpl" class="org.apache.unomi.router.services.ImportConfigurationServiceImpl"
+ init-method="postConstruct" destroy-method="preDestroy">
+ <property name="persistenceService" ref="persistenceService"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <service id="importConfigurationService" ref="importConfigurationServiceImpl" auto-export="interfaces"/>
+
+ <bean id="profileImportServiceImpl" class="org.apache.unomi.router.services.ProfileImportServiceImpl"
+ init-method="postConstruct" destroy-method="preDestroy">
+ <property name="persistenceService" ref="persistenceService"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+ <service id="profileImportService" ref="profileImportServiceImpl" auto-export="interfaces"/>
+
+</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin.zip
----------------------------------------------------------------------
diff --git a/samples/trainingplugin.zip b/samples/trainingplugin.zip
new file mode 100644
index 0000000..1226fc1
Binary files /dev/null and b/samples/trainingplugin.zip differ
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/pom.xml b/samples/trainingplugin/pom.xml
new file mode 100644
index 0000000..34711a7
--- /dev/null
+++ b/samples/trainingplugin/pom.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>samples</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </parent>
+ <artifactId>training-plugin</artifactId>
+ <name>Apache Unomi :: Samples :: Training plugin</name>
+ <packaging>bundle</packaging>
+ <description>This is a simple Apache Unomi plugin.</description>
+ <modelVersion>4.0.0</modelVersion>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java b/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
new file mode 100644
index 0000000..7f64cbd
--- /dev/null
+++ b/samples/trainingplugin/src/main/java/org/apache/unomi/training/TrainedNotificationAction.java
@@ -0,0 +1,61 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.training;
+
+import org.apache.unomi.api.Event;
+import org.apache.unomi.api.Metadata;
+import org.apache.unomi.api.Profile;
+import org.apache.unomi.api.PropertyType;
+import org.apache.unomi.api.actions.Action;
+import org.apache.unomi.api.actions.ActionExecutor;
+import org.apache.unomi.api.services.EventService;
+import org.apache.unomi.api.services.ProfileService;
+
+import java.util.Collections;
+
+/**
+ * Created by amidani on 11/04/2017.
+ */
+public class TrainedNotificationAction implements ActionExecutor {
+
+ private static final String TRAINED_NB_PROPERTY = "trained";
+ private static final String TARGET = "profiles";
+
+ private ProfileService service;
+
+ public void setProfileService(ProfileService service) {
+ this.service = service;
+ }
+
+ @Override
+ public int execute(Action action, Event event) {
+ final Profile profile = event.getProfile();
+ Integer trained = (Integer) profile.getProperty(TRAINED_NB_PROPERTY);
+
+ if (trained == null) {
+ // create trained flag property type
+ PropertyType propertyType = new PropertyType(new Metadata(event.getScope(), TRAINED_NB_PROPERTY, TRAINED_NB_PROPERTY, "Am I trained"));
+ propertyType.setValueTypeId("boolean");
+ propertyType.setTagIds(Collections.singleton("training"));
+ propertyType.setTarget(TARGET);
+ service.setPropertyType(propertyType);
+ }
+
+ profile.setProperty(TRAINED_NB_PROPERTY, true);
+ return EventService.PROFILE_UPDATED;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json b/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
new file mode 100644
index 0000000..2ac9763
--- /dev/null
+++ b/samples/trainingplugin/src/main/resources/META-INF/cxs/actions/trainingNotifAction.json
@@ -0,0 +1,13 @@
+{
+ "metadata": {
+ "id": "trainingNotifAction",
+ "name": "Training Action",
+ "description": "",
+ "tags": [
+ "event"
+ ],
+ "readOnly": true
+ },
+ "actionExecutor": "training",
+ "parameters": []
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin/src/main/resources/META-INF/cxs/rules/trainedNotification.json
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/resources/META-INF/cxs/rules/trainedNotification.json b/samples/trainingplugin/src/main/resources/META-INF/cxs/rules/trainedNotification.json
new file mode 100644
index 0000000..e098e3e
--- /dev/null
+++ b/samples/trainingplugin/src/main/resources/META-INF/cxs/rules/trainedNotification.json
@@ -0,0 +1,20 @@
+{
+ "metadata": {
+ "id": "smp:trainedRule",
+ "name": "Trained",
+ "description": "..."
+ },
+ "raiseEventOnlyOnceForSession": false,
+ "condition": {
+ "type": "eventTypeCondition",
+ "parameterValues": {
+ "eventTypeId": "trainingEvent"
+ }
+ },
+ "actions": [
+ {
+ "type": "trainingNotifAction",
+ "parameterValues": {}
+ }
+ ]
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b68909b1/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..41764cc
--- /dev/null
+++ b/samples/trainingplugin/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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">
+
+ <reference id="profileService" interface="org.apache.unomi.api.services.ProfileService"/>
+
+ <!-- Action executor -->
+ <service id="trainingNotifAction" auto-export="interfaces">
+ <service-properties>
+ <entry key="actionExecutorId" value="training"/>
+ </service-properties>
+ <bean class="org.apache.unomi.training.TrainedNotificationAction">
+ <property name="profileService" ref="profileService"/>
+ </bean>
+ </service>
+</blueprint>
[12/14] incubator-unomi git commit: DMF-1566 : Flat files import -
Ability to define column and line separator
Posted by am...@apache.org.
DMF-1566 : Flat files import - Ability to define column and line separator
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/d95595fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/d95595fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/d95595fd
Branch: refs/heads/feature-DMF-1343
Commit: d95595fdc27dee4af1ca8741431e188c7ff875bc
Parents: e78c014
Author: Abdelkader Midani <am...@apache.org>
Authored: Tue Jun 6 17:35:17 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
.../unomi/router/api/ImportConfiguration.java | 39 +++++++++++++++++++-
.../core/processor/LineSplitProcessor.java | 12 +++++-
.../route/ProfileImportOneShotRouteBuilder.java | 2 +-
.../ProfileImportSourceToKafkaRouteBuilder.java | 3 +-
.../resources/OSGI-INF/blueprint/blueprint.xml | 4 +-
.../services/ProfileImportServiceImpl.java | 2 +-
6 files changed, 55 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
index 770a7b5..29900f9 100644
--- a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
@@ -17,7 +17,6 @@
package org.apache.unomi.router.api;
import org.apache.unomi.api.Item;
-import org.apache.unomi.api.MetadataItem;
import java.util.HashMap;
import java.util.List;
@@ -41,6 +40,9 @@ public class ImportConfiguration extends Item {
private String mergingProperty;
private boolean overwriteExistingProfiles = false;
private List<String> propertiesToOverwrite;
+
+ private String columnSeparator = ",";
+ private String lineSeparator = "\n";
private boolean active = false;
/**
@@ -182,4 +184,39 @@ public class ImportConfiguration extends Item {
this.propertiesToOverwrite = propertiesToOverwrite;
}
+ /**
+ * gets the column separator.
+ */
+ public String getColumnSeparator() {
+ return this.columnSeparator;
+ }
+
+ /**
+ * Sets the column separator.
+ * @param columnSeparator property used to specify a line separator. Defaults to ','
+ */
+ public void setColumnSeparator(String columnSeparator) {
+ if(this.columnSeparator !=null) {
+ this.columnSeparator = columnSeparator;
+ }
+ }
+
+ /**
+ * gets the line separator.
+ */
+ public String getLineSeparator() {
+ return this.lineSeparator;
+ }
+
+ /**
+ * Sets the line separator.
+ * @param lineSeparator property used to specify a line separator. Defaults to '\n'
+ */
+ public void setLineSeparator(String lineSeparator) {
+ if(lineSeparator != null) {
+ this.lineSeparator = lineSeparator;
+ }
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/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 30f79bf..150ef6d 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
@@ -37,6 +37,7 @@ public class LineSplitProcessor implements Processor {
private List<String> propertiesToOverwrite;
private String mergingProperty;
private boolean overwriteExistingProfiles;
+ private String columnSeparator;
@Override
public void process(Exchange exchange) throws Exception {
@@ -47,8 +48,9 @@ public class LineSplitProcessor implements Processor {
propertiesToOverwrite = importConfigOneShot.getPropertiesToOverwrite();
mergingProperty = importConfigOneShot.getMergingProperty();
overwriteExistingProfiles = importConfigOneShot.isOverwriteExistingProfiles();
+ columnSeparator = importConfigOneShot.getColumnSeparator();
}
- String[] profileData = ((String)exchange.getIn().getBody()).split(",");
+ String[] profileData = ((String)exchange.getIn().getBody()).split(columnSeparator);
ProfileToImport profileToImport = new ProfileToImport();
profileToImport.setItemId(UUID.randomUUID().toString());
profileToImport.setItemType("profile");
@@ -101,4 +103,12 @@ public class LineSplitProcessor implements Processor {
this.mergingProperty = mergingProperty;
}
+ /**
+ * Sets the line separator.
+ * @param columnSeparator property used to specify a line separator. Defaults to ','
+ */
+ public void setColumnSeparator(String columnSeparator) {
+ this.columnSeparator = columnSeparator;
+ }
+
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
index 288d9d1..d095f3e 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
@@ -77,7 +77,7 @@ public class ProfileImportOneShotRouteBuilder extends RouteBuilder {
.routeId(IMPORT_ONESHOT_ROUTE_ID)
.autoStartup(true)
.process(importConfigByFileNameProcessor)
- .split(bodyAs(String.class).tokenize("\n"))
+ .split(bodyAs(String.class).tokenize("${in.header.importConfigOneShot.getLineSeparator}"))
.process(lineSplitProcessor)
.to("log:org.apache.unomi.router?level=INFO")
.marshal(jacksonDataFormat)
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
index 382b69d..37ae59e 100644
--- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
@@ -78,11 +78,12 @@ public class ProfileImportSourceToKafkaRouteBuilder extends RouteBuilder {
lineSplitProcessor.setOverwriteExistingProfiles(importConfiguration.isOverwriteExistingProfiles());
lineSplitProcessor.setPropertiesToOverwrite(importConfiguration.getPropertiesToOverwrite());
lineSplitProcessor.setMergingProperty(importConfiguration.getMergingProperty());
+ lineSplitProcessor.setColumnSeparator(importConfiguration.getColumnSeparator());
from((String) importConfiguration.getProperties().get("source"))
.routeId(importConfiguration.getItemId())// This allow identification of the route for manual start/stop
.autoStartup(importConfiguration.isActive())// Auto-start if the import configuration is set active
- .split(bodyAs(String.class).tokenize("\n"))
+ .split(bodyAs(String.class).tokenize(importConfiguration.getLineSeparator()))
.process(lineSplitProcessor)
.to("log:org.apache.unomi.router?level=INFO")
.marshal(jacksonDataFormat)
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/extensions/router/router-rest/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git 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
index 7e3b5d1..8728a7f 100644
--- 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
@@ -33,7 +33,7 @@
<cm:property-placeholder persistent-id="org.apache.unomi.cluster"
update-strategy="reload" placeholder-prefix="${cluster.">
<cm:default-properties>
- <cm:property name="contextserver.port" value="8181"/>
+ <cm:property name="cluster.contextserver.port" value="8181"/>
</cm:default-properties>
</cm:property-placeholder>
@@ -74,7 +74,7 @@
<bean id="importConfigurationServiceEndPoint" class="org.apache.unomi.router.rest.ImportConfigurationServiceEndPoint">
<property name="importConfigurationService" ref="importConfigurationService"/>
<property name="uploadDir" value="${import.oneshot.uploadDir}"/>
- <property name="serverPort" value="${contextserver.port}"/>
+ <property name="serverPort" value="${cluster.contextserver.port}"/>
</bean>
</blueprint>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/d95595fd/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 8097953..6dcc152 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
@@ -109,7 +109,7 @@ public class ProfileImportServiceImpl implements ProfileImportService, Synchrono
BeanUtils.copyProperties(existingProfile, profileToImport);
} else {
logger.warn("{} occurences found for profile with {} = {}. Profile import is skipped", existingProfiles.size(),
- profileToImport.getMergingProperty(), profileToImport.getProperties().get("firstName"));
+ profileToImport.getMergingProperty(), profileToImport.getProperties().get(profileToImport.getMergingProperty()));
}
logger.info("-------------------------------------");
return persistenceService.save(existingProfile);
[07/14] incubator-unomi git commit: [jgitflow-maven-plugin]updating
poms for dmf_1343 version
Posted by am...@apache.org.
[jgitflow-maven-plugin]updating poms for dmf_1343 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/b3c8953e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/b3c8953e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/b3c8953e
Branch: refs/heads/feature-DMF-1343
Commit: b3c8953ebae847d2e13f34e88c2585b12ae3494d
Parents: 0f44140
Author: Abdelkader Midani <am...@apache.org>
Authored: Tue May 23 02:28:32 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 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 +++---
kar/pom.xml | 32 +++++++++++-----------
lifecycle-watcher/pom.xml | 6 ++--
package/pom.xml | 4 +--
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/pom.xml | 2 +-
samples/tweet-button-plugin/pom.xml | 4 +--
services/pom.xml | 6 ++--
wab/pom.xml | 6 ++--
32 files changed, 91 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/api/pom.xml
----------------------------------------------------------------------
diff --git a/api/pom.xml b/api/pom.xml
index 6662b6f..b69b98e 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-api</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/geonames/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/pom.xml b/extensions/geonames/pom.xml
index f601a7c..7559e08 100644
--- a/extensions/geonames/pom.xml
+++ b/extensions/geonames/pom.xml
@@ -27,7 +27,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>cxs-geonames</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/geonames/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/rest/pom.xml b/extensions/geonames/rest/pom.xml
index cec5546..9df2e43 100644
--- a/extensions/geonames/rest/pom.xml
+++ b/extensions/geonames/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/geonames/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/geonames/services/pom.xml b/extensions/geonames/services/pom.xml
index e1e7310..a587de2 100644
--- a/extensions/geonames/services/pom.xml
+++ b/extensions/geonames/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<artifactId>cxs-geonames-services</artifactId>
<name>Apache Unomi :: Extensions :: Geonames Database :: Service</name>
<description>Service implementation for the Apache Unomi Context Server extension that integrates with the Geonames database</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/lists-extension/actions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/actions/pom.xml b/extensions/lists-extension/actions/pom.xml
index 91c0e8e..7fa81c2 100644
--- a/extensions/lists-extension/actions/pom.xml
+++ b/extensions/lists-extension/actions/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,21 +28,21 @@
<name>Apache Unomi :: Extensions :: Lists :: Actions</name>
<description>List extension rule actions for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/lists-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/pom.xml b/extensions/lists-extension/pom.xml
index 6542575..9ff0e52 100644
--- a/extensions/lists-extension/pom.xml
+++ b/extensions/lists-extension/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>cxs-lists-extension</artifactId>
<name>Apache Unomi :: Extensions :: Lists</name>
<description>List extension for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/lists-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/rest/pom.xml b/extensions/lists-extension/rest/pom.xml
index e4e9414..b8c2cbf 100644
--- a/extensions/lists-extension/rest/pom.xml
+++ b/extensions/lists-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -34,14 +34,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -77,7 +77,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/lists-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/lists-extension/services/pom.xml b/extensions/lists-extension/services/pom.xml
index d7ebedb..c31d346 100644
--- a/extensions/lists-extension/services/pom.xml
+++ b/extensions/lists-extension/services/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-lists-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -28,20 +28,20 @@
<name>Apache Unomi :: Extensions :: Lists :: Service</name>
<description>List extension service implementation for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 7126b61..6aa2fd8 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-extensions</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/privacy-extension/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/pom.xml b/extensions/privacy-extension/pom.xml
index 46e4315..fcc1aa2 100644
--- a/extensions/privacy-extension/pom.xml
+++ b/extensions/privacy-extension/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-extensions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>cxs-privacy-extension</artifactId>
<name>Apache Unomi :: Extensions :: Privacy</name>
<description>Privacy management extension for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>pom</packaging>
</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/privacy-extension/rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/rest/pom.xml b/extensions/privacy-extension/rest/pom.xml
index 0388a60..bd75e3f 100644
--- a/extensions/privacy-extension/rest/pom.xml
+++ b/extensions/privacy-extension/rest/pom.xml
@@ -20,7 +20,7 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -33,14 +33,14 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -76,7 +76,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/extensions/privacy-extension/services/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/privacy-extension/services/pom.xml b/extensions/privacy-extension/services/pom.xml
index 4afcde8..24998c9 100644
--- a/extensions/privacy-extension/services/pom.xml
+++ b/extensions/privacy-extension/services/pom.xml
@@ -20,27 +20,27 @@
<parent>
<artifactId>cxs-privacy-extension</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cxs-privacy-extension-services</artifactId>
<name>Apache Unomi :: Extensions :: Privacy :: Services</name>
<description>Privacy management extension service implementation for the Apache Unomi Context Server</description>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/kar/pom.xml
----------------------------------------------------------------------
diff --git a/kar/pom.xml b/kar/pom.xml
index 20d4257..f184ebc 100644
--- a/kar/pom.xml
+++ b/kar/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-kar</artifactId>
@@ -34,77 +34,77 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-base</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-request</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-mail</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins-optimization-test</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-lists-extension-actions</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-geonames-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-services</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>cxs-privacy-extension-rest</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.servicemix.bundles</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/lifecycle-watcher/pom.xml
----------------------------------------------------------------------
diff --git a/lifecycle-watcher/pom.xml b/lifecycle-watcher/pom.xml
index 419f7bf..9066ed1 100644
--- a/lifecycle-watcher/pom.xml
+++ b/lifecycle-watcher/pom.xml
@@ -16,13 +16,11 @@
~ limitations under the License.
-->
-<project xmlns="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">
+<project xmlns="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">
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index 19a8e4c..ae7c17e 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi</artifactId>
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/persistence-elasticsearch/core/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/pom.xml b/persistence-elasticsearch/core/pom.xml
index eb169ef..f75cd57 100644
--- a/persistence-elasticsearch/core/pom.xml
+++ b/persistence-elasticsearch/core/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
@@ -45,13 +45,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/persistence-elasticsearch/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/pom.xml b/persistence-elasticsearch/pom.xml
index 70a85ea..02b26c6 100644
--- a/persistence-elasticsearch/pom.xml
+++ b/persistence-elasticsearch/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/persistence-spi/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-spi/pom.xml b/persistence-spi/pom.xml
index 976f46c..9470c93 100644
--- a/persistence-spi/pom.xml
+++ b/persistence-spi/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-spi</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/baseplugin/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/pom.xml b/plugins/baseplugin/pom.xml
index 6efb0e5..5ccfabe 100644
--- a/plugins/baseplugin/pom.xml
+++ b/plugins/baseplugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-base</artifactId>
@@ -56,13 +56,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/hover-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/hover-event/pom.xml b/plugins/hover-event/pom.xml
index d83c662..02468af 100644
--- a/plugins/hover-event/pom.xml
+++ b/plugins/hover-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-hover-event</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/mail/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/mail/pom.xml b/plugins/mail/pom.xml
index e7dfdf6..bbf89e4 100644
--- a/plugins/mail/pom.xml
+++ b/plugins/mail/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-mail</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/optimization-test/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/optimization-test/pom.xml b/plugins/optimization-test/pom.xml
index 445e457..727feb4 100644
--- a/plugins/optimization-test/pom.xml
+++ b/plugins/optimization-test/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-optimization-test</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/past-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/past-event/pom.xml b/plugins/past-event/pom.xml
index eb37f52..449ecd9 100644
--- a/plugins/past-event/pom.xml
+++ b/plugins/past-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-past-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/pom.xml b/plugins/pom.xml
index 5de8cfb..8f6b71a 100644
--- a/plugins/pom.xml
+++ b/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins</artifactId>
@@ -44,7 +44,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/request/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/request/pom.xml b/plugins/request/pom.xml
index cd17202..c34acb1 100644
--- a/plugins/request/pom.xml
+++ b/plugins/request/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-request</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/plugins/tracked-event/pom.xml
----------------------------------------------------------------------
diff --git a/plugins/tracked-event/pom.xml b/plugins/tracked-event/pom.xml
index 68d3fdd..2c73e3f 100644
--- a/plugins/tracked-event/pom.xml
+++ b/plugins/tracked-event/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-plugins</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-plugins-tracked-event</artifactId>
@@ -34,13 +34,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch-core</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 376cf21..3881b47 100644
--- a/pom.xml
+++ b/pom.xml
@@ -35,7 +35,7 @@
event tracking server.
</description>
<url>http://unomi.incubator.apache.org</url>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<packaging>pom</packaging>
<licenses>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/rest/pom.xml
----------------------------------------------------------------------
diff --git a/rest/pom.xml b/rest/pom.xml
index f089dc0..1dc9223 100644
--- a/rest/pom.xml
+++ b/rest/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-rest</artifactId>
@@ -42,7 +42,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -84,7 +84,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!--<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/samples/pom.xml
----------------------------------------------------------------------
diff --git a/samples/pom.xml b/samples/pom.xml
index 67e0d6f..eefbe3a 100644
--- a/samples/pom.xml
+++ b/samples/pom.xml
@@ -19,7 +19,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/samples/tweet-button-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/samples/tweet-button-plugin/pom.xml b/samples/tweet-button-plugin/pom.xml
index c1725d5..a828682 100644
--- a/samples/tweet-button-plugin/pom.xml
+++ b/samples/tweet-button-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>samples</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>tweet-button-plugin</artifactId>
@@ -33,7 +33,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/services/pom.xml
----------------------------------------------------------------------
diff --git a/services/pom.xml b/services/pom.xml
index 2d5f345..1442eaf 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-services</artifactId>
@@ -34,7 +34,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -53,7 +53,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/b3c8953e/wab/pom.xml
----------------------------------------------------------------------
diff --git a/wab/pom.xml b/wab/pom.xml
index cb29c05..6d033ca 100644
--- a/wab/pom.xml
+++ b/wab/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-wab</artifactId>
@@ -43,13 +43,13 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
[02/14] incubator-unomi git commit: DMF-1343 : Update POM versions
Posted by am...@apache.org.
DMF-1343 : Update POM versions
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/e78c0145
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e78c0145
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e78c0145
Branch: refs/heads/feature-DMF-1343
Commit: e78c014564739f0b50aa382336d3240f97eb5cd7
Parents: 4f3b17f
Author: Abdelkader Midani <am...@apache.org>
Authored: Fri Jun 2 16:39:32 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
extensions/router/router-core/pom.xml | 2 +-
itests/pom.xml | 8 ++++----
performance-tests/pom.xml | 4 ++--
persistence-elasticsearch/plugins/pom.xml | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e78c0145/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
index b0b97c4..53780e7 100644
--- a/extensions/router/router-core/pom.xml
+++ b/extensions/router/router-core/pom.xml
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-api</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e78c0145/itests/pom.xml
----------------------------------------------------------------------
diff --git a/itests/pom.xml b/itests/pom.xml
index 6f3724c..55fe567 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-itests</artifactId>
<name>Apache Unomi :: Integration Tests</name>
@@ -32,19 +32,19 @@
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-kar</artifactId>
<classifier>features</classifier>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<type>xml</type>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-spi</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e78c0145/performance-tests/pom.xml
----------------------------------------------------------------------
diff --git a/performance-tests/pom.xml b/performance-tests/pom.xml
index 72c7abd..44117fc 100644
--- a/performance-tests/pom.xml
+++ b/performance-tests/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-root</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-performance-tests</artifactId>
<name>Apache Unomi :: Performance Tests</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-wab</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>${project.version}</version>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/e78c0145/persistence-elasticsearch/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/plugins/pom.xml b/persistence-elasticsearch/plugins/pom.xml
index 9114ece..57eec00 100644
--- a/persistence-elasticsearch/plugins/pom.xml
+++ b/persistence-elasticsearch/plugins/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.unomi</groupId>
<artifactId>unomi-persistence-elasticsearch</artifactId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-persistence-elasticsearch-plugins</artifactId>
[13/14] incubator-unomi git commit: DMF-1556 : Csv without First name,
and last name will show null, null in log file
Posted by am...@apache.org.
DMF-1556 : Csv without First name, and last name will show null, null in log file
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/63debd5f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/63debd5f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/63debd5f
Branch: refs/heads/feature-DMF-1343
Commit: 63debd5fcda21fda77aa20dc353267800bdcab74
Parents: d95595f
Author: Abdelkader Midani <am...@apache.org>
Authored: Tue Jun 6 17:58:31 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
.../router/services/ProfileImportServiceImpl.java | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/63debd5f/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 6dcc152..cb1d706 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
@@ -80,38 +80,37 @@ public class ProfileImportServiceImpl implements ProfileImportService, Synchrono
public boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException {
- logger.info("Importing profile: {}, {}", profileToImport.getProperties().get("firstName"), profileToImport.getProperties().get("lastName"));
+ logger.debug("Importing profile with ID : {}", profileToImport.getItemId());
Profile existingProfile = new Profile();
List<Profile> existingProfiles = persistenceService.query("properties."+profileToImport.getMergingProperty(), (String)profileToImport.getProperties().get(profileToImport.getMergingProperty()), null, Profile.class);
- logger.info("Query existing profile with mergingProperty: {}", profileToImport.getMergingProperty());
- logger.info("Found: {}", existingProfiles.size());
+ logger.debug("Query existing profile with mergingProperty: {}. Found: {}", profileToImport.getMergingProperty(), existingProfiles.size());
//Profile already exist, and import config allow to overwrite profiles
if(existingProfiles.size() == 1) {
existingProfile = existingProfiles.get(0);
if(profileToImport.isProfileToDelete()) {
- logger.info("Profile is to delete!");
+ logger.debug("Profile is to delete!");
persistenceService.remove(existingProfile.getItemId(), Profile.class);
return true;
}
List<String> propertiesToOverwrite = profileToImport.getPropertiesToOverwrite();
if(profileToImport.isOverwriteExistingProfiles() && propertiesToOverwrite!=null && propertiesToOverwrite.size() > 0) { // We overwrite only properties marked to overwrite
- logger.info("Properties to overwrite: {}", propertiesToOverwrite);
+ logger.debug("Properties to overwrite: {}", propertiesToOverwrite);
for(String propName : propertiesToOverwrite) {
existingProfile.getProperties().put(propName, profileToImport.getProperties().get(propName));
}
} else { //If no property is marked to overwrite we replace the whole properties map
- logger.info("Overwrite all properties");
+ logger.debug("Overwrite all properties");
existingProfile.setProperties(profileToImport.getProperties());
}
} else if(existingProfiles.size() == 0) {
- logger.info("New profile to add...");
+ logger.debug("New profile to add...");
BeanUtils.copyProperties(existingProfile, profileToImport);
} else {
logger.warn("{} occurences found for profile with {} = {}. Profile import is skipped", existingProfiles.size(),
profileToImport.getMergingProperty(), profileToImport.getProperties().get(profileToImport.getMergingProperty()));
}
- logger.info("-------------------------------------");
+ logger.debug("-------------------------------------");
return persistenceService.save(existingProfile);
}
[05/14] incubator-unomi git commit: DMF-1343 : Move unomi-router
under extensions
Posted by am...@apache.org.
DMF-1343 : Move unomi-router under extensions
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/9cffa13e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/9cffa13e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/9cffa13e
Branch: refs/heads/feature-DMF-1343
Commit: 9cffa13e80375b3bfbee14bdbfd0be291f75d0fa
Parents: f65173c
Author: Abdelkader Midani <am...@apache.org>
Authored: Wed May 24 15:19:55 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
extensions/pom.xml | 1 +
extensions/router/pom.xml | 64 +++++++
extensions/router/router-api/pom.xml | 43 +++++
.../unomi/router/api/ImportConfiguration.java | 185 +++++++++++++++++++
.../unomi/router/api/ProfileToImport.java | 77 ++++++++
.../services/ImportConfigurationService.java | 60 ++++++
.../api/services/ProfileImportService.java | 29 +++
extensions/router/router-core/pom.xml | 182 ++++++++++++++++++
.../core/context/ProfileImportCamelContext.java | 165 +++++++++++++++++
.../core/processor/ConfigUpdateProcessor.java | 44 +++++
.../ImportConfigByFileNameProcessor.java | 44 +++++
.../core/processor/LineSplitProcessor.java | 104 +++++++++++
.../core/processor/UnomiStorageProcessor.java | 46 +++++
.../ProfileImportConfigUpdateRouteBuilder.java | 62 +++++++
.../ProfileImportKafkaToUnomiRouteBuilder.java | 77 ++++++++
.../route/ProfileImportOneShotRouteBuilder.java | 99 ++++++++++
.../ProfileImportSourceToKafkaRouteBuilder.java | 119 ++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 94 ++++++++++
.../main/resources/org.apache.unomi.router.cfg | 23 +++
extensions/router/router-karaf-feature/pom.xml | 157 ++++++++++++++++
extensions/router/router-rest/pom.xml | 75 ++++++++
.../ImportConfigurationServiceEndPoint.java | 167 +++++++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 72 ++++++++
extensions/router/router-service/pom.xml | 104 +++++++++++
.../ImportConfigurationServiceImpl.java | 114 ++++++++++++
.../services/ProfileImportServiceImpl.java | 122 ++++++++++++
.../resources/OSGI-INF/blueprint/blueprint.xml | 39 ++++
pom.xml | 1 -
router/pom.xml | 64 -------
router/router-api/pom.xml | 43 -----
.../unomi/router/api/ImportConfiguration.java | 185 -------------------
.../unomi/router/api/ProfileToImport.java | 77 --------
.../services/ImportConfigurationService.java | 60 ------
.../api/services/ProfileImportService.java | 29 ---
router/router-core/pom.xml | 182 ------------------
.../core/context/ProfileImportCamelContext.java | 165 -----------------
.../core/processor/ConfigUpdateProcessor.java | 44 -----
.../ImportConfigByFileNameProcessor.java | 44 -----
.../core/processor/LineSplitProcessor.java | 104 -----------
.../core/processor/UnomiStorageProcessor.java | 46 -----
.../ProfileImportConfigUpdateRouteBuilder.java | 62 -------
.../ProfileImportKafkaToUnomiRouteBuilder.java | 77 --------
.../route/ProfileImportOneShotRouteBuilder.java | 99 ----------
.../ProfileImportSourceToKafkaRouteBuilder.java | 119 ------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 94 ----------
.../main/resources/org.apache.unomi.router.cfg | 23 ---
router/router-karaf-feature/pom.xml | 157 ----------------
router/router-rest/pom.xml | 75 --------
.../ImportConfigurationServiceEndPoint.java | 167 -----------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 72 --------
router/router-service/pom.xml | 104 -----------
.../ImportConfigurationServiceImpl.java | 114 ------------
.../services/ProfileImportServiceImpl.java | 122 ------------
.../resources/OSGI-INF/blueprint/blueprint.xml | 39 ----
54 files changed, 2368 insertions(+), 2368 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/pom.xml b/extensions/pom.xml
index 6aa2fd8..8a874a6 100644
--- a/extensions/pom.xml
+++ b/extensions/pom.xml
@@ -34,6 +34,7 @@
<module>lists-extension</module>
<module>privacy-extension</module>
<module>geonames</module>
+ <module>router</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/pom.xml b/extensions/router/pom.xml
new file mode 100644
index 0000000..c69320c
--- /dev/null
+++ b/extensions/router/pom.xml
@@ -0,0 +1,64 @@
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-extensions</artifactId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>unomi-router</artifactId>
+ <name>Apache Unomi :: Extensions :: Router</name>
+ <description>Apache Camel Router for the Apache Unomi Context server</description>
+ <packaging>pom</packaging>
+
+ <properties>
+ <camel.version>2.18.3</camel.version>
+ </properties>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ sun.misc;resolution:=optional,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <modules>
+ <module>router-api</module>
+ <module>router-service</module>
+ <module>router-core</module>
+ <module>router-rest</module>
+ <module>router-karaf-feature</module>
+ </modules>
+
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/pom.xml b/extensions/router/router-api/pom.xml
new file mode 100644
index 0000000..06207b3
--- /dev/null
+++ b/extensions/router/router-api/pom.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-api</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: API</name>
+ <description>Router Specification API</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
new file mode 100644
index 0000000..770a7b5
--- /dev/null
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
@@ -0,0 +1,185 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api;
+
+import org.apache.unomi.api.Item;
+import org.apache.unomi.api.MetadataItem;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amidani on 28/04/2017.
+ */
+public class ImportConfiguration extends Item {
+
+ /**
+ * The ImportConfiguration ITEM_TYPE
+ *
+ * @see Item for a discussion of ITEM_TYPE
+ */
+ public static final String ITEM_TYPE = "importConfig";
+ private String name;
+ private String description;
+ private String configType;
+ private Map<String, Object> properties = new HashMap<>();
+ private String mergingProperty;
+ private boolean overwriteExistingProfiles = false;
+ private List<String> propertiesToOverwrite;
+ private boolean active = false;
+
+ /**
+ * Sets the property identified by the specified name to the specified value. If a property with that name already exists, replaces its value, otherwise adds the new
+ * property with the specified name and value.
+ *
+ * @param name the name of the property to set
+ * @param value the value of the property
+ */
+ public void setProperty(String name, Object value) {
+ properties.put(name, value);
+ }
+
+ /**
+ * Retrieves the name of the import configuration
+ * @return the name of the import configuration
+ */
+ public String getName() { return this.name; }
+
+ /**
+ * Sets the name of the import configuration
+ * @param name the name of the import configuration
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Retrieves the description of the import configuration
+ * @return the description of the import configuration
+ */
+ public String getDescription() { return this.description; }
+
+ /**
+ * Sets the description of the import configuration
+ * @param description the description of the import configuration
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+
+ /**
+ * Retrieves the config type of the import configuration
+ * @return the config type of the import configuration
+ */
+ public String getConfigType() { return this.configType; }
+
+ /**
+ * Sets the config type of the import configuration
+ * @param configType the config type of the import configuration
+ */
+ public void setConfigType(String configType) {
+ this.configType = configType;
+ }
+
+ /**
+ * Retrieves the property identified by the specified name.
+ *
+ * @param name the name of the property to retrieve
+ * @return the value of the specified property or {@code null} if no such property exists
+ */
+ public Object getProperty(String name) {
+ return properties.get(name);
+ }
+
+ /**
+ * Retrieves a Map of all property name - value pairs for this import configuration.
+ *
+ * @return a Map of all property name - value pairs for this import configuration
+ */
+ public Map<String, Object> getProperties() {
+ return properties;
+ }
+
+ /**
+ * Sets the property name - value pairs for this import configuration.
+ *
+ * @param properties a Map containing the property name - value pairs for this import configuration
+ */
+ public void setProperties(Map<String, Object> properties) {
+ this.properties = properties;
+ }
+
+ public String getMergingProperty() {
+ return mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+
+ /**
+ * Retrieves the import configuration active flag.
+ *
+ * @return true if the import configuration is active false if not
+ */
+ public boolean isActive() {
+ return this.active;
+ }
+
+ /**
+ * Sets the active flag true/false.
+ *
+ * @param active a boolean to set to active or inactive the import configuration
+ */
+ public void setActive(boolean active) {
+ this.active = active;
+ }
+
+ /**
+ * Retrieves the import configuration overwriteExistingProfiles flag.
+ *
+ * @return true if during the import existing profiles must be overwritten
+ */
+ public boolean isOverwriteExistingProfiles() {
+ return this.overwriteExistingProfiles;
+ }
+
+ /**
+ * Sets the overwriteExistingProfiles flag true/false.
+ *
+ * @param overwriteExistingProfiles a boolean to set overwriteExistingProfiles in the import configuration
+ */
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public List<String> getPropertiesToOverwrite() {
+ return propertiesToOverwrite;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
new file mode 100644
index 0000000..30e40e0
--- /dev/null
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/ProfileToImport.java
@@ -0,0 +1,77 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.unomi.router.api;
+
+import org.apache.unomi.api.Profile;
+
+import java.util.List;
+
+/**
+ * An extension of {@link Profile} to handle merge strategy and deletion when importing profiles
+ */
+public class ProfileToImport extends Profile {
+
+ private List<String> propertiesToOverwrite;
+ private String mergingProperty;
+ private boolean profileToDelete;
+ private boolean overwriteExistingProfiles;
+
+
+ public List<String> getPropertiesToOverwrite() {
+ return this.propertiesToOverwrite;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+ public boolean isProfileToDelete() {
+ return this.profileToDelete;
+ }
+
+ public void setProfileToDelete(boolean profileToDelete) {
+ this.profileToDelete = profileToDelete;
+ }
+
+ public boolean isOverwriteExistingProfiles() {
+ return this.overwriteExistingProfiles;
+ }
+
+ /**
+ * Sets the overwriteExistingProfiles flag.
+ * @param overwriteExistingProfiles flag used to specify if we want to overwrite existing profiles
+ */
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public String getMergingProperty() {
+ return this.mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
new file mode 100644
index 0000000..cacd671
--- /dev/null
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ImportConfigurationService.java
@@ -0,0 +1,60 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api.services;
+
+import org.apache.unomi.router.api.ImportConfiguration;
+
+import java.util.List;
+
+/**
+ * A service to access and operate on {@link ImportConfiguration}s.
+ */
+public interface ImportConfigurationService {
+
+ /**
+ * Retrieves all the import configurations.
+ *
+ * @return the list of import configurations
+ */
+ public List<ImportConfiguration> getImportConfigurations();
+
+ /**
+ * Retrieves the import configuration identified by the specified identifier.
+ *
+ * @param configId the identifier of the profile to retrieve
+ * @return the import configuration identified by the specified identifier or
+ * {@code null} if no such import configuration exists
+ */
+ public ImportConfiguration load(String configId);
+
+ /**
+ * Saves the specified import configuration in the context server.
+ *
+ * @param profile the import configuration to be saved
+ * @return the newly saved import configuration
+ */
+ public ImportConfiguration save(ImportConfiguration profile);
+
+ /**
+ * Deletes the import configuration identified by the specified identifier.
+ *
+ * @param configId the identifier of the import configuration to delete
+ */
+ public void delete(String configId);
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
new file mode 100644
index 0000000..aa7d182
--- /dev/null
+++ b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/services/ProfileImportService.java
@@ -0,0 +1,29 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.api.services;
+
+import org.apache.unomi.router.api.ProfileToImport;
+
+import java.lang.reflect.InvocationTargetException;
+
+/**
+ * Created by amidani on 20/05/2017.
+ */
+public interface ProfileImportService {
+
+ boolean saveMergeDeleteImportedProfile(ProfileToImport profileToImport) throws InvocationTargetException, IllegalAccessException;
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/pom.xml b/extensions/router/router-core/pom.xml
new file mode 100644
index 0000000..b0b97c4
--- /dev/null
+++ b/extensions/router/router-core/pom.xml
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-core</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Core</name>
+ <description>Router Core (Apache Camel Routes)</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-services</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>1.2.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jackson</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http-common</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kafka</artifactId>
+ <version>${camel.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.commons</groupId>
+ <artifactId>commons-lang3</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
+ <version>0.1.54_1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>0.10.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Embed-Dependency>*;scope=compile|runtime</Embed-Dependency>
+ <Import-Package>
+ org.osgi.service.event;resolution:=optional,
+ org.apache.camel,
+ org.apache.camel.builder,
+ org.apache.camel.component.file.remote,
+ org.apache.camel.component.file,
+ org.apache.camel.component.jackson,
+ org.apache.camel.component.kafka,
+ org.apache.camel.component.servlet,
+ org.apache.camel.component.servlet.osgi,
+ org.apache.camel.impl,
+ org.apache.camel.model,
+ org.apache.camel.model.dataformat,
+ org.apache.camel.model.rest,
+ org.apache.camel.spi,
+ org.apache.unomi.api,
+ org.apache.unomi.router.api,
+ org.apache.unomi.api.services,
+ org.apache.unomi.router.api.services,
+ org.apache.kafka.clients.producer;resolution:=optional,
+ org.apache.kafka.clients.consumer;resolution:=optional,
+ com.jcraft.jsch,
+ org.osgi.framework,
+ org.osgi.service.http,
+ org.slf4j
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>attach-artifacts</id>
+ <phase>package</phase>
+ <goals>
+ <goal>attach-artifact</goal>
+ </goals>
+ <configuration>
+ <artifacts>
+ <artifact>
+ <file>
+ src/main/resources/org.apache.unomi.router.cfg
+ </file>
+ <type>cfg</type>
+ <classifier>routercfg</classifier>
+ </artifact>
+ </artifacts>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+
+
+
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/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
new file mode 100644
index 0000000..2f3eaad
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
@@ -0,0 +1,165 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.context;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.Route;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
+import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
+import org.apache.unomi.router.core.route.ProfileImportKafkaToUnomiRouteBuilder;
+import org.apache.unomi.router.core.route.ProfileImportOneShotRouteBuilder;
+import org.apache.unomi.router.core.route.ProfileImportSourceToKafkaRouteBuilder;
+import org.osgi.framework.Bundle;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.BundleEvent;
+import org.osgi.framework.SynchronousBundleListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * Created by amidani on 04/05/2017.
+ */
+public class ProfileImportCamelContext implements SynchronousBundleListener {
+
+ private Logger logger = LoggerFactory.getLogger(ProfileImportCamelContext.class.getName());
+
+ private CamelContext camelContext;
+ private UnomiStorageProcessor unomiStorageProcessor;
+ private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
+ private ImportConfigurationService importConfigurationService;
+ private JacksonDataFormat jacksonDataFormat;
+ private String uploadDir;
+ private Map<String, String> kafkaProps;
+
+ private BundleContext bundleContext;
+
+ public void setBundleContext(BundleContext bundleContext) {
+ this.bundleContext = bundleContext;
+ }
+
+ public void initCamelContext() throws Exception {
+ logger.info("Initialize Camel Context...");
+ camelContext = new DefaultCamelContext();
+ List<ImportConfiguration> importConfigurationList = importConfigurationService.getImportConfigurations();
+ ProfileImportSourceToKafkaRouteBuilder builderReader = new ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
+ builderReader.setImportConfigurationList(importConfigurationList);
+ builderReader.setJacksonDataFormat(jacksonDataFormat);
+ builderReader.setContext(camelContext);
+ camelContext.addRoutes(builderReader);
+
+ //One shot import route
+ ProfileImportOneShotRouteBuilder builderOneShot = new ProfileImportOneShotRouteBuilder(kafkaProps);
+ builderOneShot.setImportConfigByFileNameProcessor(importConfigByFileNameProcessor);
+ builderOneShot.setJacksonDataFormat(jacksonDataFormat);
+ builderOneShot.setUploadDir(uploadDir);
+ builderOneShot.setContext(camelContext);
+ camelContext.addRoutes(builderOneShot);
+
+
+ ProfileImportKafkaToUnomiRouteBuilder builderProcessor = new ProfileImportKafkaToUnomiRouteBuilder(kafkaProps);
+ builderProcessor.setUnomiStorageProcessor(unomiStorageProcessor);
+ builderProcessor.setJacksonDataFormat(jacksonDataFormat);
+ builderProcessor.setContext(camelContext);
+ camelContext.addRoutes(builderProcessor);
+
+ camelContext.start();
+
+ logger.debug("postConstruct {" + bundleContext.getBundle() + "}");
+
+ processBundleStartup(bundleContext);
+ for (Bundle bundle : bundleContext.getBundles()) {
+ if (bundle.getBundleContext() != null) {
+ processBundleStartup(bundle.getBundleContext());
+ }
+ }
+ bundleContext.addBundleListener(this);
+ logger.info("Camel Context {} initialized successfully.");
+
+ }
+
+ private boolean stopRoute(String routeId) throws Exception {
+ return camelContext.stopRoute(routeId, 10L, TimeUnit.SECONDS, true);
+ }
+
+ public void updateProfileImportReaderRoute(ImportConfiguration importConfiguration) throws Exception {
+ Route route = camelContext.getRoute(importConfiguration.getItemId());
+ 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);
+ }
+
+ public CamelContext getCamelContext() {
+ return camelContext;
+ }
+
+ public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
+ this.unomiStorageProcessor = unomiStorageProcessor;
+ }
+
+ public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
+ this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
+ }
+
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ public void setKafkaProps(Map<String, String> kafkaProps) {
+ this.kafkaProps = kafkaProps;
+ }
+
+ public void preDestroy() throws Exception {
+ bundleContext.removeBundleListener(this);
+ //This is to shutdown Camel context
+ //(will stop all routes/components/endpoints etc and clear internal state/cache)
+ this.camelContext.stop();
+ logger.info("Camel context for profile import is shutdown.");
+ }
+
+ private void processBundleStartup(BundleContext bundleContext) {
+ if (bundleContext == null) {
+ return;
+ }
+ }
+
+ @Override
+ public void bundleChanged(BundleEvent bundleEvent) {
+
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
new file mode 100644
index 0000000..e4eaa19
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ConfigUpdateProcessor.java
@@ -0,0 +1,44 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.context.ProfileImportCamelContext;
+
+/**
+ * Created by amidani on 10/05/2017.
+ */
+public class ConfigUpdateProcessor implements Processor{
+
+ private ProfileImportCamelContext profileImportCamelContext;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ if (exchange.getIn() != null) {
+ Message message = exchange.getIn();
+ ImportConfiguration importConfiguration = message.getBody(ImportConfiguration.class);
+ profileImportCamelContext.updateProfileImportReaderRoute(importConfiguration);
+ }
+ }
+
+ public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
+ this.profileImportCamelContext = profileImportCamelContext;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
new file mode 100644
index 0000000..7fc7730
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportConfigByFileNameProcessor.java
@@ -0,0 +1,44 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.file.GenericFile;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.services.ImportConfigurationService;
+
+/**
+ * Created by amidani on 22/05/2017.
+ */
+public class ImportConfigByFileNameProcessor implements Processor{
+
+ private ImportConfigurationService importConfigurationService;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+
+ String fileName = exchange.getIn().getBody(GenericFile.class).getFileName();
+ String importConfigId = fileName.substring(0, fileName.indexOf('.'));
+ ImportConfiguration importConfiguration = importConfigurationService.load(importConfigId);
+ exchange.getIn().setHeader("importConfigOneShot", importConfiguration);
+ }
+
+ public void setImportConfigurationService(ImportConfigurationService importConfigurationService) {
+ this.importConfigurationService = importConfigurationService;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/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
new file mode 100644
index 0000000..30f79bf
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
@@ -0,0 +1,104 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.component.kafka.KafkaConstants;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.api.ProfileToImport;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+
+/**
+ * Created by amidani on 29/12/2016.
+ */
+public class LineSplitProcessor implements Processor {
+
+ private Map<String, Integer> fieldsMapping;
+ private List<String> propertiesToOverwrite;
+ private String mergingProperty;
+ private boolean overwriteExistingProfiles;
+
+ @Override
+ public void process(Exchange exchange) throws Exception {
+ //In case of one shot import we check the header and overwrite import config
+ ImportConfiguration importConfigOneShot = (ImportConfiguration) exchange.getIn().getHeader("importConfigOneShot");
+ if(importConfigOneShot!=null) {
+ fieldsMapping = (Map<String, Integer>)importConfigOneShot.getProperties().get("mapping");
+ propertiesToOverwrite = importConfigOneShot.getPropertiesToOverwrite();
+ mergingProperty = importConfigOneShot.getMergingProperty();
+ overwriteExistingProfiles = importConfigOneShot.isOverwriteExistingProfiles();
+ }
+ String[] profileData = ((String)exchange.getIn().getBody()).split(",");
+ ProfileToImport profileToImport = new ProfileToImport();
+ profileToImport.setItemId(UUID.randomUUID().toString());
+ profileToImport.setItemType("profile");
+ profileToImport.setScope("system");
+ if(profileData.length > 0) {
+ Map<String, Object> properties = new HashMap<>();
+ for(String fieldMappingKey : fieldsMapping.keySet()) {
+ if(profileData.length > fieldsMapping.get(fieldMappingKey)) {
+ properties.put(fieldMappingKey, profileData[fieldsMapping.get(fieldMappingKey)].trim());
+ }
+ }
+ profileToImport.setProperties(properties);
+ profileToImport.setMergingProperty(mergingProperty);
+ profileToImport.setPropertiesToOverwrite(propertiesToOverwrite);
+ profileToImport.setOverwriteExistingProfiles(overwriteExistingProfiles);
+ if(StringUtils.isNotBlank(profileData[profileData.length - 1]) && Boolean.parseBoolean(profileData[profileData.length - 1].trim())) {
+ profileToImport.setProfileToDelete(true);
+ }
+ }
+ exchange.getIn().setBody(profileToImport, ProfileToImport.class);
+ exchange.getIn().setHeader(KafkaConstants.PARTITION_KEY, 0);
+ exchange.getIn().setHeader(KafkaConstants.KEY, "1");
+ }
+
+ /**
+ * Setter of fieldsMapping
+ * @param fieldsMapping map String,Integer fieldName in ES and the matching column index in the import file
+ */
+ public void setFieldsMapping(Map<String, Integer> fieldsMapping) {
+ this.fieldsMapping = fieldsMapping;
+ }
+
+ public void setPropertiesToOverwrite(List<String> propertiesToOverwrite) {
+ this.propertiesToOverwrite = propertiesToOverwrite;
+ }
+
+ public void setOverwriteExistingProfiles(boolean overwriteExistingProfiles) {
+ this.overwriteExistingProfiles = overwriteExistingProfiles;
+ }
+
+ public String getMergingProperty() {
+ return this.mergingProperty;
+ }
+
+ /**
+ * Sets the merging property.
+ * @param mergingProperty property used to check if the profile exist when merging
+ */
+ public void setMergingProperty(String mergingProperty) {
+ this.mergingProperty = mergingProperty;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
new file mode 100644
index 0000000..7e55185
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java
@@ -0,0 +1,46 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.processor;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Message;
+import org.apache.camel.Processor;
+import org.apache.unomi.router.api.ProfileToImport;
+import org.apache.unomi.router.api.services.ProfileImportService;
+
+/**
+ * Created by amidani on 29/12/2016.
+ */
+public class UnomiStorageProcessor implements Processor {
+
+ private ProfileImportService profileImportService;
+
+ @Override
+ public void process(Exchange exchange)
+ throws Exception {
+ if (exchange.getIn() != null) {
+ Message message = exchange.getIn();
+
+ ProfileToImport profileToImport = (ProfileToImport) message.getBody();
+ profileImportService.saveMergeDeleteImportedProfile(profileToImport);
+ }
+ }
+
+ public void setProfileImportService(ProfileImportService profileImportService) {
+ this.profileImportService = profileImportService;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
new file mode 100644
index 0000000..ac71798
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
@@ -0,0 +1,62 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.model.rest.RestBindingMode;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.context.ProfileImportCamelContext;
+import org.apache.unomi.router.core.processor.ConfigUpdateProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Created by amidani on 10/05/2017.
+ */
+public class ProfileImportConfigUpdateRouteBuilder extends RouteBuilder {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportConfigUpdateRouteBuilder.class.getName());
+
+ private ProfileImportCamelContext profileImportCamelContext;
+
+ @Override
+ public void configure() throws Exception {
+ logger.info("Preparing REST Configuration for servlet with context path [/importConfigAdmin]");
+ restConfiguration().component("servlet")
+ .contextPath("/importConfigAdmin")
+ .enableCORS(true)
+ .bindingMode(RestBindingMode.json)
+ .dataFormatProperty("prettyPrint", "true");
+
+ rest().put("/").consumes("application/json").type(ImportConfiguration.class)
+ .to("direct:importConfigRestDeposit");
+ ConfigUpdateProcessor profileImportConfigUpdateProcessor = new ConfigUpdateProcessor();
+ profileImportConfigUpdateProcessor.setProfileImportCamelContext(profileImportCamelContext);
+ from("direct:importConfigRestDeposit")
+ .process(profileImportConfigUpdateProcessor)
+ .transform().constant("Success.")
+ .onException(Exception.class)
+ .transform().constant("Failure!");
+
+
+ }
+
+ public void setProfileImportCamelContext(ProfileImportCamelContext profileImportCamelContext) {
+ this.profileImportCamelContext = profileImportCamelContext;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
new file mode 100644
index 0000000..1b056fe
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportKafkaToUnomiRouteBuilder.java
@@ -0,0 +1,77 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.core.processor.UnomiStorageProcessor;
+
+import java.util.Map;
+
+/**
+ * Created by amidani on 26/04/2017.
+ */
+public class ProfileImportKafkaToUnomiRouteBuilder extends RouteBuilder {
+
+ private UnomiStorageProcessor unomiStorageProcessor;
+ private JacksonDataFormat jacksonDataFormat;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ public ProfileImportKafkaToUnomiRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+kafkaImportGroupId);
+ }
+ kafkaUri.append("&autoCommitEnable=true&consumersCount=10");
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+ from(endpoint)
+ .unmarshal(jacksonDataFormat)
+ .process(unomiStorageProcessor)
+ .to("log:org.apache.unomi.router?level=INFO");
+
+ }
+
+ public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
+ this.unomiStorageProcessor = unomiStorageProcessor;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
new file mode 100644
index 0000000..288d9d1
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
@@ -0,0 +1,99 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor;
+import org.apache.unomi.router.core.processor.LineSplitProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+/**
+ * Created by amidani on 22/05/2017.
+ */
+public class ProfileImportOneShotRouteBuilder extends RouteBuilder {
+
+ private Logger logger = LoggerFactory.getLogger(ProfileImportOneShotRouteBuilder.class.getName());
+
+ private ImportConfigByFileNameProcessor importConfigByFileNameProcessor;
+ private JacksonDataFormat jacksonDataFormat;
+ private String uploadDir;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ private final String IMPORT_ONESHOT_ROUTE_ID = "ONE_SHOT_ROUTE";
+
+ public ProfileImportOneShotRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+
+ //Prepare Kafka Deposit
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+ kafkaImportGroupId);
+ }
+
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+
+ LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
+
+
+ from("file://"+uploadDir+"?include=.*.csv&consumer.delay=1m")
+ .routeId(IMPORT_ONESHOT_ROUTE_ID)
+ .autoStartup(true)
+ .process(importConfigByFileNameProcessor)
+ .split(bodyAs(String.class).tokenize("\n"))
+ .process(lineSplitProcessor)
+ .to("log:org.apache.unomi.router?level=INFO")
+ .marshal(jacksonDataFormat)
+ .convertBodyTo(String.class)
+ .to(endpoint);
+ }
+
+ public void setImportConfigByFileNameProcessor(ImportConfigByFileNameProcessor importConfigByFileNameProcessor) {
+ this.importConfigByFileNameProcessor = importConfigByFileNameProcessor;
+ }
+
+ public void setUploadDir(String uploadDir) {
+ this.uploadDir = uploadDir;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
new file mode 100644
index 0000000..382b69d
--- /dev/null
+++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportSourceToKafkaRouteBuilder.java
@@ -0,0 +1,119 @@
+/*
+ * 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 express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.unomi.router.core.route;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.jackson.JacksonDataFormat;
+import org.apache.camel.component.kafka.KafkaComponent;
+import org.apache.camel.component.kafka.KafkaConfiguration;
+import org.apache.camel.component.kafka.KafkaEndpoint;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.unomi.router.api.ImportConfiguration;
+import org.apache.unomi.router.core.processor.LineSplitProcessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * Created by amidani on 26/04/2017.
+ */
+
+public class ProfileImportSourceToKafkaRouteBuilder extends RouteBuilder {
+
+ private static final Logger logger = LoggerFactory.getLogger(ProfileImportSourceToKafkaRouteBuilder.class.getName());
+
+ private List<ImportConfiguration> importConfigurationList;
+ private JacksonDataFormat jacksonDataFormat;
+ private String kafkaHost;
+ private String kafkaPort;
+ private String kafkaImportTopic;
+ private String kafkaImportGroupId;
+
+ public ProfileImportSourceToKafkaRouteBuilder(Map<String, String> kafkaProps) {
+ kafkaHost = kafkaProps.get("kafkaHost");
+ kafkaPort = kafkaProps.get("kafkaPort");
+ kafkaImportTopic = kafkaProps.get("kafkaImportTopic");
+ kafkaImportGroupId = kafkaProps.get("kafkaImportGroupId");
+ }
+
+ @Override
+ public void configure() throws Exception {
+ //Prepare Kafka Deposit
+ StringBuilder kafkaUri = new StringBuilder("kafka:");
+ kafkaUri.append(kafkaHost).append(":").append(kafkaPort).append("?topic=").append(kafkaImportTopic);
+ if(StringUtils.isNotBlank(kafkaImportGroupId)) {
+ kafkaUri.append("&groupId="+ kafkaImportGroupId);
+ }
+
+ KafkaConfiguration kafkaConfiguration = new KafkaConfiguration();
+ kafkaConfiguration.setBrokers(kafkaHost+":"+kafkaPort);
+ kafkaConfiguration.setTopic(kafkaImportTopic);
+ kafkaConfiguration.setGroupId(kafkaImportGroupId);
+ KafkaEndpoint endpoint = new KafkaEndpoint(kafkaUri.toString(), new KafkaComponent(this.getContext()));
+ endpoint.setConfiguration(kafkaConfiguration);
+
+ //Loop on multiple import configuration
+ for(ImportConfiguration importConfiguration : importConfigurationList) {
+ if(importConfiguration.getProperties().size() > 0 &&
+ StringUtils.isNotEmpty((String) importConfiguration.getProperties().get("source"))) {
+ //Prepare Split Processor
+ LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
+ lineSplitProcessor.setFieldsMapping((Map<String, Integer>) importConfiguration.getProperties().get("mapping"));
+ lineSplitProcessor.setOverwriteExistingProfiles(importConfiguration.isOverwriteExistingProfiles());
+ lineSplitProcessor.setPropertiesToOverwrite(importConfiguration.getPropertiesToOverwrite());
+ lineSplitProcessor.setMergingProperty(importConfiguration.getMergingProperty());
+
+ from((String) importConfiguration.getProperties().get("source"))
+ .routeId(importConfiguration.getItemId())// This allow identification of the route for manual start/stop
+ .autoStartup(importConfiguration.isActive())// Auto-start if the import configuration is set active
+ .split(bodyAs(String.class).tokenize("\n"))
+ .process(lineSplitProcessor)
+ .to("log:org.apache.unomi.router?level=INFO")
+ .marshal(jacksonDataFormat)
+ .convertBodyTo(String.class)
+ .to(endpoint);
+ }
+ }
+ }
+
+ public void setImportConfigurationList(List<ImportConfiguration> importConfigurationList) {
+ this.importConfigurationList = importConfigurationList;
+ }
+
+ public void setJacksonDataFormat(JacksonDataFormat jacksonDataFormat) {
+ this.jacksonDataFormat = jacksonDataFormat;
+ }
+
+ public void setKafkaHost(String kafkaHost) {
+ this.kafkaHost = kafkaHost;
+ }
+
+ public void setKafkaPort(String kafkaPort) {
+ this.kafkaPort = kafkaPort;
+ }
+
+ public void setKafkaImportTopic(String kafkaImportTopic) {
+ this.kafkaImportTopic = kafkaImportTopic;
+ }
+
+ public void setKafkaImportGroupId(String kafkaImportGroupId) {
+ this.kafkaImportGroupId = kafkaImportGroupId;
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
new file mode 100644
index 0000000..ff29755
--- /dev/null
+++ b/extensions/router/router-core/src/main/resources/OSGI-INF/blueprint/blueprint.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<blueprint xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"
+ xmlns:cm="http://aries.apache.org/blueprint/xmlns/blueprint-cm/v1.1.0"
+ xmlns:camel="http://camel.apache.org/schema/blueprint"
+ xsi:schemaLocation="http://www.osgi.org/xmlns/blueprint/v1.0.0 http://www.osgi.org/xmlns/blueprint/v1.0.0/blueprint.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
+ http://camel.apache.org/schema/blueprint http://camel.apache.org/schema/blueprint/camel-blueprint.xsd">
+
+ <cm:property-placeholder persistent-id="org.apache.unomi.router" update-strategy="reload">
+ <cm:default-properties>
+ <cm:property name="kafka.host" value="localhost"/>
+ <cm:property name="kafka.port" value="9092"/>
+ <cm:property name="kafka.import.topic" value="camel-deposit"/>
+ <cm:property name="kafka.import.groupId" value="unomi-import-group"/>
+ <cm:property name="import.oneshot.uploadDir" value="/tmp/oneshot_import_configs/"/>
+ </cm:default-properties>
+ </cm:property-placeholder>
+
+ <bean id="unomiStorageProcessor" class="org.apache.unomi.router.core.processor.UnomiStorageProcessor">
+ <property name="profileImportService" ref="profileImportService"/>
+ </bean>
+
+ <bean id="importConfigByFileNameProcessor" class="org.apache.unomi.router.core.processor.ImportConfigByFileNameProcessor">
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ </bean>
+
+ <bean id="jacksonDataFormat" class="org.apache.camel.component.jackson.JacksonDataFormat">
+ <property name="unmarshalType" value="org.apache.unomi.router.api.ProfileToImport"/>
+ </bean>
+
+ <bean id="jacksonDataFormatImportConfig" class="org.apache.camel.model.dataformat.JsonDataFormat">
+ <property name="unmarshalType" value="org.apache.unomi.router.api.ImportConfiguration"/>
+ <property name="library" value="Jackson"/>
+ </bean>
+
+ <bean class="org.apache.camel.component.servlet.osgi.OsgiServletRegisterer"
+ init-method="register"
+ destroy-method="unregister">
+ <property name="alias" value="/importConfigAdmin"/>
+ <property name="httpService" ref="httpService"/>
+ <property name="servlet" ref="camelServlet"/>
+ </bean>
+
+ <bean id="camelServlet" class="org.apache.camel.component.servlet.CamelHttpTransportServlet"/>
+
+
+ <bean id="camelContext" class="org.apache.unomi.router.core.context.ProfileImportCamelContext"
+ init-method="initCamelContext" destroy-method="preDestroy">
+ <property name="kafkaProps">
+ <map>
+ <entry key="kafkaHost" value="${kafka.host}"/>
+ <entry key="kafkaPort" value="${kafka.port}"/>
+ <entry key="kafkaImportTopic" value="${kafka.import.topic}"/>
+ <entry key="kafkaImportGroupId" value="${kafka.import.groupId}"/>
+ </map>
+ </property>
+ <property name="uploadDir" value="${import.oneshot.uploadDir}"/>
+ <property name="unomiStorageProcessor" ref="unomiStorageProcessor"/>
+ <property name="importConfigByFileNameProcessor" ref="importConfigByFileNameProcessor"/>
+ <property name="importConfigurationService" ref="importConfigurationService"/>
+ <property name="jacksonDataFormat" ref="jacksonDataFormat"/>
+ <property name="bundleContext" ref="blueprintBundleContext"/>
+ </bean>
+
+ <camelContext id="httpEndpoint" xmlns="http://camel.apache.org/schema/blueprint">
+ <routeBuilder ref="profileImportConfigUpdateRouteBuilder" />
+ </camelContext>
+
+ <bean id="profileImportConfigUpdateRouteBuilder" class="org.apache.unomi.router.core.route.ProfileImportConfigUpdateRouteBuilder">
+ <property name="profileImportCamelContext" ref="camelContext"/>
+ </bean>
+
+ <reference id="httpService" interface="org.osgi.service.http.HttpService"/>
+ <reference id="profileImportService" interface="org.apache.unomi.router.api.services.ProfileImportService"/>
+ <reference id="importConfigurationService" interface="org.apache.unomi.router.api.services.ImportConfigurationService"/>
+
+</blueprint>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
----------------------------------------------------------------------
diff --git a/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
new file mode 100644
index 0000000..b11d983
--- /dev/null
+++ b/extensions/router/router-core/src/main/resources/org.apache.unomi.router.cfg
@@ -0,0 +1,23 @@
+#
+# 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 express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+kafka.host=localhost
+kafka.port=9092
+kafka.import.topic=camel-deposit
+kafka.import.groupId=unomi-import-group
+
+#Import One Shot upload directory
+import.oneshot.uploadDir=/tmp/unomi_oneshot_import_configs/
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-karaf-feature/pom.xml b/extensions/router/router-karaf-feature/pom.xml
new file mode 100644
index 0000000..8a8e62c
--- /dev/null
+++ b/extensions/router/router-karaf-feature/pom.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-karaf-feature</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: Apache Karaf Feature</name>
+ <description>Apache Karaf feature for the Apache Unomi Context Server extension</description>
+ <packaging>feature</packaging>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.jsch</artifactId>
+ <version>0.1.54_1</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-net</groupId>
+ <artifactId>commons-net</artifactId>
+ <version>3.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.kafka</groupId>
+ <artifactId>kafka-clients</artifactId>
+ <version>0.10.1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-core</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-blueprint</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-jackson</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-http-common</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-servlet</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-ftp</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-stream</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-kafka</artifactId>
+ <version>${camel.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <version>${cxf.version}</version>
+ </dependency>
+
+ <!-- UNOMI ROUTER Modules Dependencies -->
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-persistence-spi</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-service</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-rest</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <type>bundle</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <pluginManagement>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <includeTransitiveDependency>false</includeTransitiveDependency>
+ </configuration>
+ </plugin>
+ </plugins>
+ </pluginManagement>
+
+ <plugins>
+ <plugin>
+ <groupId>org.apache.karaf.tooling</groupId>
+ <artifactId>karaf-maven-plugin</artifactId>
+ <configuration>
+ <startLevel>90</startLevel>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/9cffa13e/extensions/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/extensions/router/router-rest/pom.xml b/extensions/router/router-rest/pom.xml
new file mode 100644
index 0000000..e39e919
--- /dev/null
+++ b/extensions/router/router-rest/pom.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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 express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+<project xmlns="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">
+ <parent>
+ <artifactId>unomi-router</artifactId>
+ <groupId>org.apache.unomi</groupId>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <artifactId>unomi-router-rest</artifactId>
+ <name>Apache Unomi :: Extensions :: Router :: REST API</name>
+ <description>Router REST API</description>
+ <packaging>bundle</packaging>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-api</artifactId>
+ <version>${project.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.ws.rs</groupId>
+ <artifactId>javax.ws.rs-api</artifactId>
+ <version>2.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.cxf</groupId>
+ <artifactId>cxf-rt-rs-security-cors</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <type>bundle</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.fasterxml.jackson.core</groupId>
+ <artifactId>jackson-databind</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+
+</project>
\ No newline at end of file
[11/14] incubator-unomi git commit: DMF-1343 Import profiles from CSV
through API
Posted by am...@apache.org.
DMF-1343 Import profiles from CSV through API
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/f65173c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/f65173c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/f65173c9
Branch: refs/heads/feature-DMF-1343
Commit: f65173c96cb671fcd7dcbeeea35f148dec7f249e
Parents: b68909b
Author: Abdelkader Midani <am...@apache.org>
Authored: Wed May 24 08:36:19 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 2017 +0200
----------------------------------------------------------------------
package/pom.xml | 11 +++++
...g.apache.unomi.persistence.elasticsearch.cfg | 2 +-
router/pom.xml | 2 +-
router/router-api/pom.xml | 2 +-
.../unomi/router/api/ImportConfiguration.java | 47 ++++++++++++++++++++
router/router-core/pom.xml | 2 +-
.../core/context/ProfileImportCamelContext.java | 4 +-
.../ProfileImportConfigUpdateRouteBuilder.java | 5 ---
router/router-karaf-feature/pom.xml | 9 +---
router/router-rest/pom.xml | 2 +-
router/router-service/pom.xml | 2 +-
11 files changed, 67 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/package/pom.xml
----------------------------------------------------------------------
diff --git a/package/pom.xml b/package/pom.xml
index ae7c17e..2e7e479 100644
--- a/package/pom.xml
+++ b/package/pom.xml
@@ -269,6 +269,17 @@
</outputDirectory>
<destFileName>org.apache.unomi.plugins.mail.cfg</destFileName>
</artifactItem>
+ <artifactItem>
+ <groupId>org.apache.unomi</groupId>
+ <artifactId>unomi-router-core</artifactId>
+ <version>${project.version}</version>
+ <classifier>routercfg</classifier>
+ <type>cfg</type>
+ <outputDirectory>
+ ${project.build.directory}/assembly/etc
+ </outputDirectory>
+ <destFileName>org.apache.unomi.router.cfg</destFileName>
+ </artifactItem>
<!-- UNOMI-75 : We install the blueprint core bundle in a different version to fix a problem with offline startup -->
<artifactItem>
<groupId>org.apache.aries.blueprint</groupId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
----------------------------------------------------------------------
diff --git a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
index 77eb091..12980e1 100644
--- a/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
+++ b/persistence-elasticsearch/core/src/main/resources/org.apache.unomi.persistence.elasticsearch.cfg
@@ -15,7 +15,7 @@
# limitations under the License.
#
-cluster.name=contextElasticSearch
+cluster.name=contextElasticSearch_amidani
# The elasticSearchAddresses may be a comma seperated list of host names and ports such as
# hostA:9300,hostB:9300
# Note: the port number must be repeated for each host.
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/pom.xml
----------------------------------------------------------------------
diff --git a/router/pom.xml b/router/pom.xml
index 73e9953..5bf43ea 100644
--- a/router/pom.xml
+++ b/router/pom.xml
@@ -22,7 +22,7 @@
<parent>
<artifactId>unomi-root</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<artifactId>unomi-router</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-api/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-api/pom.xml b/router/router-api/pom.xml
index 9085a30..06207b3 100644
--- a/router/router-api/pom.xml
+++ b/router/router-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
----------------------------------------------------------------------
diff --git a/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java b/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
index 38d139f..770a7b5 100644
--- a/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
+++ b/router/router-api/src/main/java/org/apache/unomi/router/api/ImportConfiguration.java
@@ -17,6 +17,7 @@
package org.apache.unomi.router.api;
import org.apache.unomi.api.Item;
+import org.apache.unomi.api.MetadataItem;
import java.util.HashMap;
import java.util.List;
@@ -33,6 +34,9 @@ public class ImportConfiguration extends Item {
* @see Item for a discussion of ITEM_TYPE
*/
public static final String ITEM_TYPE = "importConfig";
+ private String name;
+ private String description;
+ private String configType;
private Map<String, Object> properties = new HashMap<>();
private String mergingProperty;
private boolean overwriteExistingProfiles = false;
@@ -51,6 +55,49 @@ public class ImportConfiguration extends Item {
}
/**
+ * Retrieves the name of the import configuration
+ * @return the name of the import configuration
+ */
+ public String getName() { return this.name; }
+
+ /**
+ * Sets the name of the import configuration
+ * @param name the name of the import configuration
+ */
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ /**
+ * Retrieves the description of the import configuration
+ * @return the description of the import configuration
+ */
+ public String getDescription() { return this.description; }
+
+ /**
+ * Sets the description of the import configuration
+ * @param description the description of the import configuration
+ */
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+
+ /**
+ * Retrieves the config type of the import configuration
+ * @return the config type of the import configuration
+ */
+ public String getConfigType() { return this.configType; }
+
+ /**
+ * Sets the config type of the import configuration
+ * @param configType the config type of the import configuration
+ */
+ public void setConfigType(String configType) {
+ this.configType = configType;
+ }
+
+ /**
* Retrieves the property identified by the specified name.
*
* @param name the name of the property to retrieve
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-core/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-core/pom.xml b/router/router-core/pom.xml
index d1574e9..b0b97c4 100644
--- a/router/router-core/pom.xml
+++ b/router/router-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java b/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
index 13d6630..2f3eaad 100644
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/context/ProfileImportCamelContext.java
@@ -61,7 +61,7 @@ public class ProfileImportCamelContext implements SynchronousBundleListener {
}
public void initCamelContext() throws Exception {
- logger.info("------INIT Camel Context...");
+ logger.info("Initialize Camel Context...");
camelContext = new DefaultCamelContext();
List<ImportConfiguration> importConfigurationList = importConfigurationService.getImportConfigurations();
ProfileImportSourceToKafkaRouteBuilder builderReader = new ProfileImportSourceToKafkaRouteBuilder(kafkaProps);
@@ -96,7 +96,7 @@ public class ProfileImportCamelContext implements SynchronousBundleListener {
}
}
bundleContext.addBundleListener(this);
- logger.info("Import configuration service initialized.");
+ logger.info("Camel Context {} initialized successfully.");
}
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
----------------------------------------------------------------------
diff --git a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
index 0dff8ec..ac71798 100644
--- a/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
+++ b/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportConfigUpdateRouteBuilder.java
@@ -41,11 +41,6 @@ public class ProfileImportConfigUpdateRouteBuilder extends RouteBuilder {
.enableCORS(true)
.bindingMode(RestBindingMode.json)
.dataFormatProperty("prettyPrint", "true");
- rest("/say")
- .get("/hello/{me}")
- .to("direct:hello");
- from("direct:hello")
- .transform().constant("Hello World");
rest().put("/").consumes("application/json").type(ImportConfiguration.class)
.to("direct:importConfigRestDeposit");
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-karaf-feature/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-karaf-feature/pom.xml b/router/router-karaf-feature/pom.xml
index 3a1d2fd..8a8e62c 100644
--- a/router/router-karaf-feature/pom.xml
+++ b/router/router-karaf-feature/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -111,13 +111,6 @@
</dependency>
<dependency>
<groupId>org.apache.unomi</groupId>
- <artifactId>unomi-router-core</artifactId>
- <version>${project.version}</version>
- <type>cfg</type>
- <classifier>routercfg</classifier>
- </dependency>
- <dependency>
- <groupId>org.apache.unomi</groupId>
<artifactId>unomi-router-service</artifactId>
<version>${project.version}</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-rest/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-rest/pom.xml b/router/router-rest/pom.xml
index fc1065f..e39e919 100644
--- a/router/router-rest/pom.xml
+++ b/router/router-rest/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/f65173c9/router/router-service/pom.xml
----------------------------------------------------------------------
diff --git a/router/router-service/pom.xml b/router/router-service/pom.xml
index 750cd1e..0aed70e 100644
--- a/router/router-service/pom.xml
+++ b/router/router-service/pom.xml
@@ -21,7 +21,7 @@
<parent>
<artifactId>unomi-router</artifactId>
<groupId>org.apache.unomi</groupId>
- <version>1.2.0-incubating-SNAPSHOT</version>
+ <version>1.2.0-incubating-dmf_1343-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
[06/14] incubator-unomi git commit: DMF-1343 : Handle transforming an
import config oneshot <--> recurrent
Posted by am...@apache.org.
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/e193b511
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/e193b511
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/e193b511
Branch: refs/heads/feature-DMF-1343
Commit: e193b5112835b4f2a4a15abee4cb7f0d227b143c
Parents: 77fc9e4
Author: Abdelkader Midani <am...@apache.org>
Authored: Mon May 29 12:14:20 2017 +0200
Committer: Abdelkader Midani <am...@apache.org>
Committed: Mon Jun 12 19:24:29 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/e193b511/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<String, String> 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() {