From d6dccf2a3b5272c6eda694630ede22945ebc05ea Mon Sep 17 00:00:00 2001
From: Kirill Liubun <kreol_123@ukr.net>
Date: Tue, 6 Sep 2016 12:57:20 +0300
Subject: [PATCH] Fix with groupId

---
 .../data-migration-0.9.0-0.10.0/pom.xml       |  5 ++--
 .../datamigration/AbstractCTLMigration.java   | 18 ++++++-------
 .../BaseSchemaRecordsCreation.java            |  8 +++---
 .../server}/datamigration/CTLAggregation.java | 12 ++++-----
 .../CTLConfigurationMigration.java            |  6 ++---
 .../datamigration/CTLEventsMigration.java     | 25 +++++++++----------
 .../datamigration/CTLLogMigration.java        |  2 +-
 .../CTLNotificationMigration.java             |  6 ++---
 .../EndpointProfileMigration.java             |  2 +-
 .../server}/datamigration/MigrateData.java    | 12 ++++-----
 .../datamigration/MigrationException.java     |  2 +-
 .../datamigration/UpdateUuidsMigration.java   |  8 +++---
 .../datamigration/model/Configuration.java    |  2 +-
 .../server}/datamigration/model/Ctl.java      |  2 +-
 .../datamigration/model/CtlMetaInfo.java      |  2 +-
 .../datamigration/model/EventClass.java       |  2 +-
 .../model/EventSchemaVersion.java             |  2 +-
 .../server}/datamigration/model/FlatCtl.java  |  2 +-
 .../server}/datamigration/model/Schema.java   |  2 +-
 .../utils/BaseSchemaIdCounter.java            |  2 +-
 .../datamigration/utils/DataSources.java      |  2 +-
 .../server}/datamigration/utils/Options.java  |  2 +-
 .../server}/datamigration/utils/Utils.java    |  2 +-
 .../datadefinition/BuilderException.java      |  2 +-
 .../utils/datadefinition/Constraint.java      |  2 +-
 .../utils/datadefinition/ConstraintType.java  |  2 +-
 .../utils/datadefinition/DataDefinition.java  |  2 +-
 .../datadefinition/ReferenceOptions.java      |  2 +-
 28 files changed, 69 insertions(+), 69 deletions(-)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/AbstractCTLMigration.java (82%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/BaseSchemaRecordsCreation.java (88%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/CTLAggregation.java (95%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/CTLConfigurationMigration.java (86%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/CTLEventsMigration.java (89%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/CTLLogMigration.java (95%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/CTLNotificationMigration.java (96%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/EndpointProfileMigration.java (96%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/MigrateData.java (93%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/MigrationException.java (93%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/UpdateUuidsMigration.java (94%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/Configuration.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/Ctl.java (97%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/CtlMetaInfo.java (97%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/EventClass.java (95%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/EventSchemaVersion.java (96%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/FlatCtl.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/model/Schema.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/BaseSchemaIdCounter.java (96%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/DataSources.java (95%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/Options.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/Utils.java (96%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/datadefinition/BuilderException.java (91%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/datadefinition/Constraint.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/datadefinition/ConstraintType.java (90%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/datadefinition/DataDefinition.java (98%)
 rename server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/{ => kaa/server}/datamigration/utils/datadefinition/ReferenceOptions.java (90%)

diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml b/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml
index 2ed01851b7..7b8803fc7c 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/pom.xml
@@ -4,7 +4,8 @@
          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>
-    <groupId>org.kaaproject</groupId>
+
+    <groupId>org.kaaproject.kaa.server</groupId>
     <artifactId>data-migration</artifactId>
     <packaging>jar</packaging>
 
@@ -77,7 +78,7 @@
                 <executions>
                     <execution>
                         <configuration>
-                            <mainClass>org.kaaproject.datamigration.MigrateData</mainClass>
+                            <mainClass>org.kaaproject.kaa.server.datamigration.MigrateData</mainClass>
                         </configuration>
                         <goals>
                             <goal>one-jar</goal>
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/AbstractCTLMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/AbstractCTLMigration.java
similarity index 82%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/AbstractCTLMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/AbstractCTLMigration.java
index c46b97c014..83ec8f2dd8 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/AbstractCTLMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/AbstractCTLMigration.java
@@ -14,21 +14,21 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.BaseSchemaIdCounter;
-import org.kaaproject.datamigration.utils.datadefinition.DataDefinition;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.BaseSchemaIdCounter;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.DataDefinition;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.Constraint;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.ReferenceOptions;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.List;
 
 import static java.util.stream.Collectors.joining;
-import static org.kaaproject.datamigration.utils.datadefinition.Constraint.constraint;
-import static org.kaaproject.datamigration.utils.datadefinition.ReferenceOptions.CASCADE;
 
 public abstract class AbstractCTLMigration {
     protected Connection connection;
@@ -74,11 +74,11 @@ protected List<Schema> transform() throws SQLException {
 
     public void afterTransform() throws SQLException {
         dd.alterTable(getPrefixTableName() + "_schems")
-                .add(constraint("FK_" + getPrefixTableName() + "_base_schems_id")
+                .add(Constraint.constraint("FK_" + getPrefixTableName() + "_base_schems_id")
                         .foreignKey("id")
                         .references("base_schems", "id")
-                        .onDelete(CASCADE)
-                        .onUpdate(CASCADE)
+                        .onDelete(ReferenceOptions.CASCADE)
+                        .onUpdate(ReferenceOptions.CASCADE)
                 )
                 .execute();
     }
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/BaseSchemaRecordsCreation.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/BaseSchemaRecordsCreation.java
similarity index 88%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/BaseSchemaRecordsCreation.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/BaseSchemaRecordsCreation.java
index 0a3878d949..31ae210933 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/BaseSchemaRecordsCreation.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/BaseSchemaRecordsCreation.java
@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import org.apache.commons.dbutils.QueryRunner;
-import org.kaaproject.datamigration.model.Ctl;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.datadefinition.DataDefinition;
+import org.kaaproject.kaa.server.datamigration.model.Ctl;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.DataDefinition;
 
 import java.sql.Connection;
 import java.sql.SQLException;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLAggregation.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLAggregation.java
similarity index 95%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLAggregation.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLAggregation.java
index 39a70d4a3b..312ea597cc 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLAggregation.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLAggregation.java
@@ -14,16 +14,16 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
 import org.apache.commons.dbutils.handlers.ScalarHandler;
-import org.kaaproject.datamigration.model.Ctl;
-import org.kaaproject.datamigration.model.CtlMetaInfo;
-import org.kaaproject.datamigration.model.FlatCtl;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.datadefinition.DataDefinition;
+import org.kaaproject.kaa.server.datamigration.model.Ctl;
+import org.kaaproject.kaa.server.datamigration.model.CtlMetaInfo;
+import org.kaaproject.kaa.server.datamigration.model.FlatCtl;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.DataDefinition;
 import org.kaaproject.kaa.server.common.core.algorithms.generation.ConfigurationGenerationException;
 import org.kaaproject.kaa.server.common.core.algorithms.generation.DefaultRecordGenerationAlgorithm;
 import org.kaaproject.kaa.server.common.core.algorithms.generation.DefaultRecordGenerationAlgorithmImpl;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLConfigurationMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLConfigurationMigration.java
similarity index 86%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLConfigurationMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLConfigurationMigration.java
index a079b4c5f2..505bae78af 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLConfigurationMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLConfigurationMigration.java
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import java.sql.Connection;
 import java.sql.SQLException;
 
-import static org.kaaproject.datamigration.utils.datadefinition.Constraint.constraint;
-import static org.kaaproject.datamigration.utils.datadefinition.ReferenceOptions.CASCADE;
+import static org.kaaproject.kaa.server.datamigration.utils.datadefinition.Constraint.constraint;
+import static org.kaaproject.kaa.server.datamigration.utils.datadefinition.ReferenceOptions.CASCADE;
 
 public class CTLConfigurationMigration extends AbstractCTLMigration {
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLEventsMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLEventsMigration.java
similarity index 89%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLEventsMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLEventsMigration.java
index 3b1db58fb6..c06f6047ac 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLEventsMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLEventsMigration.java
@@ -14,16 +14,18 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.apache.commons.dbutils.QueryRunner;
 import org.apache.commons.dbutils.handlers.BeanListHandler;
-import org.kaaproject.datamigration.model.EventClass;
-import org.kaaproject.datamigration.model.EventSchemaVersion;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.BaseSchemaIdCounter;
+import org.kaaproject.kaa.server.datamigration.model.EventClass;
+import org.kaaproject.kaa.server.datamigration.model.EventSchemaVersion;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.BaseSchemaIdCounter;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.Constraint;
+import org.kaaproject.kaa.server.datamigration.utils.datadefinition.ReferenceOptions;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -31,9 +33,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import static org.kaaproject.datamigration.utils.datadefinition.Constraint.constraint;
-import static org.kaaproject.datamigration.utils.datadefinition.ReferenceOptions.CASCADE;
-
 public class CTLEventsMigration extends AbstractCTLMigration {
     private static final String EVENT_SCHEMA_VERSION_TABLE_NAME = "event_schems_versions";
     private static final String EVENT_CLASS_FAMILY_TABLE_NAME = "events_class_family";
@@ -62,18 +61,18 @@ public void beforeTransform() throws SQLException {
     @Override
     public void afterTransform() throws SQLException {
         dd.alterTable(EVENT_CLASS_TABLE_NAME)
-                .add(constraint("FK_events_class_family_versions_id")
+                .add(Constraint.constraint("FK_events_class_family_versions_id")
                                 .foreignKey("events_class_family_versions_id")
                                 .references("events_class_family_versions", "id")
-                                .onDelete(CASCADE)
-                                .onUpdate(CASCADE))
+                                .onDelete(ReferenceOptions.CASCADE)
+                                .onUpdate(ReferenceOptions.CASCADE))
                 .execute();
 
         dd.alterTable(APPLICATION_EVENT_MAP_TABLE_NAME)
-                .add(constraint("FK_events_class_id")
+                .add(Constraint.constraint("FK_events_class_id")
                                 .foreignKey("events_class_id")
                                 .references("events_class", "id")
-                                .onDelete(CASCADE))
+                                .onDelete(ReferenceOptions.CASCADE))
                 .execute();
     }
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLLogMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLLogMigration.java
similarity index 95%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLLogMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLLogMigration.java
index c46cbdfc3f..eb3cd057fd 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLLogMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLLogMigration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import java.sql.Connection;
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLNotificationMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLNotificationMigration.java
similarity index 96%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLNotificationMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLNotificationMigration.java
index 165417d7e9..8548723834 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/CTLNotificationMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/CTLNotificationMigration.java
@@ -1,4 +1,4 @@
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import com.datastax.driver.core.BatchStatement;
 import com.datastax.driver.core.Cluster;
@@ -12,8 +12,8 @@
 import com.mongodb.client.MongoDatabase;
 import com.mongodb.client.model.Filters;
 import org.bson.Document;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.Options;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.Options;
 
 import java.nio.ByteBuffer;
 import java.sql.Connection;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/EndpointProfileMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/EndpointProfileMigration.java
similarity index 96%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/EndpointProfileMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/EndpointProfileMigration.java
index 05f864b2f3..68a9e40bf1 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/EndpointProfileMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/EndpointProfileMigration.java
@@ -1,4 +1,4 @@
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 
 import com.datastax.driver.core.Cluster;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrateData.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrateData.java
similarity index 93%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrateData.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrateData.java
index 9259e00f22..9cff0e4e6f 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrateData.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrateData.java
@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import org.apache.commons.dbutils.DbUtils;
 import org.apache.commons.dbutils.QueryRunner;
-import org.kaaproject.datamigration.model.Ctl;
-import org.kaaproject.datamigration.model.Schema;
-import org.kaaproject.datamigration.utils.BaseSchemaIdCounter;
-import org.kaaproject.datamigration.utils.DataSources;
-import org.kaaproject.datamigration.utils.Options;
+import org.kaaproject.kaa.server.datamigration.model.Ctl;
+import org.kaaproject.kaa.server.datamigration.model.Schema;
+import org.kaaproject.kaa.server.datamigration.utils.BaseSchemaIdCounter;
+import org.kaaproject.kaa.server.datamigration.utils.DataSources;
+import org.kaaproject.kaa.server.datamigration.utils.Options;
 import org.kaaproject.kaa.server.common.core.algorithms.generation.ConfigurationGenerationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrationException.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrationException.java
similarity index 93%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrationException.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrationException.java
index 67b84090c4..8a3f29a903 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/MigrationException.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/MigrationException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 public class MigrationException extends RuntimeException {
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/UpdateUuidsMigration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java
similarity index 94%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/UpdateUuidsMigration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java
index faf0e00932..879d8225b5 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/UpdateUuidsMigration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/UpdateUuidsMigration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration;
+package org.kaaproject.kaa.server.datamigration;
 
 import com.datastax.driver.core.BatchStatement;
 import com.datastax.driver.core.Cluster;
@@ -32,8 +32,8 @@
 import org.bson.Document;
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.map.ObjectMapper;
-import org.kaaproject.datamigration.model.Configuration;
-import org.kaaproject.datamigration.utils.Options;
+import org.kaaproject.kaa.server.datamigration.model.Configuration;
+import org.kaaproject.kaa.server.datamigration.utils.Options;
 
 import java.io.IOException;
 import java.sql.Connection;
@@ -44,7 +44,7 @@
 import static com.datastax.driver.core.querybuilder.QueryBuilder.select;
 import static com.datastax.driver.core.querybuilder.QueryBuilder.set;
 import static com.datastax.driver.core.querybuilder.QueryBuilder.update;
-import static org.kaaproject.datamigration.utils.Utils.encodeUuids;
+import static org.kaaproject.kaa.server.datamigration.utils.Utils.encodeUuids;
 
 public class UpdateUuidsMigration {
     private Connection connection;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Configuration.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Configuration.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Configuration.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Configuration.java
index 02391941f9..5cff1006f1 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Configuration.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Configuration.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 import java.io.Serializable;
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Ctl.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Ctl.java
similarity index 97%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Ctl.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Ctl.java
index aeca6d584d..9da1eaf11f 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Ctl.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Ctl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 public class Ctl {
     private final Long id;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/CtlMetaInfo.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/CtlMetaInfo.java
similarity index 97%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/CtlMetaInfo.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/CtlMetaInfo.java
index c82a9b8931..1eebf452c0 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/CtlMetaInfo.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/CtlMetaInfo.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 public class CtlMetaInfo {
     private final Long id;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventClass.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventClass.java
similarity index 95%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventClass.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventClass.java
index 594f148dc1..dd4c30fc43 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventClass.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 public class EventClass {
     private Long    id;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventSchemaVersion.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventSchemaVersion.java
similarity index 96%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventSchemaVersion.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventSchemaVersion.java
index 5ebf44d88f..21e626df5b 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/EventSchemaVersion.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/EventSchemaVersion.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 public class EventSchemaVersion {
     private Long    id;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/FlatCtl.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/FlatCtl.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/FlatCtl.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/FlatCtl.java
index 207387ff88..ff9b1d4672 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/FlatCtl.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/FlatCtl.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 import org.kaaproject.kaa.server.common.core.algorithms.generation.ConfigurationGenerationException;
 import org.kaaproject.kaa.server.common.core.algorithms.generation.DefaultRecordGenerationAlgorithm;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Schema.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Schema.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Schema.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Schema.java
index eae824b625..ea225f78e7 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/model/Schema.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/model/Schema.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.model;
+package org.kaaproject.kaa.server.datamigration.model;
 
 public class Schema {
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/BaseSchemaIdCounter.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/BaseSchemaIdCounter.java
similarity index 96%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/BaseSchemaIdCounter.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/BaseSchemaIdCounter.java
index 9dec0903bb..62dbb46571 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/BaseSchemaIdCounter.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/BaseSchemaIdCounter.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils;
+package org.kaaproject.kaa.server.datamigration.utils;
 
 public class BaseSchemaIdCounter {
     private static BaseSchemaIdCounter instance;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/DataSources.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/DataSources.java
similarity index 95%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/DataSources.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/DataSources.java
index 263ddffaea..d27bbccd46 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/DataSources.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/DataSources.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils;
+package org.kaaproject.kaa.server.datamigration.utils;
 
 import org.apache.commons.dbcp.BasicDataSource;
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Options.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Options.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Options.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Options.java
index 02e2defa88..d3bd57dfde 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Options.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Options.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils;
+package org.kaaproject.kaa.server.datamigration.utils;
 
 
 final public class Options {
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Utils.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Utils.java
similarity index 96%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Utils.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Utils.java
index d37ed43bcc..4e52b87a1a 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/Utils.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/Utils.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils;
+package org.kaaproject.kaa.server.datamigration.utils;
 
 import org.codehaus.jackson.JsonNode;
 import org.codehaus.jackson.node.ObjectNode;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/BuilderException.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/BuilderException.java
similarity index 91%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/BuilderException.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/BuilderException.java
index e438172214..b3c467b093 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/BuilderException.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/BuilderException.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils.datadefinition;
+package org.kaaproject.kaa.server.datamigration.utils.datadefinition;
 
 public class BuilderException extends RuntimeException {
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/Constraint.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/Constraint.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/Constraint.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/Constraint.java
index bb14320566..07822275ed 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/Constraint.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/Constraint.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils.datadefinition;
+package org.kaaproject.kaa.server.datamigration.utils.datadefinition;
 
 public class Constraint {
     private String constraintName;
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ConstraintType.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ConstraintType.java
similarity index 90%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ConstraintType.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ConstraintType.java
index ac1c0bb50e..dc3d8dc1bc 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ConstraintType.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ConstraintType.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils.datadefinition;
+package org.kaaproject.kaa.server.datamigration.utils.datadefinition;
 
 enum ConstraintType {
     FK, PK, UNIQUE, CHECK
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/DataDefinition.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/DataDefinition.java
similarity index 98%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/DataDefinition.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/DataDefinition.java
index b3f46cc1ed..239a3417ae 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/DataDefinition.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/DataDefinition.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils.datadefinition;
+package org.kaaproject.kaa.server.datamigration.utils.datadefinition;
 
 import org.apache.commons.dbutils.QueryRunner;
 
diff --git a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ReferenceOptions.java b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ReferenceOptions.java
similarity index 90%
rename from server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ReferenceOptions.java
rename to server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ReferenceOptions.java
index 47f9dd7a78..128a2c8536 100644
--- a/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/datamigration/utils/datadefinition/ReferenceOptions.java
+++ b/server/upgrade/data-migration-0.9.0-0.10.0/src/main/java/org/kaaproject/kaa/server/datamigration/utils/datadefinition/ReferenceOptions.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.kaaproject.datamigration.utils.datadefinition;
+package org.kaaproject.kaa.server.datamigration.utils.datadefinition;
 
 public enum ReferenceOptions {
     RESTRICT, CASCADE