Small changes to align with pub expected folder structure

achilleasa · Nov 26, 2014 · 1f1d4e4 · 1f1d4e4
1 parent 1d1681f
commit 1f1d4e4
Show file tree

Hide file tree

Showing 95 changed files with 47 additions and 46 deletions.
diff --git a/dart_cassandra_cql.dart b/dart_cassandra_cql.dart
diff --git a/lib/dart_cassandra_cql.dart b/lib/dart_cassandra_cql.dart
@@ -0,0 +1,10 @@
+library dart_cassandra_cql;
+
+// Client API exports
+export "driver/exceptions.dart" show AuthenticationException, CassandraException, NoHealthyConnectionsException, DriverException;
+export "driver/types.dart";
+export "driver/query.dart";
+export "driver/protocol.dart" show ResultMessage, RowsResultMessage, VoidResultMessage, SetKeyspaceResultMessage, SchemaChangeResultMessage, EventMessage, Authenticator, PasswordAuthenticator;
+export "driver/connection.dart" hide AsyncQueue;
+export "driver/client.dart";
+export "driver/stream.dart";
diff --git a/lib/client.dart → lib/driver/client.dart b/lib/client.dart → lib/driver/client.dart
@@ -5,10 +5,10 @@ import "dart:collection";
 import "dart:typed_data";
 
 // Internal lib dependencies
-import "connection.dart";
-import "protocol.dart";
-import "query.dart";
-import "exceptions.dart";
+import 'connection.dart';
+import 'protocol.dart';
+import 'query.dart';
+import 'exceptions.dart';
 
 // Client impl
 part "client/client.dart";

diff --git a/lib/client/client.dart → lib/driver/client/client.dart b/lib/client/client.dart → lib/driver/client/client.dart
diff --git a/lib/client/result_stream.dart → lib/driver/client/result_stream.dart b/lib/client/result_stream.dart → lib/driver/client/result_stream.dart
diff --git a/lib/connection.dart → lib/driver/connection.dart b/lib/connection.dart → lib/driver/connection.dart
@@ -6,11 +6,11 @@ import "dart:io";
 import "dart:typed_data";
 
 // Internal lib dependencies
-import "logging.dart";
-import "types.dart";
-import "protocol.dart";
-import "query.dart";
-import "exceptions.dart";
+import 'logging.dart';
+import 'types.dart';
+import 'protocol.dart';
+import 'query.dart';
+import 'exceptions.dart';
 
 // Connection pools
 part "connection/async_queue.dart";

diff --git a/lib/connection/async_queue.dart → lib/driver/connection/async_queue.dart b/lib/connection/async_queue.dart → lib/driver/connection/async_queue.dart
diff --git a/lib/connection/connection.dart → lib/driver/connection/connection.dart b/lib/connection/connection.dart → lib/driver/connection/connection.dart
diff --git a/lib/connection/connection_pool.dart → lib/driver/connection/connection_pool.dart b/lib/connection/connection_pool.dart → lib/driver/connection/connection_pool.dart
diff --git a/lib/connection/pool_configuration.dart → ...driver/connection/pool_configuration.dart b/lib/connection/pool_configuration.dart → ...driver/connection/pool_configuration.dart
diff --git a/lib/connection/simple_connection_pool.dart → ...er/connection/simple_connection_pool.dart b/lib/connection/simple_connection_pool.dart → ...er/connection/simple_connection_pool.dart
diff --git a/lib/exception/authentication_exception.dart → ...r/exception/authentication_exception.dart b/lib/exception/authentication_exception.dart → ...r/exception/authentication_exception.dart
diff --git a/lib/exception/cassandra_exception.dart → ...driver/exception/cassandra_exception.dart b/lib/exception/cassandra_exception.dart → ...driver/exception/cassandra_exception.dart
diff --git a/...xception/connection_failed_exception.dart → ...xception/connection_failed_exception.dart b/...xception/connection_failed_exception.dart → ...xception/connection_failed_exception.dart
diff --git a/lib/exception/connection_lost_exception.dart → .../exception/connection_lost_exception.dart b/lib/exception/connection_lost_exception.dart → .../exception/connection_lost_exception.dart
diff --git a/...exception/driver_exception_exception.dart → ...exception/driver_exception_exception.dart b/...exception/driver_exception_exception.dart → ...exception/driver_exception_exception.dart
diff --git a/...ion/no_healthy_connections_exception.dart → ...ion/no_healthy_connections_exception.dart b/...ion/no_healthy_connections_exception.dart → ...ion/no_healthy_connections_exception.dart
diff --git a/...ception/stream_reservation_exception.dart → ...ception/stream_reservation_exception.dart b/...ception/stream_reservation_exception.dart → ...ception/stream_reservation_exception.dart
diff --git a/lib/exceptions.dart → lib/driver/exceptions.dart b/lib/exceptions.dart → lib/driver/exceptions.dart
diff --git a/lib/logging.dart → lib/driver/logging.dart b/lib/logging.dart → lib/driver/logging.dart
diff --git a/lib/logging/logger.dart → lib/driver/logging/logger.dart b/lib/logging/logger.dart → lib/driver/logging/logger.dart
diff --git a/lib/protocol.dart → lib/driver/protocol.dart b/lib/protocol.dart → lib/driver/protocol.dart
@@ -7,9 +7,9 @@ import "dart:collection";
 import "dart:convert";
 
 // Internal lib dependencies
-import "types.dart";
-import "stream.dart";
-import "query.dart";
+import 'types.dart';
+import 'stream.dart';
+import 'query.dart';
 import 'exceptions.dart';
 
 // Protocol frame readers

diff --git a/...rotocol/authentication/authenticator.dart → ...rotocol/authentication/authenticator.dart b/...rotocol/authentication/authenticator.dart → ...rotocol/authentication/authenticator.dart
diff --git a/...uthentication/password_authenticator.dart → ...uthentication/password_authenticator.dart b/...uthentication/password_authenticator.dart → ...uthentication/password_authenticator.dart
diff --git a/lib/protocol/frame/frame_decompressor.dart → ...er/protocol/frame/frame_decompressor.dart b/lib/protocol/frame/frame_decompressor.dart → ...er/protocol/frame/frame_decompressor.dart
diff --git a/lib/protocol/frame/frame_parser.dart → lib/driver/protocol/frame/frame_parser.dart b/lib/protocol/frame/frame_parser.dart → lib/driver/protocol/frame/frame_parser.dart
diff --git a/lib/protocol/frame/frame_reader.dart → lib/driver/protocol/frame/frame_reader.dart b/lib/protocol/frame/frame_reader.dart → lib/driver/protocol/frame/frame_reader.dart
diff --git a/lib/protocol/frame/frame_writer.dart → lib/driver/protocol/frame/frame_writer.dart b/lib/protocol/frame/frame_writer.dart → lib/driver/protocol/frame/frame_writer.dart
diff --git a/.../messages/internal/exception_message.dart → .../messages/internal/exception_message.dart b/.../messages/internal/exception_message.dart → .../messages/internal/exception_message.dart
diff --git a/lib/protocol/messages/message.dart → lib/driver/protocol/messages/message.dart b/lib/protocol/messages/message.dart → lib/driver/protocol/messages/message.dart
diff --git a/...sages/requests/auth_response_message.dart → ...sages/requests/auth_response_message.dart b/...sages/requests/auth_response_message.dart → ...sages/requests/auth_response_message.dart
diff --git a/...ocol/messages/requests/batch_message.dart → ...ocol/messages/requests/batch_message.dart b/...ocol/messages/requests/batch_message.dart → ...ocol/messages/requests/batch_message.dart
diff --git a/...ol/messages/requests/execute_message.dart → ...ol/messages/requests/execute_message.dart b/...ol/messages/requests/execute_message.dart → ...ol/messages/requests/execute_message.dart
diff --git a/...ol/messages/requests/prepare_message.dart → ...ol/messages/requests/prepare_message.dart b/...ol/messages/requests/prepare_message.dart → ...ol/messages/requests/prepare_message.dart
diff --git a/...ocol/messages/requests/query_message.dart → ...ocol/messages/requests/query_message.dart b/...ocol/messages/requests/query_message.dart → ...ocol/messages/requests/query_message.dart
diff --git a/...l/messages/requests/register_message.dart → ...l/messages/requests/register_message.dart b/...l/messages/requests/register_message.dart → ...l/messages/requests/register_message.dart
diff --git a/...ol/messages/requests/startup_message.dart → ...ol/messages/requests/startup_message.dart b/...ol/messages/requests/startup_message.dart → ...ol/messages/requests/startup_message.dart
diff --git a/...ges/responses/auth_challenge_message.dart → ...ges/responses/auth_challenge_message.dart b/...ges/responses/auth_challenge_message.dart → ...ges/responses/auth_challenge_message.dart
diff --git a/...sages/responses/auth_success_message.dart → ...sages/responses/auth_success_message.dart b/...sages/responses/auth_success_message.dart → ...sages/responses/auth_success_message.dart
diff --git a/...sages/responses/authenticate_message.dart → ...sages/responses/authenticate_message.dart b/...sages/responses/authenticate_message.dart → ...sages/responses/authenticate_message.dart
diff --git a/...col/messages/responses/error_message.dart → ...col/messages/responses/error_message.dart b/...col/messages/responses/error_message.dart → ...col/messages/responses/error_message.dart
diff --git a/...col/messages/responses/event_message.dart → ...col/messages/responses/event_message.dart b/...col/messages/responses/event_message.dart → ...col/messages/responses/event_message.dart
diff --git a/...es/responses/prepared_result_message.dart → ...es/responses/prepared_result_message.dart b/...es/responses/prepared_result_message.dart → ...es/responses/prepared_result_message.dart
diff --git a/...col/messages/responses/ready_message.dart → ...col/messages/responses/ready_message.dart b/...col/messages/responses/ready_message.dart → ...col/messages/responses/ready_message.dart
diff --git a/...ol/messages/responses/result_message.dart → ...ol/messages/responses/result_message.dart b/...ol/messages/responses/result_message.dart → ...ol/messages/responses/result_message.dart
diff --git a/...l/messages/responses/result_metadata.dart → ...l/messages/responses/result_metadata.dart b/...l/messages/responses/result_metadata.dart → ...l/messages/responses/result_metadata.dart
diff --git a/...ssages/responses/rows_result_message.dart → ...ssages/responses/rows_result_message.dart b/...ssages/responses/rows_result_message.dart → ...ssages/responses/rows_result_message.dart
diff --git a/...sponses/schema_change_result_message.dart → ...sponses/schema_change_result_message.dart b/...sponses/schema_change_result_message.dart → ...sponses/schema_change_result_message.dart
diff --git a/...esponses/set_keyspace_result_message.dart → ...esponses/set_keyspace_result_message.dart b/...esponses/set_keyspace_result_message.dart → ...esponses/set_keyspace_result_message.dart
diff --git a/...ssages/responses/void_result_message.dart → ...ssages/responses/void_result_message.dart b/...ssages/responses/void_result_message.dart → ...ssages/responses/void_result_message.dart
diff --git a/lib/query.dart → lib/driver/query.dart b/lib/query.dart → lib/driver/query.dart
@@ -6,7 +6,7 @@ import "dart:typed_data";
 import "dart:collection";
 
 // Internal lib dependencies
-import "types.dart";
+import 'types.dart';
 
 // Query
 part "query/query_interface.dart";

diff --git a/lib/query/batch_query.dart → lib/driver/query/batch_query.dart b/lib/query/batch_query.dart → lib/driver/query/batch_query.dart
diff --git a/lib/query/query.dart → lib/driver/query/query.dart b/lib/query/query.dart → lib/driver/query/query.dart
diff --git a/lib/query/query_interface.dart → lib/driver/query/query_interface.dart b/lib/query/query_interface.dart → lib/driver/query/query_interface.dart
diff --git a/lib/stream.dart → lib/driver/stream.dart b/lib/stream.dart → lib/driver/stream.dart
@@ -7,7 +7,7 @@ import "dart:convert";
 import "dart:math";
 
 // Internal lib dependencies
-import "types.dart";
+import 'types.dart';
 
 // Block reader/writers
 part "stream/chunked_input_reader.dart";

diff --git a/lib/stream/chunked_input_reader.dart → lib/driver/stream/chunked_input_reader.dart b/lib/stream/chunked_input_reader.dart → lib/driver/stream/chunked_input_reader.dart
diff --git a/lib/stream/chunked_output_writer.dart → lib/driver/stream/chunked_output_writer.dart b/lib/stream/chunked_output_writer.dart → lib/driver/stream/chunked_output_writer.dart
diff --git a/lib/stream/type_decoder.dart → lib/driver/stream/type_decoder.dart b/lib/stream/type_decoder.dart → lib/driver/stream/type_decoder.dart
diff --git a/lib/stream/type_encoder.dart → lib/driver/stream/type_encoder.dart b/lib/stream/type_encoder.dart → lib/driver/stream/type_encoder.dart
diff --git a/lib/types.dart → lib/driver/types.dart b/lib/types.dart → lib/driver/types.dart
diff --git a/lib/types/codec_registry.dart → lib/driver/types/codec_registry.dart b/lib/types/codec_registry.dart → lib/driver/types/codec_registry.dart
diff --git a/lib/types/custom_type.dart → lib/driver/types/custom_type.dart b/lib/types/custom_type.dart → lib/driver/types/custom_type.dart
diff --git a/lib/types/enums/batch_type.dart → lib/driver/types/enums/batch_type.dart b/lib/types/enums/batch_type.dart → lib/driver/types/enums/batch_type.dart
diff --git a/lib/types/enums/compression.dart → lib/driver/types/enums/compression.dart b/lib/types/enums/compression.dart → lib/driver/types/enums/compression.dart
diff --git a/lib/types/enums/consistency.dart → lib/driver/types/enums/consistency.dart b/lib/types/enums/consistency.dart → lib/driver/types/enums/consistency.dart
diff --git a/lib/types/enums/data_type.dart → lib/driver/types/enums/data_type.dart b/lib/types/enums/data_type.dart → lib/driver/types/enums/data_type.dart
diff --git a/lib/types/enums/enum.dart → lib/driver/types/enums/enum.dart b/lib/types/enums/enum.dart → lib/driver/types/enums/enum.dart
diff --git a/lib/types/enums/error_code.dart → lib/driver/types/enums/error_code.dart b/lib/types/enums/error_code.dart → lib/driver/types/enums/error_code.dart
diff --git a/lib/types/enums/event_registration_type.dart → .../types/enums/event_registration_type.dart b/lib/types/enums/event_registration_type.dart → .../types/enums/event_registration_type.dart
diff --git a/lib/types/enums/event_type.dart → lib/driver/types/enums/event_type.dart b/lib/types/enums/event_type.dart → lib/driver/types/enums/event_type.dart
diff --git a/lib/types/enums/header_flag.dart → lib/driver/types/enums/header_flag.dart b/lib/types/enums/header_flag.dart → lib/driver/types/enums/header_flag.dart
diff --git a/lib/types/enums/header_version.dart → lib/driver/types/enums/header_version.dart b/lib/types/enums/header_version.dart → lib/driver/types/enums/header_version.dart
diff --git a/lib/types/enums/opcode.dart → lib/driver/types/enums/opcode.dart b/lib/types/enums/opcode.dart → lib/driver/types/enums/opcode.dart
diff --git a/lib/types/enums/protocol_version.dart → lib/driver/types/enums/protocol_version.dart b/lib/types/enums/protocol_version.dart → lib/driver/types/enums/protocol_version.dart
diff --git a/lib/types/enums/query_flag.dart → lib/driver/types/enums/query_flag.dart b/lib/types/enums/query_flag.dart → lib/driver/types/enums/query_flag.dart
diff --git a/lib/types/enums/result_type.dart → lib/driver/types/enums/result_type.dart b/lib/types/enums/result_type.dart → lib/driver/types/enums/result_type.dart
diff --git a/lib/types/enums/row_result_flag.dart → lib/driver/types/enums/row_result_flag.dart b/lib/types/enums/row_result_flag.dart → lib/driver/types/enums/row_result_flag.dart
diff --git a/lib/types/frame.dart → lib/driver/types/frame.dart b/lib/types/frame.dart → lib/driver/types/frame.dart
diff --git a/lib/types/frame_header.dart → lib/driver/types/frame_header.dart b/lib/types/frame_header.dart → lib/driver/types/frame_header.dart
diff --git a/lib/types/tuple.dart → lib/driver/types/tuple.dart b/lib/types/tuple.dart → lib/driver/types/tuple.dart
diff --git a/lib/types/type_spec.dart → lib/driver/types/type_spec.dart b/lib/types/type_spec.dart → lib/driver/types/type_spec.dart
diff --git a/lib/types/uuid.dart → lib/driver/types/uuid.dart b/lib/types/uuid.dart → lib/driver/types/uuid.dart
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,7 @@
 name: dart_cassandra_cql
 version: 0.1.0
-author: Achilleas Anagnostopoulos <[email protected]>
+author: Achilleas Anagnostopoulos
+documentation:
 description: Dart driver for apache Cassandra
 homepage: https://github.com/achilleasa/dart_cassandra_cql
 dependencies:

diff --git a/test/lib/chunked_input_reader_test.dart b/test/lib/chunked_input_reader_test.dart
@@ -2,7 +2,7 @@ library dart_cassandra_cql.tests.chunked_input_reader;
 
 import "package:unittest/unittest.dart";
 
-import "../../lib/stream.dart";
+import '../../lib/driver/stream.dart';
 
 main({bool enableLogger : true}) {
 

diff --git a/test/lib/client_test.dart b/test/lib/client_test.dart
@@ -6,7 +6,7 @@ import "dart:typed_data";
 import "package:unittest/unittest.dart";
 import "mocks/mocks.dart" as mock;
 import "mocks/custom.dart" as custom;
-import "../../dart_cassandra_cql.dart" as cql;
+import '../../lib/dart_cassandra_cql.dart' as cql;
 
 main({bool enableLogger : true}) {
   if( enableLogger ){

diff --git a/test/lib/connection_test.dart b/test/lib/connection_test.dart
@@ -5,8 +5,8 @@ import "dart:async";
 import "package:unittest/unittest.dart";
 import "mocks/mocks.dart" as mock;
 import "mocks/compression.dart" as compress;
-import "../../dart_cassandra_cql.dart" as cql;
-import "../../lib/exceptions.dart" as cqlEx;
+import '../../lib/dart_cassandra_cql.dart' as cql;
+import '../../lib/driver/exceptions.dart' as cqlEx;
 
 main({bool enableLogger : true}) {
   if( enableLogger ){

diff --git a/test/lib/enum_test.dart b/test/lib/enum_test.dart
@@ -2,7 +2,7 @@ library dart_cassandra_cql.tests.enums;
 
 import "dart:mirrors";
 import "package:unittest/unittest.dart";
-import "../../lib/types.dart";
+import '../../lib/driver/types.dart';
 
 Type _getMethodArgType(MethodMirror methodMirror) {
   ParameterMirror paramMirror = methodMirror.parameters.first;

diff --git a/test/lib/frame_parser_test.dart b/test/lib/frame_parser_test.dart
@@ -4,9 +4,9 @@ import "dart:async";
 import "package:unittest/unittest.dart";
 import "mocks/mocks.dart" as mock;
 
-import "../../lib/types.dart";
-import "../../lib/protocol.dart";
-import "../../lib/exceptions.dart";
+import '../../lib/driver/types.dart';
+import '../../lib/driver/protocol.dart';
+import '../../lib/driver/exceptions.dart';
 
 main({bool enableLogger : true}) {
   if( enableLogger ){

diff --git a/test/lib/frame_writer_test.dart b/test/lib/frame_writer_test.dart
@@ -3,10 +3,10 @@ library dart_cassandra_cql.tests.frame_writer;
 import "package:unittest/unittest.dart";
 import "mocks/mocks.dart" as mock;
 
-import "../../lib/types.dart";
-import "../../lib/protocol.dart";
-import "../../lib/stream.dart";
-import "../../lib/exceptions.dart";
+import '../../lib/driver/types.dart';
+import '../../lib/driver/protocol.dart';
+import '../../lib/driver/stream.dart';
+import '../../lib/driver/exceptions.dart';
 
 main({bool enableLogger : true}) {
   if( enableLogger ){

diff --git a/test/lib/mocks/custom.dart b/test/lib/mocks/custom.dart
@@ -2,7 +2,7 @@ library dart_cassandra_cql.tests.custom;
 
 import "dart:typed_data";
 import "dart:convert";
-import "../../../lib/types.dart";
+import '../../../lib/driver/types.dart';
 
 class CustomJson implements CustomType {
   Map payload;

diff --git a/test/lib/mocks/mocks.dart b/test/lib/mocks/mocks.dart
@@ -4,9 +4,9 @@ import "dart:typed_data";
 import "dart:io";
 import "dart:async";
 import "package:logging/logging.dart";
-import "../../../lib/stream.dart";
-import "../../../lib/protocol.dart";
-import "../../../lib/types.dart";
+import '../../../lib/driver/stream.dart';
+import '../../../lib/driver/protocol.dart';
+import '../../../lib/driver/types.dart';
 
 final Logger mockLogger = new Logger("MockLogger");
 bool initializedLogger = false;

diff --git a/test/lib/pool_config_test.dart b/test/lib/pool_config_test.dart
@@ -2,7 +2,7 @@ library dart_cassandra_cql.tests.pool_config;
 
 import "package:unittest/unittest.dart";
 
-import "../../dart_cassandra_cql.dart" as cql;
+import '../../lib/dart_cassandra_cql.dart' as cql;
 
 main({bool enableLogger : true}) {
 

diff --git a/test/lib/query_test.dart b/test/lib/query_test.dart
@@ -4,7 +4,7 @@ import "dart:typed_data";
 import "dart:io";
 import "package:unittest/unittest.dart";
 
-import "../../dart_cassandra_cql.dart" as cql;
+import '../../lib/dart_cassandra_cql.dart' as cql;
 import "mocks/mocks.dart" as mock;
 import "mocks/custom.dart" as custom;
 

diff --git a/test/lib/serialization_test.dart b/test/lib/serialization_test.dart
@@ -5,8 +5,8 @@ import "dart:io";
 import "dart:math";
 import "package:unittest/unittest.dart";
 
-import "../../lib/stream.dart";
-import "../../lib/types.dart";
+import '../../lib/driver/stream.dart';
+import '../../lib/driver/types.dart';
 import "mocks/mocks.dart" as mock;
 import 'mocks/custom.dart' as custom;
 

diff --git a/test/lib/type_test.dart b/test/lib/type_test.dart
@@ -4,7 +4,7 @@ import "dart:typed_data";
 import "dart:io";
 import "package:unittest/unittest.dart";
 
-import "../../lib/types.dart";
+import '../../lib/driver/types.dart';
 import 'mocks/mocks.dart' as mock;
 import "mocks/custom.dart" as custom;