Fix with groupId

kaaproject · Sep 6, 2016 · d6dccf2 · d6dccf2
1 parent 9591b56
commit d6dccf2
Show file tree

Hide file tree

Showing 28 changed files with 69 additions and 69 deletions.
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
@@ -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/...t/datamigration/AbstractCTLMigration.java → ...r/datamigration/AbstractCTLMigration.java b/...t/datamigration/AbstractCTLMigration.java → ...r/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/...amigration/BaseSchemaRecordsCreation.java → ...amigration/BaseSchemaRecordsCreation.java b/...amigration/BaseSchemaRecordsCreation.java → ...amigration/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/...project/datamigration/CTLAggregation.java → .../server/datamigration/CTLAggregation.java b/...project/datamigration/CTLAggregation.java → .../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/...amigration/CTLConfigurationMigration.java → ...amigration/CTLConfigurationMigration.java b/...amigration/CTLConfigurationMigration.java → ...amigration/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/...ect/datamigration/CTLEventsMigration.java → ...ver/datamigration/CTLEventsMigration.java b/...ect/datamigration/CTLEventsMigration.java → ...ver/datamigration/CTLEventsMigration.java
@@ -14,26 +14,25 @@
  * 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;
 import java.sql.SQLException;
 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/...roject/datamigration/CTLLogMigration.java → ...server/datamigration/CTLLogMigration.java b/...roject/datamigration/CTLLogMigration.java → ...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/...tamigration/CTLNotificationMigration.java → ...tamigration/CTLNotificationMigration.java b/...tamigration/CTLNotificationMigration.java → ...tamigration/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/...tamigration/EndpointProfileMigration.java → ...tamigration/EndpointProfileMigration.java b/...tamigration/EndpointProfileMigration.java → ...tamigration/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/...kaaproject/datamigration/MigrateData.java → ...kaa/server/datamigration/MigrateData.java b/...kaaproject/datamigration/MigrateData.java → ...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/...ect/datamigration/MigrationException.java → ...ver/datamigration/MigrationException.java b/...ect/datamigration/MigrationException.java → ...ver/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/...t/datamigration/UpdateUuidsMigration.java → ...r/datamigration/UpdateUuidsMigration.java b/...t/datamigration/UpdateUuidsMigration.java → ...r/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/...ct/datamigration/model/Configuration.java → ...er/datamigration/model/Configuration.java b/...ct/datamigration/model/Configuration.java → ...er/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/...g/kaaproject/datamigration/model/Ctl.java → ...t/kaa/server/datamigration/model/Ctl.java b/...g/kaaproject/datamigration/model/Ctl.java → ...t/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/...ject/datamigration/model/CtlMetaInfo.java → ...rver/datamigration/model/CtlMetaInfo.java b/...ject/datamigration/model/CtlMetaInfo.java → ...rver/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/...oject/datamigration/model/EventClass.java → ...erver/datamigration/model/EventClass.java b/...oject/datamigration/model/EventClass.java → ...erver/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/...tamigration/model/EventSchemaVersion.java → ...tamigration/model/EventSchemaVersion.java b/...tamigration/model/EventSchemaVersion.java → ...tamigration/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/...aproject/datamigration/model/FlatCtl.java → ...a/server/datamigration/model/FlatCtl.java b/...aproject/datamigration/model/FlatCtl.java → ...a/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/...aaproject/datamigration/model/Schema.java → ...aa/server/datamigration/model/Schema.java b/...aaproject/datamigration/model/Schema.java → ...aa/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/...amigration/utils/BaseSchemaIdCounter.java → ...amigration/utils/BaseSchemaIdCounter.java b/...amigration/utils/BaseSchemaIdCounter.java → ...amigration/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/...ject/datamigration/utils/DataSources.java → ...rver/datamigration/utils/DataSources.java b/...ject/datamigration/utils/DataSources.java → ...rver/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/...aproject/datamigration/utils/Options.java → ...a/server/datamigration/utils/Options.java b/...aproject/datamigration/utils/Options.java → ...a/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/...kaaproject/datamigration/utils/Utils.java → ...kaa/server/datamigration/utils/Utils.java b/...kaaproject/datamigration/utils/Utils.java → ...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/...tils/datadefinition/BuilderException.java → ...tils/datadefinition/BuilderException.java b/...tils/datadefinition/BuilderException.java → ...tils/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/...tion/utils/datadefinition/Constraint.java → ...tion/utils/datadefinition/Constraint.java b/...tion/utils/datadefinition/Constraint.java → ...tion/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/.../utils/datadefinition/ConstraintType.java → .../utils/datadefinition/ConstraintType.java b/.../utils/datadefinition/ConstraintType.java → .../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