diff --git a/MODULES.md b/MODULES.md index 3a3900155..68355c2ce 100644 --- a/MODULES.md +++ b/MODULES.md @@ -29,9 +29,9 @@ To make it easier to find the module you are looking for, the following strict naming conventions have been adopted: - All packages within a module start with `io.nosqlbench`, followed by the module name, - with hyphens converted to dots. For example, the 'engine-api' module contains + with hyphens converted to dots. For example, the 'engine-api' module contains packages in `io.nosqlbench.engine.api`. -- Modules which implement activity types (high-level protocol drivers) are named `activitytype-...`. +- Modules which implement activity types (high-level protocol drivers) are named `driver-...`. - Modules which provide procedural data generation support are named `virtdata-...`. - Modules which provide core runtime logic are named `engine-...`. - Project-wide maven defaults are contained in the mvn-defaults module. diff --git a/activitytype-cql/pom.xml b/driver-cql/pom.xml similarity index 98% rename from activitytype-cql/pom.xml rename to driver-cql/pom.xml index dfd24e16a..e6111316e 100644 --- a/activitytype-cql/pom.xml +++ b/driver-cql/pom.xml @@ -8,7 +8,7 @@ ../mvn-defaults - activitytype-cql + driver-cql jar ${project.artifactId} diff --git a/activitytype-cql/src/main/java/com/datastax/driver/core/M3PTokenFilter.java b/driver-cql/src/main/java/com/datastax/driver/core/M3PTokenFilter.java similarity index 100% rename from activitytype-cql/src/main/java/com/datastax/driver/core/M3PTokenFilter.java rename to driver-cql/src/main/java/com/datastax/driver/core/M3PTokenFilter.java diff --git a/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java b/driver-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java similarity index 100% rename from activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java rename to driver-cql/src/main/java/com/datastax/driver/core/TokenRangeStmtFilter.java diff --git a/activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeUtil.java b/driver-cql/src/main/java/com/datastax/driver/core/TokenRangeUtil.java similarity index 100% rename from activitytype-cql/src/main/java/com/datastax/driver/core/TokenRangeUtil.java rename to driver-cql/src/main/java/com/datastax/driver/core/TokenRangeUtil.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ErrorResponse.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/ResultSetCycleOperator.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/RowCycleOperator.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/StatementFilter.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/api/VerifyApplied.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/CQLUserTypeNames.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/CQLUserTypeNames.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/CQLUserTypeNames.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/CQLUserTypeNames.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecClasses.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecClasses.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecClasses.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecClasses.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTCodecInjector.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTJavaType.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTJavaType.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTJavaType.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTJavaType.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTTransformCodec.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTTransformCodec.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTTransformCodec.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UDTTransformCodec.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/codecsupport/UserCodecProvider.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLBindHelper.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CQLOptions.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAction.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActionDispenser.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivity.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlActivityType.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlAsyncAction.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/CqlOpData.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/ProxyTranslator.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/core/StatementModifier.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collectionclobs/StringMapClob.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/collections/ListMapper.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/contrib/WrappedClustering.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/diagnostics/ToCqlType.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Distance.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/LineString.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Point.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/Polygon.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/geometry/PolygonOnGrid.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToCqlLocalDate.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDate.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/EpochMillisToJavaLocalDateTime.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_localdate/LongToLocalDateDays.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_string/ModuloCSVLineToUUID.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMax.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/long_uuid/ToTimeUUIDMin.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileAPIService.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileAPIService.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileAPIService.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileAPIService.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileBaseFunction.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileCycle.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextCycle.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileNextToken.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileSharedBuffers.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/rainbow/TokenMapFileToken.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/string_string/SnappyComp.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeDuring.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFunc.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrAfter.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeOnOrBefore.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeParser.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_tuple/CustomFunc955.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/CQLExceptionEnum.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ErrorStatus.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/ExceptionMap.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/HashedCQLErrorHandler.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/NBCycleErrorHandler.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleWithStatementException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleWithStatementException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleWithStatementException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLCycleWithStatementException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLExceptionDetailer.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CQLResultSetException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ChangeUnappliedCycleException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlGenericCycleException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlGenericCycleException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlGenericCycleException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/CqlGenericCycleException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/MaxTriesExhaustedException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/ResultSetVerificationException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/RowVerificationException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/errorhandling/exceptions/UnexpectedPagingException.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/filtering/CQLResultFilterType.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/CqlBinderTypes.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DiagnosticPreparedBinder.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/DirectArrayValuesBinder.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/SimpleStatementValuesBinder.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/binders/UnsettableValuesBinder.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/AvailableCQLStatements.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLSessionCache.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDef.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementDefParser.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/CQLStatementGroups.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatement.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementTemplate.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/ReadyCQLStatementsTemplate.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/TaggedCQLStatementDefs.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/core/YamlCQLStatementLoader.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Print.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/RowCycleOperators.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/Save.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveGlobalVars.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadRows.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rowoperators/SaveThreadVars.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/AssertSingleRowResultSet.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ClearVars.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/CqlResultSetLogger.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PerThreadCQLData.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PopVars.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/Print.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/PushVars.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/ResultSetCycleOperators.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/RowCapture.java diff --git a/activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java b/driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java similarity index 100% rename from activitytype-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java rename to driver-cql/src/main/java/io/nosqlbench/activitytype/cql/statements/rsoperators/TraceLogger.java diff --git a/activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/driver-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from activitytype-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to driver-cql/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-iot-dse.yaml b/driver-cql/src/main/resources/activities/baselines/cql-iot-dse.yaml similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-iot-dse.yaml rename to driver-cql/src/main/resources/activities/baselines/cql-iot-dse.yaml diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-iot.md b/driver-cql/src/main/resources/activities/baselines/cql-iot.md similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-iot.md rename to driver-cql/src/main/resources/activities/baselines/cql-iot.md diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-iot.yaml b/driver-cql/src/main/resources/activities/baselines/cql-iot.yaml similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-iot.yaml rename to driver-cql/src/main/resources/activities/baselines/cql-iot.yaml diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-keyvalue.md b/driver-cql/src/main/resources/activities/baselines/cql-keyvalue.md similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-keyvalue.md rename to driver-cql/src/main/resources/activities/baselines/cql-keyvalue.md diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-keyvalue.yaml b/driver-cql/src/main/resources/activities/baselines/cql-keyvalue.yaml similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-keyvalue.yaml rename to driver-cql/src/main/resources/activities/baselines/cql-keyvalue.yaml diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-tabular.yaml b/driver-cql/src/main/resources/activities/baselines/cql-tabular.yaml similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-tabular.yaml rename to driver-cql/src/main/resources/activities/baselines/cql-tabular.yaml diff --git a/activitytype-cql/src/main/resources/activities/baselines/cql-widerows.md b/driver-cql/src/main/resources/activities/baselines/cql-widerows.md similarity index 100% rename from activitytype-cql/src/main/resources/activities/baselines/cql-widerows.md rename to driver-cql/src/main/resources/activities/baselines/cql-widerows.md diff --git a/activitytype-cql/src/main/resources/advanced-cql.md b/driver-cql/src/main/resources/advanced-cql.md similarity index 100% rename from activitytype-cql/src/main/resources/advanced-cql.md rename to driver-cql/src/main/resources/advanced-cql.md diff --git a/activitytype-cql/src/main/resources/cql-errors.md b/driver-cql/src/main/resources/cql-errors.md similarity index 100% rename from activitytype-cql/src/main/resources/cql-errors.md rename to driver-cql/src/main/resources/cql-errors.md diff --git a/activitytype-cql/src/main/resources/cql-exception-list.md b/driver-cql/src/main/resources/cql-exception-list.md similarity index 100% rename from activitytype-cql/src/main/resources/cql-exception-list.md rename to driver-cql/src/main/resources/cql-exception-list.md diff --git a/activitytype-cql/src/main/resources/cql.md b/driver-cql/src/main/resources/cql.md similarity index 100% rename from activitytype-cql/src/main/resources/cql.md rename to driver-cql/src/main/resources/cql.md diff --git a/activitytype-cql/src/main/resources/examples/bindings/date.yaml b/driver-cql/src/main/resources/examples/bindings/date.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/date.yaml rename to driver-cql/src/main/resources/examples/bindings/date.yaml diff --git a/activitytype-cql/src/main/resources/examples/bindings/expr.yaml b/driver-cql/src/main/resources/examples/bindings/expr.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/expr.yaml rename to driver-cql/src/main/resources/examples/bindings/expr.yaml diff --git a/activitytype-cql/src/main/resources/examples/bindings/text.yaml b/driver-cql/src/main/resources/examples/bindings/text.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/text.yaml rename to driver-cql/src/main/resources/examples/bindings/text.yaml diff --git a/activitytype-cql/src/main/resources/examples/bindings/timestamp.yaml b/driver-cql/src/main/resources/examples/bindings/timestamp.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/timestamp.yaml rename to driver-cql/src/main/resources/examples/bindings/timestamp.yaml diff --git a/activitytype-cql/src/main/resources/examples/bindings/timeuuid.yaml b/driver-cql/src/main/resources/examples/bindings/timeuuid.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/timeuuid.yaml rename to driver-cql/src/main/resources/examples/bindings/timeuuid.yaml diff --git a/activitytype-cql/src/main/resources/examples/bindings/uuid.yaml b/driver-cql/src/main/resources/examples/bindings/uuid.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/bindings/uuid.yaml rename to driver-cql/src/main/resources/examples/bindings/uuid.yaml diff --git a/activitytype-cql/src/main/resources/examples/cql-rowops.yaml b/driver-cql/src/main/resources/examples/cql-rowops.yaml similarity index 100% rename from activitytype-cql/src/main/resources/examples/cql-rowops.yaml rename to driver-cql/src/main/resources/examples/cql-rowops.yaml diff --git a/activitytype-cql/src/main/resources/topics.md b/driver-cql/src/main/resources/topics.md similarity index 100% rename from activitytype-cql/src/main/resources/topics.md rename to driver-cql/src/main/resources/topics.md diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java b/driver-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java similarity index 100% rename from activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java rename to driver-cql/src/test/java/com/datastax/ebdrivers/cql/CqlActionTest.java diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java b/driver-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java similarity index 100% rename from activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java rename to driver-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLCQLStatementDefParserTest.java diff --git a/activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java b/driver-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java similarity index 100% rename from activitytype-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java rename to driver-cql/src/test/java/com/datastax/ebdrivers/cql/statements/CQLOptionsTest.java diff --git a/activitytype-cql/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java b/driver-cql/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java similarity index 100% rename from activitytype-cql/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java rename to driver-cql/src/test/java/io/nosqlbench/activitytype/cql/datamappers/functions/to_daterange/DateRangeFuncTest.java diff --git a/activitytype-cql/src/test/resources/activities/testactivity.yaml b/driver-cql/src/test/resources/activities/testactivity.yaml similarity index 100% rename from activitytype-cql/src/test/resources/activities/testactivity.yaml rename to driver-cql/src/test/resources/activities/testactivity.yaml diff --git a/activitytype-cqlverify/pom.xml b/driver-cqlverify/pom.xml similarity index 89% rename from activitytype-cqlverify/pom.xml rename to driver-cqlverify/pom.xml index 1cca53fad..724ff326b 100644 --- a/activitytype-cqlverify/pom.xml +++ b/driver-cqlverify/pom.xml @@ -8,7 +8,7 @@ ../mvn-defaults - activitytype-cqlverify + driver-cqlverify jar ${project.artifactId} @@ -23,7 +23,7 @@ io.nosqlbench - activitytype-cql + driver-cql 3.12.100-SNAPSHOT diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAction.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAction.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAction.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAction.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActionDispenser.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActionDispenser.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActionDispenser.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActionDispenser.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivity.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyActivityType.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAsyncAction.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAsyncAction.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAsyncAction.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/CqlVerifyAsyncAction.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/DiffType.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/DiffType.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/DiffType.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/DiffType.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/RowDifferencer.java diff --git a/activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/VerificationMetrics.java b/driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/VerificationMetrics.java similarity index 100% rename from activitytype-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/VerificationMetrics.java rename to driver-cqlverify/src/main/java/io/nosqlbench/activitytype/cqlverify/VerificationMetrics.java diff --git a/activitytype-cqlverify/src/main/resources/cqlverify.md b/driver-cqlverify/src/main/resources/cqlverify.md similarity index 100% rename from activitytype-cqlverify/src/main/resources/cqlverify.md rename to driver-cqlverify/src/main/resources/cqlverify.md diff --git a/activitytype-cqlverify/src/main/resources/topics.md b/driver-cqlverify/src/main/resources/topics.md similarity index 100% rename from activitytype-cqlverify/src/main/resources/topics.md rename to driver-cqlverify/src/main/resources/topics.md diff --git a/activitytype-diag/pom.xml b/driver-diag/pom.xml similarity index 97% rename from activitytype-diag/pom.xml rename to driver-diag/pom.xml index ad0d6caaf..e340ea7de 100644 --- a/activitytype-diag/pom.xml +++ b/driver-diag/pom.xml @@ -9,7 +9,7 @@ ../mvn-defaults - activitytype-diag + driver-diag jar ${project.artifactId} A nosqlbench ActivityType (AT) driver module; diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/AsyncDiagAction.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagAction.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActionDispenser.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivity.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagActivityType.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagDummyError.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagDummyError.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagDummyError.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagDummyError.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagOpData.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagOpData.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagOpData.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagOpData.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagResult.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagResult.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagResult.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/DiagResult.java diff --git a/activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java b/driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java similarity index 100% rename from activitytype-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java rename to driver-diag/src/main/java/io/nosqlbench/activitytype/diag/SequenceBlocker.java diff --git a/activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor b/driver-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor similarity index 100% rename from activitytype-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor rename to driver-diag/src/main/resources/META-INF/services/javax.annotation.processing.Processor diff --git a/activitytype-diag/src/main/resources/diag.md b/driver-diag/src/main/resources/diag.md similarity index 100% rename from activitytype-diag/src/main/resources/diag.md rename to driver-diag/src/main/resources/diag.md diff --git a/activitytype-diag/src/main/resources/example-data/lorem_ipsum_full.txt b/driver-diag/src/main/resources/example-data/lorem_ipsum_full.txt similarity index 100% rename from activitytype-diag/src/main/resources/example-data/lorem_ipsum_full.txt rename to driver-diag/src/main/resources/example-data/lorem_ipsum_full.txt diff --git a/activitytype-diag/src/main/resources/topics.md b/driver-diag/src/main/resources/topics.md similarity index 100% rename from activitytype-diag/src/main/resources/topics.md rename to driver-diag/src/main/resources/topics.md diff --git a/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java similarity index 100% rename from activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java rename to driver-diag/src/test/java/io/nosqlbench/activitytype/diag/DiagActivityTypeTest.java diff --git a/activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java b/driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java similarity index 100% rename from activitytype-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java rename to driver-diag/src/test/java/io/nosqlbench/activitytype/diag/SequenceBlockerTest.java diff --git a/activitytype-http/pom.xml b/driver-http/pom.xml similarity index 96% rename from activitytype-http/pom.xml rename to driver-http/pom.xml index 2414d2435..a71f089e3 100644 --- a/activitytype-http/pom.xml +++ b/driver-http/pom.xml @@ -9,7 +9,7 @@ ../mvn-defaults - activitytype-http + driver-http jar ${project.artifactId} diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java similarity index 100% rename from activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java rename to driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpAction.java diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActionDispenser.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActionDispenser.java similarity index 100% rename from activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActionDispenser.java rename to driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActionDispenser.java diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java similarity index 100% rename from activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java rename to driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivity.java diff --git a/activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java b/driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java similarity index 100% rename from activitytype-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java rename to driver-http/src/main/java/io/nosqlbench/activitytype/http/HttpActivityType.java diff --git a/activitytype-http/src/main/resources/http.md b/driver-http/src/main/resources/http.md similarity index 100% rename from activitytype-http/src/main/resources/http.md rename to driver-http/src/main/resources/http.md diff --git a/activitytype-http/src/main/resources/topics.md b/driver-http/src/main/resources/topics.md similarity index 100% rename from activitytype-http/src/main/resources/topics.md rename to driver-http/src/main/resources/topics.md diff --git a/activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java b/driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java similarity index 100% rename from activitytype-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java rename to driver-http/src/test/java/io/nosqlbench/activitytype/http/HttpActivityTypeTest.java diff --git a/activitytype-http/src/test/resources/activities/http-google.yaml b/driver-http/src/test/resources/activities/http-google.yaml similarity index 100% rename from activitytype-http/src/test/resources/activities/http-google.yaml rename to driver-http/src/test/resources/activities/http-google.yaml diff --git a/activitytype-http/src/test/resources/activities/http-solr.yaml b/driver-http/src/test/resources/activities/http-solr.yaml similarity index 100% rename from activitytype-http/src/test/resources/activities/http-solr.yaml rename to driver-http/src/test/resources/activities/http-solr.yaml diff --git a/activitytype-stdout/pom.xml b/driver-stdout/pom.xml similarity index 96% rename from activitytype-stdout/pom.xml rename to driver-stdout/pom.xml index 171c4a970..fc4853b44 100644 --- a/activitytype-stdout/pom.xml +++ b/driver-stdout/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - activitytype-stdout + driver-stdout jar diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/AsyncStdoutAction.java diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutAction.java diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivity.java diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutActivityType.java diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/StdoutOpContext.java diff --git a/activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/TemplateFormat.java b/driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/TemplateFormat.java similarity index 100% rename from activitytype-stdout/src/main/java/io/nosqlbench/activitytype/stdout/TemplateFormat.java rename to driver-stdout/src/main/java/io/nosqlbench/activitytype/stdout/TemplateFormat.java diff --git a/activitytype-stdout/src/main/resources/activities/stdout-catfile.yaml b/driver-stdout/src/main/resources/activities/stdout-catfile.yaml similarity index 100% rename from activitytype-stdout/src/main/resources/activities/stdout-catfile.yaml rename to driver-stdout/src/main/resources/activities/stdout-catfile.yaml diff --git a/activitytype-stdout/src/main/resources/activities/stdout-test-formatted.yaml b/driver-stdout/src/main/resources/activities/stdout-test-formatted.yaml similarity index 100% rename from activitytype-stdout/src/main/resources/activities/stdout-test-formatted.yaml rename to driver-stdout/src/main/resources/activities/stdout-test-formatted.yaml diff --git a/activitytype-stdout/src/main/resources/activities/stdout-test.yaml b/driver-stdout/src/main/resources/activities/stdout-test.yaml similarity index 100% rename from activitytype-stdout/src/main/resources/activities/stdout-test.yaml rename to driver-stdout/src/main/resources/activities/stdout-test.yaml diff --git a/activitytype-stdout/src/main/resources/stdout.md b/driver-stdout/src/main/resources/stdout.md similarity index 100% rename from activitytype-stdout/src/main/resources/stdout.md rename to driver-stdout/src/main/resources/stdout.md diff --git a/activitytype-stdout/src/main/resources/topics.md b/driver-stdout/src/main/resources/topics.md similarity index 100% rename from activitytype-stdout/src/main/resources/topics.md rename to driver-stdout/src/main/resources/topics.md diff --git a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java similarity index 100% rename from activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java rename to driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StatementFormattersTest.java diff --git a/activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java b/driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java similarity index 100% rename from activitytype-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java rename to driver-stdout/src/test/java/io/nosqlbench/activitytype/stdout/StdoutActivityTypeTest.java diff --git a/activitytype-stdout/src/test/resources/activities/csv-test.yaml b/driver-stdout/src/test/resources/activities/csv-test.yaml similarity index 100% rename from activitytype-stdout/src/test/resources/activities/csv-test.yaml rename to driver-stdout/src/test/resources/activities/csv-test.yaml diff --git a/activitytype-tcp/pom.xml b/driver-tcp/pom.xml similarity index 93% rename from activitytype-tcp/pom.xml rename to driver-tcp/pom.xml index 0f2c81385..957033546 100644 --- a/activitytype-tcp/pom.xml +++ b/driver-tcp/pom.xml @@ -1,7 +1,7 @@ 4.0.0 - activitytype-tcp + driver-tcp jar @@ -28,7 +28,7 @@ io.nosqlbench - activitytype-stdout + driver-stdout 3.12.100-SNAPSHOT diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java similarity index 100% rename from activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java rename to driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivity.java diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java similarity index 100% rename from activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java rename to driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpclient/TCPClientActivityType.java diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java similarity index 100% rename from activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java rename to driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivity.java diff --git a/activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java b/driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java similarity index 100% rename from activitytype-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java rename to driver-tcp/src/main/java/io/nosqlbench/activitytype/tcpserver/TCPServerActivityType.java diff --git a/activitytype-tcp/src/main/resources/tcpclient.md b/driver-tcp/src/main/resources/tcpclient.md similarity index 100% rename from activitytype-tcp/src/main/resources/tcpclient.md rename to driver-tcp/src/main/resources/tcpclient.md diff --git a/activitytype-tcp/src/main/resources/tcpserver.md b/driver-tcp/src/main/resources/tcpserver.md similarity index 100% rename from activitytype-tcp/src/main/resources/tcpserver.md rename to driver-tcp/src/main/resources/tcpserver.md diff --git a/activitytype-tcp/src/main/resources/topics.md b/driver-tcp/src/main/resources/topics.md similarity index 100% rename from activitytype-tcp/src/main/resources/topics.md rename to driver-tcp/src/main/resources/topics.md diff --git a/nb/pom.xml b/nb/pom.xml index 12c735526..cb2f682f8 100644 --- a/nb/pom.xml +++ b/nb/pom.xml @@ -59,37 +59,37 @@ io.nosqlbench - activitytype-stdout + driver-stdout 3.12.100-SNAPSHOT io.nosqlbench - activitytype-diag + driver-diag 3.12.100-SNAPSHOT io.nosqlbench - activitytype-tcp + driver-tcp 3.12.100-SNAPSHOT io.nosqlbench - activitytype-http + driver-http 3.12.100-SNAPSHOT io.nosqlbench - activitytype-cql + driver-cql 3.12.100-SNAPSHOT io.nosqlbench - activitytype-cqlverify + driver-cqlverify 3.12.100-SNAPSHOT diff --git a/pom.xml b/pom.xml index 8f09a4085..cc7763cdd 100644 --- a/pom.xml +++ b/pom.xml @@ -36,12 +36,12 @@ nb - activitytype-diag - activitytype-stdout - activitytype-tcp - activitytype-http - activitytype-cql - activitytype-cqlverify + driver-diag + driver-stdout + driver-tcp + driver-http + driver-cql + driver-cqlverify driver-web