From 89683c743000df84daddafdafe2e3308480e5c73 Mon Sep 17 00:00:00 2001 From: madhawa-gunasekara Date: Thu, 24 Aug 2017 03:09:29 +0530 Subject: [PATCH 1/2] Rename gora-cassandra-cql module into gora-cassandra module --- {gora-cassandra-cql => gora-cassandra}/pom.xml | 2 +- .../src/examples/avro/cassandraKey.json | 0 .../src/examples/avro/cassandraRecord.json | 0 .../example/generated/AvroSerialization/CassandraKey.java | 0 .../generated/AvroSerialization/CassandraRecord.java | 0 .../example/generated/nativeSerialization/ComplexTypes.java | 0 .../example/generated/nativeSerialization/Customer.java | 0 .../example/generated/nativeSerialization/Document.java | 0 .../example/generated/nativeSerialization/User.java | 0 .../java/org/apache/gora/cassandra/bean/CassandraKey.java | 0 .../org/apache/gora/cassandra/bean/ClusterKeyField.java | 0 .../src/main/java/org/apache/gora/cassandra/bean/Field.java | 0 .../main/java/org/apache/gora/cassandra/bean/KeySpace.java | 0 .../org/apache/gora/cassandra/bean/PartitionKeyField.java | 0 .../cassandra/compiler/GoraCassandraNativeCompiler.java | 0 .../main/java/org/apache/gora/cassandra/package-info.java | 0 .../org/apache/gora/cassandra/query/CassandraQuery.java | 0 .../org/apache/gora/cassandra/query/CassandraResultSet.java | 0 .../java/org/apache/gora/cassandra/query/package-info.java | 0 .../gora/cassandra/serializers/AvroCassandraUtils.java | 0 .../apache/gora/cassandra/serializers/AvroSerializer.java | 0 .../gora/cassandra/serializers/CassandraQueryFactory.java | 0 .../gora/cassandra/serializers/CassandraSerializer.java | 0 .../apache/gora/cassandra/serializers/NativeSerializer.java | 0 .../org/apache/gora/cassandra/serializers/package-info.java | 0 .../org/apache/gora/cassandra/store/CassandraClient.java | 0 .../org/apache/gora/cassandra/store/CassandraMapping.java | 0 .../gora/cassandra/store/CassandraMappingBuilder.java | 0 .../org/apache/gora/cassandra/store/CassandraStore.java | 0 .../gora/cassandra/store/CassandraStoreParameters.java | 0 .../java/org/apache/gora/cassandra/store/package-info.java | 0 .../src/test/conf/avro/gora-cassandra-mapping.xml | 0 .../src/test/conf/avroUDT/gora-cassandra-mapping.xml | 0 .../src/test/conf/cassandra.yaml | 0 .../src/test/conf/compositeKey/gora-cassandra-mapping.xml | 0 .../src/test/conf/gora.properties | 0 .../src/test/conf/log4j-server.properties | 0 .../src/test/conf/nativeSerialization/custom-codecs.xml | 0 .../conf/nativeSerialization/gora-cassandra-mapping.xml | 0 .../src/test/conf/nativeSerialization/gora.properties | 0 .../src/test/conf/nativeUDT/gora-cassandra-mapping.xml | 0 .../org/apache/gora/cassandra/GoraCassandraTestDriver.java | 0 .../test/java/org/apache/gora/cassandra/package-info.java | 0 .../gora/cassandra/store/TestAvroSerializationWithUDT.java | 0 .../org/apache/gora/cassandra/store/TestCassandraStore.java | 0 .../cassandra/store/TestCassandraStoreWithCassandraKey.java | 0 .../store/TestCassandraStoreWithNativeSerialization.java | 0 .../cassandra/store/TestNativeSerializationWithUDT.java | 0 .../java/org/apache/gora/cassandra/store/package-info.java | 0 .../test/nativeSerialization/DateAsStringCodec.java | 0 gora-tutorial/pom.xml | 2 +- pom.xml | 6 +++--- 52 files changed, 5 insertions(+), 5 deletions(-) rename {gora-cassandra-cql => gora-cassandra}/pom.xml (99%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/avro/cassandraKey.json (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/avro/cassandraRecord.json (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraKey.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraRecord.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Customer.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Document.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/User.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/bean/Field.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/query/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/serializers/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/main/java/org/apache/gora/cassandra/store/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/avro/gora-cassandra-mapping.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/avroUDT/gora-cassandra-mapping.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/cassandra.yaml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/compositeKey/gora-cassandra-mapping.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/gora.properties (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/log4j-server.properties (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/nativeSerialization/custom-codecs.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/nativeSerialization/gora.properties (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/conf/nativeUDT/gora-cassandra-mapping.xml (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/TestAvroSerializationWithUDT.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithNativeSerialization.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/TestNativeSerializationWithUDT.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/store/package-info.java (100%) rename {gora-cassandra-cql => gora-cassandra}/src/test/java/org/apache/gora/cassandra/test/nativeSerialization/DateAsStringCodec.java (100%) diff --git a/gora-cassandra-cql/pom.xml b/gora-cassandra/pom.xml similarity index 99% rename from gora-cassandra-cql/pom.xml rename to gora-cassandra/pom.xml index 2160defe8..99ede4842 100644 --- a/gora-cassandra-cql/pom.xml +++ b/gora-cassandra/pom.xml @@ -26,7 +26,7 @@ 0.8-SNAPSHOT ../ - gora-cassandra-cql + gora-cassandra bundle Apache Gora :: Cassandra - CQL diff --git a/gora-cassandra-cql/src/examples/avro/cassandraKey.json b/gora-cassandra/src/examples/avro/cassandraKey.json similarity index 100% rename from gora-cassandra-cql/src/examples/avro/cassandraKey.json rename to gora-cassandra/src/examples/avro/cassandraKey.json diff --git a/gora-cassandra-cql/src/examples/avro/cassandraRecord.json b/gora-cassandra/src/examples/avro/cassandraRecord.json similarity index 100% rename from gora-cassandra-cql/src/examples/avro/cassandraRecord.json rename to gora-cassandra/src/examples/avro/cassandraRecord.json diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraKey.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraKey.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraKey.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraKey.java diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraRecord.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraRecord.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraRecord.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/AvroSerialization/CassandraRecord.java diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/ComplexTypes.java diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Customer.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Customer.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Customer.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Customer.java diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Document.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Document.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Document.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/Document.java diff --git a/gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/User.java b/gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/User.java similarity index 100% rename from gora-cassandra-cql/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/User.java rename to gora-cassandra/src/examples/java/org/apache/gora/cassandra/example/generated/nativeSerialization/User.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/CassandraKey.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/ClusterKeyField.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/Field.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/Field.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/Field.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/KeySpace.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/bean/PartitionKeyField.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/compiler/GoraCassandraNativeCompiler.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/package-info.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/package-info.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/package-info.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/package-info.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraQuery.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/query/CassandraResultSet.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/package-info.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/query/package-info.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/query/package-info.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/query/package-info.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroCassandraUtils.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/AvroSerializer.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraQueryFactory.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/CassandraSerializer.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/NativeSerializer.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/package-info.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/package-info.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/serializers/package-info.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/serializers/package-info.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraClient.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMapping.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraMappingBuilder.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStore.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/CassandraStoreParameters.java diff --git a/gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/package-info.java b/gora-cassandra/src/main/java/org/apache/gora/cassandra/store/package-info.java similarity index 100% rename from gora-cassandra-cql/src/main/java/org/apache/gora/cassandra/store/package-info.java rename to gora-cassandra/src/main/java/org/apache/gora/cassandra/store/package-info.java diff --git a/gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/avro/gora-cassandra-mapping.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/avro/gora-cassandra-mapping.xml rename to gora-cassandra/src/test/conf/avro/gora-cassandra-mapping.xml diff --git a/gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/avroUDT/gora-cassandra-mapping.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/avroUDT/gora-cassandra-mapping.xml rename to gora-cassandra/src/test/conf/avroUDT/gora-cassandra-mapping.xml diff --git a/gora-cassandra-cql/src/test/conf/cassandra.yaml b/gora-cassandra/src/test/conf/cassandra.yaml similarity index 100% rename from gora-cassandra-cql/src/test/conf/cassandra.yaml rename to gora-cassandra/src/test/conf/cassandra.yaml diff --git a/gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/compositeKey/gora-cassandra-mapping.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/compositeKey/gora-cassandra-mapping.xml rename to gora-cassandra/src/test/conf/compositeKey/gora-cassandra-mapping.xml diff --git a/gora-cassandra-cql/src/test/conf/gora.properties b/gora-cassandra/src/test/conf/gora.properties similarity index 100% rename from gora-cassandra-cql/src/test/conf/gora.properties rename to gora-cassandra/src/test/conf/gora.properties diff --git a/gora-cassandra-cql/src/test/conf/log4j-server.properties b/gora-cassandra/src/test/conf/log4j-server.properties similarity index 100% rename from gora-cassandra-cql/src/test/conf/log4j-server.properties rename to gora-cassandra/src/test/conf/log4j-server.properties diff --git a/gora-cassandra-cql/src/test/conf/nativeSerialization/custom-codecs.xml b/gora-cassandra/src/test/conf/nativeSerialization/custom-codecs.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/nativeSerialization/custom-codecs.xml rename to gora-cassandra/src/test/conf/nativeSerialization/custom-codecs.xml diff --git a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml rename to gora-cassandra/src/test/conf/nativeSerialization/gora-cassandra-mapping.xml diff --git a/gora-cassandra-cql/src/test/conf/nativeSerialization/gora.properties b/gora-cassandra/src/test/conf/nativeSerialization/gora.properties similarity index 100% rename from gora-cassandra-cql/src/test/conf/nativeSerialization/gora.properties rename to gora-cassandra/src/test/conf/nativeSerialization/gora.properties diff --git a/gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml b/gora-cassandra/src/test/conf/nativeUDT/gora-cassandra-mapping.xml similarity index 100% rename from gora-cassandra-cql/src/test/conf/nativeUDT/gora-cassandra-mapping.xml rename to gora-cassandra/src/test/conf/nativeUDT/gora-cassandra-mapping.xml diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/GoraCassandraTestDriver.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/package-info.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/package-info.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/package-info.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/package-info.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestAvroSerializationWithUDT.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestAvroSerializationWithUDT.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestAvroSerializationWithUDT.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestAvroSerializationWithUDT.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStore.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithCassandraKey.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithNativeSerialization.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithNativeSerialization.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithNativeSerialization.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestCassandraStoreWithNativeSerialization.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestNativeSerializationWithUDT.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestNativeSerializationWithUDT.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/TestNativeSerializationWithUDT.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/TestNativeSerializationWithUDT.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/package-info.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/store/package-info.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/store/package-info.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/store/package-info.java diff --git a/gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/test/nativeSerialization/DateAsStringCodec.java b/gora-cassandra/src/test/java/org/apache/gora/cassandra/test/nativeSerialization/DateAsStringCodec.java similarity index 100% rename from gora-cassandra-cql/src/test/java/org/apache/gora/cassandra/test/nativeSerialization/DateAsStringCodec.java rename to gora-cassandra/src/test/java/org/apache/gora/cassandra/test/nativeSerialization/DateAsStringCodec.java diff --git a/gora-tutorial/pom.xml b/gora-tutorial/pom.xml index 270a2ba00..99ba41d51 100644 --- a/gora-tutorial/pom.xml +++ b/gora-tutorial/pom.xml @@ -115,7 +115,7 @@ org.apache.gora - gora-cassandra-cql + gora-cassandra diff --git a/pom.xml b/pom.xml index ed1e157a7..b67d2635c 100644 --- a/pom.xml +++ b/pom.xml @@ -718,7 +718,7 @@ gora-compiler-cli gora-core gora-accumulo - gora-cassandra-cql + gora-cassandra gora-goraci gora-hbase gora-infinispan @@ -855,12 +855,12 @@ org.apache.gora - gora-cassandra-cql + gora-cassandra ${project.version} org.apache.gora - gora-cassandra-cql + gora-cassandra ${project.version} test-jar From 52d583affe4e4132d682e011930fe9c466fed27f Mon Sep 17 00:00:00 2001 From: madhawa-gunasekara Date: Thu, 24 Aug 2017 03:10:16 +0530 Subject: [PATCH 2/2] Remove hector dependecy --- pom.xml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pom.xml b/pom.xml index b67d2635c..394488253 100644 --- a/pom.xml +++ b/pom.xml @@ -752,7 +752,6 @@ 3.3.0 3.11.0 - 1.1-4 6.5.1 6.5.1 @@ -1096,18 +1095,6 @@ ${cassandra.version} - - org.hectorclient - hector-core - ${hector.version} - - - org.apache.cassandra - cassandra-all - - - - com.ibm.icu icu4j