[FLINK-4676] [connectors] Merge batch and streaming connectors into c…

…ommon Maven module. This closes apache#2897.
fhueske · Dec 2, 2016 · 72a8802 · 72a8802
1 parent 2fcef5e
commit 72a8802
Show file tree

Hide file tree

Showing 345 changed files with 32 additions and 73 deletions.
diff --git a/.gitignore b/.gitignore
@@ -17,7 +17,7 @@ tmp
 *.log
 .DS_Store
 build-target
-flink-batch-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
+flink-connectors/flink-avro/src/test/java/org/apache/flink/api/io/avro/generated/
 flink-runtime-web/web-dashboard/assets/fonts/
 flink-runtime-web/web-dashboard/node_modules/
 flink-runtime-web/web-dashboard/bower_components/

diff --git a/flink-batch-connectors/pom.xml b/flink-batch-connectors/pom.xml
diff --git a/flink-batch-connectors/flink-avro/pom.xml → flink-connectors/flink-avro/pom.xml b/flink-batch-connectors/flink-avro/pom.xml → flink-connectors/flink-avro/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-batch-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...ache/flink/api/avro/DataInputDecoder.java → ...ache/flink/api/avro/DataInputDecoder.java b/...ache/flink/api/avro/DataInputDecoder.java → ...ache/flink/api/avro/DataInputDecoder.java
diff --git a/...che/flink/api/avro/DataOutputEncoder.java → ...che/flink/api/avro/DataOutputEncoder.java b/...che/flink/api/avro/DataOutputEncoder.java → ...che/flink/api/avro/DataOutputEncoder.java
diff --git a/...nk/api/avro/FSDataInputStreamWrapper.java → ...nk/api/avro/FSDataInputStreamWrapper.java b/...nk/api/avro/FSDataInputStreamWrapper.java → ...nk/api/avro/FSDataInputStreamWrapper.java
diff --git a/...he/flink/api/java/io/AvroInputFormat.java → ...he/flink/api/java/io/AvroInputFormat.java b/...he/flink/api/java/io/AvroInputFormat.java → ...he/flink/api/java/io/AvroInputFormat.java
diff --git a/...e/flink/api/java/io/AvroOutputFormat.java → ...e/flink/api/java/io/AvroOutputFormat.java b/...e/flink/api/java/io/AvroOutputFormat.java → ...e/flink/api/java/io/AvroOutputFormat.java
diff --git a/...-avro/src/test/assembly/test-assembly.xml → ...-avro/src/test/assembly/test-assembly.xml b/...-avro/src/test/assembly/test-assembly.xml → ...-avro/src/test/assembly/test-assembly.xml
diff --git a/...pi/avro/AvroExternalJarProgramITCase.java → ...pi/avro/AvroExternalJarProgramITCase.java b/...pi/avro/AvroExternalJarProgramITCase.java → ...pi/avro/AvroExternalJarProgramITCase.java
diff --git a/...link/api/avro/AvroOutputFormatITCase.java → ...link/api/avro/AvroOutputFormatITCase.java b/...link/api/avro/AvroOutputFormatITCase.java → ...link/api/avro/AvroOutputFormatITCase.java
diff --git a/...he/flink/api/avro/EncoderDecoderTest.java → ...he/flink/api/avro/EncoderDecoderTest.java b/...he/flink/api/avro/EncoderDecoderTest.java → ...he/flink/api/avro/EncoderDecoderTest.java
diff --git a/.../avro/testjar/AvroExternalJarProgram.java → .../avro/testjar/AvroExternalJarProgram.java b/.../avro/testjar/AvroExternalJarProgram.java → .../avro/testjar/AvroExternalJarProgram.java
diff --git a/...pache/flink/api/io/avro/AvroPojoTest.java → ...pache/flink/api/io/avro/AvroPojoTest.java b/...pache/flink/api/io/avro/AvroPojoTest.java → ...pache/flink/api/io/avro/AvroPojoTest.java
diff --git a/...pi/io/avro/AvroRecordInputFormatTest.java → ...pi/io/avro/AvroRecordInputFormatTest.java b/...pi/io/avro/AvroRecordInputFormatTest.java → ...pi/io/avro/AvroRecordInputFormatTest.java
diff --git a/...o/avro/AvroSplittableInputFormatTest.java → ...o/avro/AvroSplittableInputFormatTest.java b/...o/avro/AvroSplittableInputFormatTest.java → ...o/avro/AvroSplittableInputFormatTest.java
diff --git a/.../api/io/avro/example/AvroTypeExample.java → .../api/io/avro/example/AvroTypeExample.java b/.../api/io/avro/example/AvroTypeExample.java → .../api/io/avro/example/AvroTypeExample.java
diff --git a/...pache/flink/api/io/avro/example/User.java → ...pache/flink/api/io/avro/example/User.java b/...pache/flink/api/io/avro/example/User.java → ...pache/flink/api/io/avro/example/User.java
diff --git a/...io/AvroInputFormatTypeExtractionTest.java → ...io/AvroInputFormatTypeExtractionTest.java b/...io/AvroInputFormatTypeExtractionTest.java → ...io/AvroInputFormatTypeExtractionTest.java
diff --git a/...ink/api/java/io/AvroOutputFormatTest.java → ...ink/api/java/io/AvroOutputFormatTest.java b/...ink/api/java/io/AvroOutputFormatTest.java → ...ink/api/java/io/AvroOutputFormatTest.java
diff --git a/...nk-avro/src/test/resources/avro/user.avsc → ...nk-avro/src/test/resources/avro/user.avsc b/...nk-avro/src/test/resources/avro/user.avsc → ...nk-avro/src/test/resources/avro/user.avsc
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...-avro/src/test/resources/logback-test.xml → ...-avro/src/test/resources/logback-test.xml b/...-avro/src/test/resources/logback-test.xml → ...-avro/src/test/resources/logback-test.xml
diff --git a/...ink-avro/src/test/resources/testdata.avro → ...ink-avro/src/test/resources/testdata.avro b/...ink-avro/src/test/resources/testdata.avro → ...ink-avro/src/test/resources/testdata.avro
diff --git a/...nectors/flink-connector-cassandra/pom.xml → ...nectors/flink-connector-cassandra/pom.xml b/...nectors/flink-connector-cassandra/pom.xml → ...nectors/flink-connector-cassandra/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...ctors/cassandra/CassandraInputFormat.java → ...ctors/cassandra/CassandraInputFormat.java b/...ctors/cassandra/CassandraInputFormat.java → ...ctors/cassandra/CassandraInputFormat.java
diff --git a/...tors/cassandra/CassandraOutputFormat.java → ...tors/cassandra/CassandraOutputFormat.java b/...tors/cassandra/CassandraOutputFormat.java → ...tors/cassandra/CassandraOutputFormat.java
diff --git a/...nectors/cassandra/CassandraCommitter.java → ...nectors/cassandra/CassandraCommitter.java b/...nectors/cassandra/CassandraCommitter.java → ...nectors/cassandra/CassandraCommitter.java
diff --git a/...nnectors/cassandra/CassandraPojoSink.java → ...nnectors/cassandra/CassandraPojoSink.java b/...nnectors/cassandra/CassandraPojoSink.java → ...nnectors/cassandra/CassandraPojoSink.java
diff --git a/...g/connectors/cassandra/CassandraSink.java → ...g/connectors/cassandra/CassandraSink.java b/...g/connectors/cassandra/CassandraSink.java → ...g/connectors/cassandra/CassandraSink.java
diff --git a/...nnectors/cassandra/CassandraSinkBase.java → ...nnectors/cassandra/CassandraSinkBase.java b/...nnectors/cassandra/CassandraSinkBase.java → ...nnectors/cassandra/CassandraSinkBase.java
diff --git a/...nectors/cassandra/CassandraTupleSink.java → ...nectors/cassandra/CassandraTupleSink.java b/...nectors/cassandra/CassandraTupleSink.java → ...nectors/cassandra/CassandraTupleSink.java
diff --git a/...ssandra/CassandraTupleWriteAheadSink.java → ...ssandra/CassandraTupleWriteAheadSink.java b/...ssandra/CassandraTupleWriteAheadSink.java → ...ssandra/CassandraTupleWriteAheadSink.java
diff --git a/.../connectors/cassandra/ClusterBuilder.java → .../connectors/cassandra/ClusterBuilder.java b/.../connectors/cassandra/ClusterBuilder.java → .../connectors/cassandra/ClusterBuilder.java
diff --git a/...ctors/cassandra/example/BatchExample.java → ...ctors/cassandra/example/BatchExample.java b/...ctors/cassandra/example/BatchExample.java → ...ctors/cassandra/example/BatchExample.java
diff --git a/...s/cassandra/CassandraConnectorITCase.java → ...s/cassandra/CassandraConnectorITCase.java b/...s/cassandra/CassandraConnectorITCase.java → ...s/cassandra/CassandraConnectorITCase.java
diff --git a/...dra/CassandraTupleWriteAheadSinkTest.java → ...dra/CassandraTupleWriteAheadSinkTest.java b/...dra/CassandraTupleWriteAheadSinkTest.java → ...dra/CassandraTupleWriteAheadSinkTest.java
diff --git a/.../streaming/connectors/cassandra/Pojo.java → .../streaming/connectors/cassandra/Pojo.java b/.../streaming/connectors/cassandra/Pojo.java → .../streaming/connectors/cassandra/Pojo.java
diff --git a/...dra/example/CassandraPojoSinkExample.java → ...dra/example/CassandraPojoSinkExample.java b/...dra/example/CassandraPojoSinkExample.java → ...dra/example/CassandraPojoSinkExample.java
diff --git a/...ra/example/CassandraTupleSinkExample.java → ...ra/example/CassandraTupleSinkExample.java b/...ra/example/CassandraTupleSinkExample.java → ...ra/example/CassandraTupleSinkExample.java
diff --git a/.../CassandraTupleWriteAheadSinkExample.java → .../CassandraTupleWriteAheadSinkExample.java b/.../CassandraTupleWriteAheadSinkExample.java → .../CassandraTupleWriteAheadSinkExample.java
diff --git a/...connectors/cassandra/example/Message.java → ...connectors/cassandra/example/Message.java b/...connectors/cassandra/example/Message.java → ...connectors/cassandra/example/Message.java
diff --git a/...ssandra/src/test/resources/cassandra.yaml → ...ssandra/src/test/resources/cassandra.yaml b/...ssandra/src/test/resources/cassandra.yaml → ...ssandra/src/test/resources/cassandra.yaml
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...ors/flink-connector-elasticsearch/pom.xml → ...ors/flink-connector-elasticsearch/pom.xml b/...ors/flink-connector-elasticsearch/pom.xml → ...ors/flink-connector-elasticsearch/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...tors/elasticsearch/ElasticsearchSink.java → ...tors/elasticsearch/ElasticsearchSink.java b/...tors/elasticsearch/ElasticsearchSink.java → ...tors/elasticsearch/ElasticsearchSink.java
diff --git a/...rs/elasticsearch/IndexRequestBuilder.java → ...rs/elasticsearch/IndexRequestBuilder.java b/...rs/elasticsearch/IndexRequestBuilder.java → ...rs/elasticsearch/IndexRequestBuilder.java
diff --git a/...lasticsearch/ElasticsearchSinkITCase.java → ...lasticsearch/ElasticsearchSinkITCase.java b/...lasticsearch/ElasticsearchSinkITCase.java → ...lasticsearch/ElasticsearchSinkITCase.java
diff --git a/...search/examples/ElasticsearchExample.java → ...search/examples/ElasticsearchExample.java b/...search/examples/ElasticsearchExample.java → ...search/examples/ElasticsearchExample.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...earch/src/test/resources/logback-test.xml → ...earch/src/test/resources/logback-test.xml b/...earch/src/test/resources/logback-test.xml → ...earch/src/test/resources/logback-test.xml
diff --git a/...rs/flink-connector-elasticsearch2/pom.xml → ...rs/flink-connector-elasticsearch2/pom.xml b/...rs/flink-connector-elasticsearch2/pom.xml → ...rs/flink-connector-elasticsearch2/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/.../elasticsearch2/BulkProcessorIndexer.java → .../elasticsearch2/BulkProcessorIndexer.java b/.../elasticsearch2/BulkProcessorIndexer.java → .../elasticsearch2/BulkProcessorIndexer.java
diff --git a/...ors/elasticsearch2/ElasticsearchSink.java → ...ors/elasticsearch2/ElasticsearchSink.java b/...ors/elasticsearch2/ElasticsearchSink.java → ...ors/elasticsearch2/ElasticsearchSink.java
diff --git a/...ticsearch2/ElasticsearchSinkFunction.java → ...ticsearch2/ElasticsearchSinkFunction.java b/...ticsearch2/ElasticsearchSinkFunction.java → ...ticsearch2/ElasticsearchSinkFunction.java
diff --git a/...ectors/elasticsearch2/RequestIndexer.java → ...ectors/elasticsearch2/RequestIndexer.java b/...ectors/elasticsearch2/RequestIndexer.java → ...ectors/elasticsearch2/RequestIndexer.java
diff --git a/...asticsearch2/ElasticsearchSinkITCase.java → ...asticsearch2/ElasticsearchSinkITCase.java b/...asticsearch2/ElasticsearchSinkITCase.java → ...asticsearch2/ElasticsearchSinkITCase.java
diff --git a/...earch2/examples/ElasticsearchExample.java → ...earch2/examples/ElasticsearchExample.java b/...earch2/examples/ElasticsearchExample.java → ...earch2/examples/ElasticsearchExample.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...arch2/src/test/resources/logback-test.xml → ...arch2/src/test/resources/logback-test.xml b/...arch2/src/test/resources/logback-test.xml → ...arch2/src/test/resources/logback-test.xml
diff --git a/...ectors/flink-connector-filesystem/pom.xml → ...ectors/flink-connector-filesystem/pom.xml b/...ectors/flink-connector-filesystem/pom.xml → ...ectors/flink-connector-filesystem/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...connectors/fs/AvroKeyValueSinkWriter.java → ...connectors/fs/AvroKeyValueSinkWriter.java b/...connectors/fs/AvroKeyValueSinkWriter.java → ...connectors/fs/AvroKeyValueSinkWriter.java
diff --git a/...ink/streaming/connectors/fs/Bucketer.java → ...ink/streaming/connectors/fs/Bucketer.java b/...ink/streaming/connectors/fs/Bucketer.java → ...ink/streaming/connectors/fs/Bucketer.java
diff --git a/.../flink/streaming/connectors/fs/Clock.java → .../flink/streaming/connectors/fs/Clock.java b/.../flink/streaming/connectors/fs/Clock.java → .../flink/streaming/connectors/fs/Clock.java
diff --git a/...aming/connectors/fs/DateTimeBucketer.java → ...aming/connectors/fs/DateTimeBucketer.java b/...aming/connectors/fs/DateTimeBucketer.java → ...aming/connectors/fs/DateTimeBucketer.java
diff --git a/...ing/connectors/fs/NonRollingBucketer.java → ...ing/connectors/fs/NonRollingBucketer.java b/...ing/connectors/fs/NonRollingBucketer.java → ...ing/connectors/fs/NonRollingBucketer.java
diff --git a/.../streaming/connectors/fs/RollingSink.java → .../streaming/connectors/fs/RollingSink.java b/.../streaming/connectors/fs/RollingSink.java → .../streaming/connectors/fs/RollingSink.java
diff --git a/...ing/connectors/fs/SequenceFileWriter.java → ...ing/connectors/fs/SequenceFileWriter.java b/...ing/connectors/fs/SequenceFileWriter.java → ...ing/connectors/fs/SequenceFileWriter.java
diff --git a/...aming/connectors/fs/StreamWriterBase.java → ...aming/connectors/fs/StreamWriterBase.java b/...aming/connectors/fs/StreamWriterBase.java → ...aming/connectors/fs/StreamWriterBase.java
diff --git a/...streaming/connectors/fs/StringWriter.java → ...streaming/connectors/fs/StringWriter.java b/...streaming/connectors/fs/StringWriter.java → ...streaming/connectors/fs/StringWriter.java
diff --git a/.../streaming/connectors/fs/SystemClock.java → .../streaming/connectors/fs/SystemClock.java b/.../streaming/connectors/fs/SystemClock.java → .../streaming/connectors/fs/SystemClock.java
diff --git a/...flink/streaming/connectors/fs/Writer.java → ...flink/streaming/connectors/fs/Writer.java b/...flink/streaming/connectors/fs/Writer.java → ...flink/streaming/connectors/fs/Writer.java
diff --git a/...ectors/fs/bucketing/BasePathBucketer.java → ...ectors/fs/bucketing/BasePathBucketer.java b/...ectors/fs/bucketing/BasePathBucketer.java → ...ectors/fs/bucketing/BasePathBucketer.java
diff --git a/...ing/connectors/fs/bucketing/Bucketer.java → ...ing/connectors/fs/bucketing/Bucketer.java b/...ing/connectors/fs/bucketing/Bucketer.java → ...ing/connectors/fs/bucketing/Bucketer.java
diff --git a/...onnectors/fs/bucketing/BucketingSink.java → ...onnectors/fs/bucketing/BucketingSink.java b/...onnectors/fs/bucketing/BucketingSink.java → ...onnectors/fs/bucketing/BucketingSink.java
diff --git a/...ectors/fs/bucketing/DateTimeBucketer.java → ...ectors/fs/bucketing/DateTimeBucketer.java b/...ectors/fs/bucketing/DateTimeBucketer.java → ...ectors/fs/bucketing/DateTimeBucketer.java
diff --git a/...ystem/src/main/resources/log4j.properties → ...ystem/src/main/resources/log4j.properties b/...ystem/src/main/resources/log4j.properties → ...ystem/src/main/resources/log4j.properties
diff --git a/...s/fs/RollingSinkFaultToleranceITCase.java → ...s/fs/RollingSinkFaultToleranceITCase.java b/...s/fs/RollingSinkFaultToleranceITCase.java → ...s/fs/RollingSinkFaultToleranceITCase.java
diff --git a/...ming/connectors/fs/RollingSinkITCase.java → ...ming/connectors/fs/RollingSinkITCase.java b/...ming/connectors/fs/RollingSinkITCase.java → ...ming/connectors/fs/RollingSinkITCase.java
diff --git a/...nnectors/fs/RollingSinkSecuredITCase.java → ...nnectors/fs/RollingSinkSecuredITCase.java b/...nnectors/fs/RollingSinkSecuredITCase.java → ...nnectors/fs/RollingSinkSecuredITCase.java
diff --git a/...ng/BucketingSinkFaultToleranceITCase.java → ...ng/BucketingSinkFaultToleranceITCase.java b/...ng/BucketingSinkFaultToleranceITCase.java → ...ng/BucketingSinkFaultToleranceITCase.java
diff --git a/...ctors/fs/bucketing/BucketingSinkTest.java → ...ctors/fs/bucketing/BucketingSinkTest.java b/...ctors/fs/bucketing/BucketingSinkTest.java → ...ctors/fs/bucketing/BucketingSinkTest.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...ystem/src/test/resources/logback-test.xml → ...ystem/src/test/resources/logback-test.xml b/...ystem/src/test/resources/logback-test.xml → ...ystem/src/test/resources/logback-test.xml
diff --git a/...-connectors/flink-connector-flume/pom.xml → ...-connectors/flink-connector-flume/pom.xml b/...-connectors/flink-connector-flume/pom.xml → ...-connectors/flink-connector-flume/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...streaming/connectors/flume/FlumeSink.java → ...streaming/connectors/flume/FlumeSink.java b/...streaming/connectors/flume/FlumeSink.java → ...streaming/connectors/flume/FlumeSink.java
diff --git a/...ectors/flink-connector-kafka-0.10/pom.xml → ...ectors/flink-connector-kafka-0.10/pom.xml b/...ectors/flink-connector-kafka-0.10/pom.xml → ...ectors/flink-connector-kafka-0.10/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...nnectors/kafka/FlinkKafkaConsumer010.java → ...nnectors/kafka/FlinkKafkaConsumer010.java b/...nnectors/kafka/FlinkKafkaConsumer010.java → ...nnectors/kafka/FlinkKafkaConsumer010.java
diff --git a/...nnectors/kafka/FlinkKafkaProducer010.java → ...nnectors/kafka/FlinkKafkaProducer010.java b/...nnectors/kafka/FlinkKafkaProducer010.java → ...nnectors/kafka/FlinkKafkaProducer010.java
diff --git a/...ectors/kafka/Kafka010JsonTableSource.java → ...ectors/kafka/Kafka010JsonTableSource.java b/...ectors/kafka/Kafka010JsonTableSource.java → ...ectors/kafka/Kafka010JsonTableSource.java
diff --git a/...connectors/kafka/Kafka010TableSource.java → ...connectors/kafka/Kafka010TableSource.java b/...connectors/kafka/Kafka010TableSource.java → ...connectors/kafka/Kafka010TableSource.java
diff --git a/...ctors/kafka/internal/Kafka010Fetcher.java → ...ctors/kafka/internal/Kafka010Fetcher.java b/...ctors/kafka/internal/Kafka010Fetcher.java → ...ctors/kafka/internal/Kafka010Fetcher.java
diff --git a/.../internal/KafkaConsumerCallBridge010.java → .../internal/KafkaConsumerCallBridge010.java b/.../internal/KafkaConsumerCallBridge010.java → .../internal/KafkaConsumerCallBridge010.java
diff --git a/...-0.10/src/main/resources/log4j.properties → ...-0.10/src/main/resources/log4j.properties b/...-0.10/src/main/resources/log4j.properties → ...-0.10/src/main/resources/log4j.properties
diff --git a/...connectors/kafka/Kafka010FetcherTest.java → ...connectors/kafka/Kafka010FetcherTest.java b/...connectors/kafka/Kafka010FetcherTest.java → ...connectors/kafka/Kafka010FetcherTest.java
diff --git a/...ming/connectors/kafka/Kafka010ITCase.java → ...ming/connectors/kafka/Kafka010ITCase.java b/...ming/connectors/kafka/Kafka010ITCase.java → ...ming/connectors/kafka/Kafka010ITCase.java
diff --git a/...nectors/kafka/Kafka010ProducerITCase.java → ...nectors/kafka/Kafka010ProducerITCase.java b/...nectors/kafka/Kafka010ProducerITCase.java → ...nectors/kafka/Kafka010ProducerITCase.java
diff --git a/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java b/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...-0.10/src/test/resources/logback-test.xml → ...-0.10/src/test/resources/logback-test.xml b/...-0.10/src/test/resources/logback-test.xml → ...-0.10/src/test/resources/logback-test.xml
diff --git a/...nectors/flink-connector-kafka-0.8/pom.xml → ...nectors/flink-connector-kafka-0.8/pom.xml b/...nectors/flink-connector-kafka-0.8/pom.xml → ...nectors/flink-connector-kafka-0.8/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...onnectors/kafka/FlinkKafkaConsumer08.java → ...onnectors/kafka/FlinkKafkaConsumer08.java b/...onnectors/kafka/FlinkKafkaConsumer08.java → ...onnectors/kafka/FlinkKafkaConsumer08.java
diff --git a/...nnectors/kafka/FlinkKafkaConsumer081.java → ...nnectors/kafka/FlinkKafkaConsumer081.java b/...nnectors/kafka/FlinkKafkaConsumer081.java → ...nnectors/kafka/FlinkKafkaConsumer081.java
diff --git a/...nnectors/kafka/FlinkKafkaConsumer082.java → ...nnectors/kafka/FlinkKafkaConsumer082.java b/...nnectors/kafka/FlinkKafkaConsumer082.java → ...nnectors/kafka/FlinkKafkaConsumer082.java
diff --git a/.../connectors/kafka/FlinkKafkaProducer.java → .../connectors/kafka/FlinkKafkaProducer.java b/.../connectors/kafka/FlinkKafkaProducer.java → .../connectors/kafka/FlinkKafkaProducer.java
diff --git a/...onnectors/kafka/FlinkKafkaProducer08.java → ...onnectors/kafka/FlinkKafkaProducer08.java b/...onnectors/kafka/FlinkKafkaProducer08.java → ...onnectors/kafka/FlinkKafkaProducer08.java
diff --git a/...onnectors/kafka/Kafka08JsonTableSink.java → ...onnectors/kafka/Kafka08JsonTableSink.java b/...onnectors/kafka/Kafka08JsonTableSink.java → ...onnectors/kafka/Kafka08JsonTableSink.java
diff --git a/...nectors/kafka/Kafka08JsonTableSource.java → ...nectors/kafka/Kafka08JsonTableSource.java b/...nectors/kafka/Kafka08JsonTableSource.java → ...nectors/kafka/Kafka08JsonTableSource.java
diff --git a/.../connectors/kafka/Kafka08TableSource.java → .../connectors/kafka/Kafka08TableSource.java b/.../connectors/kafka/Kafka08TableSource.java → .../connectors/kafka/Kafka08TableSource.java
diff --git a/...afka/internals/ClosableBlockingQueue.java → ...afka/internals/ClosableBlockingQueue.java b/...afka/internals/ClosableBlockingQueue.java → ...afka/internals/ClosableBlockingQueue.java
diff --git a/...ctors/kafka/internals/Kafka08Fetcher.java → ...ctors/kafka/internals/Kafka08Fetcher.java b/...ctors/kafka/internals/Kafka08Fetcher.java → ...ctors/kafka/internals/Kafka08Fetcher.java
diff --git a/...ctors/kafka/internals/KillerWatchDog.java → ...ctors/kafka/internals/KillerWatchDog.java b/...ctors/kafka/internals/KillerWatchDog.java → ...ctors/kafka/internals/KillerWatchDog.java
diff --git a/...kafka/internals/PartitionInfoFetcher.java → ...kafka/internals/PartitionInfoFetcher.java b/...kafka/internals/PartitionInfoFetcher.java → ...kafka/internals/PartitionInfoFetcher.java
diff --git a/...ka/internals/PeriodicOffsetCommitter.java → ...ka/internals/PeriodicOffsetCommitter.java b/...ka/internals/PeriodicOffsetCommitter.java → ...ka/internals/PeriodicOffsetCommitter.java
diff --git a/...kafka/internals/SimpleConsumerThread.java → ...kafka/internals/SimpleConsumerThread.java b/...kafka/internals/SimpleConsumerThread.java → ...kafka/internals/SimpleConsumerThread.java
diff --git a/...fka/internals/ZookeeperOffsetHandler.java → ...fka/internals/ZookeeperOffsetHandler.java b/...fka/internals/ZookeeperOffsetHandler.java → ...fka/internals/ZookeeperOffsetHandler.java
diff --git a/...aming/connectors/kafka/Kafka08ITCase.java → ...aming/connectors/kafka/Kafka08ITCase.java b/...aming/connectors/kafka/Kafka08ITCase.java → ...aming/connectors/kafka/Kafka08ITCase.java
diff --git a/...ctors/kafka/Kafka08JsonTableSinkTest.java → ...ctors/kafka/Kafka08JsonTableSinkTest.java b/...ctors/kafka/Kafka08JsonTableSinkTest.java → ...ctors/kafka/Kafka08JsonTableSinkTest.java
diff --git a/...ors/kafka/Kafka08JsonTableSourceTest.java → ...ors/kafka/Kafka08JsonTableSourceTest.java b/...ors/kafka/Kafka08JsonTableSourceTest.java → ...ors/kafka/Kafka08JsonTableSourceTest.java
diff --git a/...nnectors/kafka/Kafka08ProducerITCase.java → ...nnectors/kafka/Kafka08ProducerITCase.java b/...nnectors/kafka/Kafka08ProducerITCase.java → ...nnectors/kafka/Kafka08ProducerITCase.java
diff --git a/...connectors/kafka/KafkaConsumer08Test.java → ...connectors/kafka/KafkaConsumer08Test.java b/...connectors/kafka/KafkaConsumer08Test.java → ...connectors/kafka/KafkaConsumer08Test.java
diff --git a/...onnectors/kafka/KafkaLocalSystemTime.java → ...onnectors/kafka/KafkaLocalSystemTime.java b/...onnectors/kafka/KafkaLocalSystemTime.java → ...onnectors/kafka/KafkaLocalSystemTime.java
diff --git a/...g/connectors/kafka/KafkaProducerTest.java → ...g/connectors/kafka/KafkaProducerTest.java b/...g/connectors/kafka/KafkaProducerTest.java → ...g/connectors/kafka/KafkaProducerTest.java
diff --git a/...rs/kafka/KafkaShortRetention08ITCase.java → ...rs/kafka/KafkaShortRetention08ITCase.java b/...rs/kafka/KafkaShortRetention08ITCase.java → ...rs/kafka/KafkaShortRetention08ITCase.java
diff --git a/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java b/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java
diff --git a/.../internals/ClosableBlockingQueueTest.java → .../internals/ClosableBlockingQueueTest.java b/.../internals/ClosableBlockingQueueTest.java → .../internals/ClosableBlockingQueueTest.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...a-0.8/src/test/resources/logback-test.xml → ...a-0.8/src/test/resources/logback-test.xml b/...a-0.8/src/test/resources/logback-test.xml → ...a-0.8/src/test/resources/logback-test.xml
diff --git a/...nectors/flink-connector-kafka-0.9/pom.xml → ...nectors/flink-connector-kafka-0.9/pom.xml b/...nectors/flink-connector-kafka-0.9/pom.xml → ...nectors/flink-connector-kafka-0.9/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...onnectors/kafka/FlinkKafkaConsumer09.java → ...onnectors/kafka/FlinkKafkaConsumer09.java b/...onnectors/kafka/FlinkKafkaConsumer09.java → ...onnectors/kafka/FlinkKafkaConsumer09.java
diff --git a/...onnectors/kafka/FlinkKafkaProducer09.java → ...onnectors/kafka/FlinkKafkaProducer09.java b/...onnectors/kafka/FlinkKafkaProducer09.java → ...onnectors/kafka/FlinkKafkaProducer09.java
diff --git a/...onnectors/kafka/Kafka09JsonTableSink.java → ...onnectors/kafka/Kafka09JsonTableSink.java b/...onnectors/kafka/Kafka09JsonTableSink.java → ...onnectors/kafka/Kafka09JsonTableSink.java
diff --git a/...nectors/kafka/Kafka09JsonTableSource.java → ...nectors/kafka/Kafka09JsonTableSource.java b/...nectors/kafka/Kafka09JsonTableSource.java → ...nectors/kafka/Kafka09JsonTableSource.java
diff --git a/.../connectors/kafka/Kafka09TableSource.java → .../connectors/kafka/Kafka09TableSource.java b/.../connectors/kafka/Kafka09TableSource.java → .../connectors/kafka/Kafka09TableSource.java
diff --git a/...g/connectors/kafka/internal/Handover.java → ...g/connectors/kafka/internal/Handover.java b/...g/connectors/kafka/internal/Handover.java → ...g/connectors/kafka/internal/Handover.java
diff --git a/...ectors/kafka/internal/Kafka09Fetcher.java → ...ectors/kafka/internal/Kafka09Fetcher.java b/...ectors/kafka/internal/Kafka09Fetcher.java → ...ectors/kafka/internal/Kafka09Fetcher.java
diff --git a/...fka/internal/KafkaConsumerCallBridge.java → ...fka/internal/KafkaConsumerCallBridge.java b/...fka/internal/KafkaConsumerCallBridge.java → ...fka/internal/KafkaConsumerCallBridge.java
diff --git a/...s/kafka/internal/KafkaConsumerThread.java → ...s/kafka/internal/KafkaConsumerThread.java b/...s/kafka/internal/KafkaConsumerThread.java → ...s/kafka/internal/KafkaConsumerThread.java
diff --git a/...a-0.9/src/main/resources/log4j.properties → ...a-0.9/src/main/resources/log4j.properties b/...a-0.9/src/main/resources/log4j.properties → ...a-0.9/src/main/resources/log4j.properties
diff --git a/.../connectors/kafka/Kafka09FetcherTest.java → .../connectors/kafka/Kafka09FetcherTest.java b/.../connectors/kafka/Kafka09FetcherTest.java → .../connectors/kafka/Kafka09FetcherTest.java
diff --git a/...aming/connectors/kafka/Kafka09ITCase.java → ...aming/connectors/kafka/Kafka09ITCase.java b/...aming/connectors/kafka/Kafka09ITCase.java → ...aming/connectors/kafka/Kafka09ITCase.java
diff --git a/...ctors/kafka/Kafka09JsonTableSinkTest.java → ...ctors/kafka/Kafka09JsonTableSinkTest.java b/...ctors/kafka/Kafka09JsonTableSinkTest.java → ...ctors/kafka/Kafka09JsonTableSinkTest.java
diff --git a/...ors/kafka/Kafka09JsonTableSourceTest.java → ...ors/kafka/Kafka09JsonTableSourceTest.java b/...ors/kafka/Kafka09JsonTableSourceTest.java → ...ors/kafka/Kafka09JsonTableSourceTest.java
diff --git a/...nnectors/kafka/Kafka09ProducerITCase.java → ...nnectors/kafka/Kafka09ProducerITCase.java b/...nnectors/kafka/Kafka09ProducerITCase.java → ...nnectors/kafka/Kafka09ProducerITCase.java
diff --git a/...ectors/kafka/Kafka09SecuredRunITCase.java → ...ectors/kafka/Kafka09SecuredRunITCase.java b/...ectors/kafka/Kafka09SecuredRunITCase.java → ...ectors/kafka/Kafka09SecuredRunITCase.java
diff --git a/...g/connectors/kafka/KafkaProducerTest.java → ...g/connectors/kafka/KafkaProducerTest.java b/...g/connectors/kafka/KafkaProducerTest.java → ...g/connectors/kafka/KafkaProducerTest.java
diff --git a/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java b/...ctors/kafka/KafkaTestEnvironmentImpl.java → ...ctors/kafka/KafkaTestEnvironmentImpl.java
diff --git a/...nnectors/kafka/internal/HandoverTest.java → ...nnectors/kafka/internal/HandoverTest.java b/...nnectors/kafka/internal/HandoverTest.java → ...nnectors/kafka/internal/HandoverTest.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...a-0.9/src/test/resources/logback-test.xml → ...a-0.9/src/test/resources/logback-test.xml b/...a-0.9/src/test/resources/logback-test.xml → ...a-0.9/src/test/resources/logback-test.xml
diff --git a/...ectors/flink-connector-kafka-base/pom.xml → ...ectors/flink-connector-kafka-base/pom.xml b/...ectors/flink-connector-kafka-base/pom.xml → ...ectors/flink-connector-kafka-base/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...nectors/kafka/FlinkKafkaConsumerBase.java → ...nectors/kafka/FlinkKafkaConsumerBase.java b/...nectors/kafka/FlinkKafkaConsumerBase.java → ...nectors/kafka/FlinkKafkaConsumerBase.java
diff --git a/...nectors/kafka/FlinkKafkaProducerBase.java → ...nectors/kafka/FlinkKafkaProducerBase.java b/...nectors/kafka/FlinkKafkaProducerBase.java → ...nectors/kafka/FlinkKafkaProducerBase.java
diff --git a/.../connectors/kafka/KafkaJsonTableSink.java → .../connectors/kafka/KafkaJsonTableSink.java b/.../connectors/kafka/KafkaJsonTableSink.java → .../connectors/kafka/KafkaJsonTableSink.java
diff --git a/...onnectors/kafka/KafkaJsonTableSource.java → ...onnectors/kafka/KafkaJsonTableSource.java b/...onnectors/kafka/KafkaJsonTableSource.java → ...onnectors/kafka/KafkaJsonTableSource.java
diff --git a/...ming/connectors/kafka/KafkaTableSink.java → ...ming/connectors/kafka/KafkaTableSink.java b/...ming/connectors/kafka/KafkaTableSink.java → ...ming/connectors/kafka/KafkaTableSink.java
diff --git a/...ng/connectors/kafka/KafkaTableSource.java → ...ng/connectors/kafka/KafkaTableSource.java b/...ng/connectors/kafka/KafkaTableSource.java → ...ng/connectors/kafka/KafkaTableSource.java
diff --git a/...tors/kafka/internals/AbstractFetcher.java → ...tors/kafka/internals/AbstractFetcher.java b/...tors/kafka/internals/AbstractFetcher.java → ...tors/kafka/internals/AbstractFetcher.java
diff --git a/...ctors/kafka/internals/ExceptionProxy.java → ...ctors/kafka/internals/ExceptionProxy.java b/...ctors/kafka/internals/ExceptionProxy.java → ...ctors/kafka/internals/ExceptionProxy.java
diff --git a/.../kafka/internals/KafkaTopicPartition.java → .../kafka/internals/KafkaTopicPartition.java b/.../kafka/internals/KafkaTopicPartition.java → .../kafka/internals/KafkaTopicPartition.java
diff --git a/.../internals/KafkaTopicPartitionLeader.java → .../internals/KafkaTopicPartitionLeader.java b/.../internals/KafkaTopicPartitionLeader.java → .../internals/KafkaTopicPartitionLeader.java
diff --git a/...a/internals/KafkaTopicPartitionState.java → ...a/internals/KafkaTopicPartitionState.java b/...a/internals/KafkaTopicPartitionState.java → ...a/internals/KafkaTopicPartitionState.java
diff --git a/...PartitionStateWithPeriodicWatermarks.java → ...PartitionStateWithPeriodicWatermarks.java b/...PartitionStateWithPeriodicWatermarks.java → ...PartitionStateWithPeriodicWatermarks.java
diff --git a/...rtitionStateWithPunctuatedWatermarks.java → ...rtitionStateWithPunctuatedWatermarks.java b/...rtitionStateWithPunctuatedWatermarks.java → ...rtitionStateWithPunctuatedWatermarks.java
diff --git a/.../connectors/kafka/internals/TypeUtil.java → .../connectors/kafka/internals/TypeUtil.java b/.../connectors/kafka/internals/TypeUtil.java → .../connectors/kafka/internals/TypeUtil.java
diff --git a/...internals/metrics/KafkaMetricWrapper.java → ...internals/metrics/KafkaMetricWrapper.java b/...internals/metrics/KafkaMetricWrapper.java → ...internals/metrics/KafkaMetricWrapper.java
diff --git a/...s/kafka/partitioner/FixedPartitioner.java → ...s/kafka/partitioner/FixedPartitioner.java b/...s/kafka/partitioner/FixedPartitioner.java → ...s/kafka/partitioner/FixedPartitioner.java
diff --git a/...s/kafka/partitioner/KafkaPartitioner.java → ...s/kafka/partitioner/KafkaPartitioner.java b/...s/kafka/partitioner/KafkaPartitioner.java → ...s/kafka/partitioner/KafkaPartitioner.java
diff --git a/...ialization/JSONDeserializationSchema.java → ...ialization/JSONDeserializationSchema.java b/...ialization/JSONDeserializationSchema.java → ...ialization/JSONDeserializationSchema.java
diff --git a/...on/JSONKeyValueDeserializationSchema.java → ...on/JSONKeyValueDeserializationSchema.java b/...on/JSONKeyValueDeserializationSchema.java → ...on/JSONKeyValueDeserializationSchema.java
diff --git a/...ization/JsonRowDeserializationSchema.java → ...ization/JsonRowDeserializationSchema.java b/...ization/JsonRowDeserializationSchema.java → ...ization/JsonRowDeserializationSchema.java
diff --git a/...alization/JsonRowSerializationSchema.java → ...alization/JsonRowSerializationSchema.java b/...alization/JsonRowSerializationSchema.java → ...alization/JsonRowSerializationSchema.java
diff --git a/...alization/KeyedDeserializationSchema.java → ...alization/KeyedDeserializationSchema.java b/...alization/KeyedDeserializationSchema.java → ...alization/KeyedDeserializationSchema.java
diff --git a/...on/KeyedDeserializationSchemaWrapper.java → ...on/KeyedDeserializationSchemaWrapper.java b/...on/KeyedDeserializationSchemaWrapper.java → ...on/KeyedDeserializationSchemaWrapper.java
diff --git a/...rialization/KeyedSerializationSchema.java → ...rialization/KeyedSerializationSchema.java b/...rialization/KeyedSerializationSchema.java → ...rialization/KeyedSerializationSchema.java
diff --git a/...tion/KeyedSerializationSchemaWrapper.java → ...tion/KeyedSerializationSchemaWrapper.java b/...tion/KeyedSerializationSchemaWrapper.java → ...tion/KeyedSerializationSchemaWrapper.java
diff --git a/...formationKeyValueSerializationSchema.java → ...formationKeyValueSerializationSchema.java b/...formationKeyValueSerializationSchema.java → ...formationKeyValueSerializationSchema.java
diff --git a/...ors/kafka/FlinkKafkaConsumerBaseTest.java → ...ors/kafka/FlinkKafkaConsumerBaseTest.java b/...ors/kafka/FlinkKafkaConsumerBaseTest.java → ...ors/kafka/FlinkKafkaConsumerBaseTest.java
diff --git a/...ors/kafka/FlinkKafkaProducerBaseTest.java → ...ors/kafka/FlinkKafkaProducerBaseTest.java b/...ors/kafka/FlinkKafkaProducerBaseTest.java → ...ors/kafka/FlinkKafkaProducerBaseTest.java
diff --git a/.../kafka/JSONDeserializationSchemaTest.java → .../kafka/JSONDeserializationSchemaTest.java b/.../kafka/JSONDeserializationSchemaTest.java → .../kafka/JSONDeserializationSchemaTest.java
diff --git a/...SONKeyValueDeserializationSchemaTest.java → ...SONKeyValueDeserializationSchemaTest.java b/...SONKeyValueDeserializationSchemaTest.java → ...SONKeyValueDeserializationSchemaTest.java
diff --git a/...fka/JsonRowDeserializationSchemaTest.java → ...fka/JsonRowDeserializationSchemaTest.java b/...fka/JsonRowDeserializationSchemaTest.java → ...fka/JsonRowDeserializationSchemaTest.java
diff --git a/...kafka/JsonRowSerializationSchemaTest.java → ...kafka/JsonRowSerializationSchemaTest.java b/...kafka/JsonRowSerializationSchemaTest.java → ...kafka/JsonRowSerializationSchemaTest.java
diff --git a/...KafkaConsumerPartitionAssignmentTest.java → ...KafkaConsumerPartitionAssignmentTest.java b/...KafkaConsumerPartitionAssignmentTest.java → ...KafkaConsumerPartitionAssignmentTest.java
diff --git a/...nnectors/kafka/KafkaConsumerTestBase.java → ...nnectors/kafka/KafkaConsumerTestBase.java b/...nnectors/kafka/KafkaConsumerTestBase.java → ...nnectors/kafka/KafkaConsumerTestBase.java
diff --git a/...nnectors/kafka/KafkaProducerTestBase.java → ...nnectors/kafka/KafkaProducerTestBase.java b/...nnectors/kafka/KafkaProducerTestBase.java → ...nnectors/kafka/KafkaProducerTestBase.java
diff --git a/...rs/kafka/KafkaShortRetentionTestBase.java → ...rs/kafka/KafkaShortRetentionTestBase.java b/...rs/kafka/KafkaShortRetentionTestBase.java → ...rs/kafka/KafkaShortRetentionTestBase.java
diff --git a/...nectors/kafka/KafkaTableSinkTestBase.java → ...nectors/kafka/KafkaTableSinkTestBase.java b/...nectors/kafka/KafkaTableSinkTestBase.java → ...nectors/kafka/KafkaTableSinkTestBase.java
diff --git a/...ctors/kafka/KafkaTableSourceTestBase.java → ...ctors/kafka/KafkaTableSourceTestBase.java b/...ctors/kafka/KafkaTableSourceTestBase.java → ...ctors/kafka/KafkaTableSourceTestBase.java
diff --git a/...aming/connectors/kafka/KafkaTestBase.java → ...aming/connectors/kafka/KafkaTestBase.java b/...aming/connectors/kafka/KafkaTestBase.java → ...aming/connectors/kafka/KafkaTestBase.java
diff --git a/...onnectors/kafka/KafkaTestEnvironment.java → ...onnectors/kafka/KafkaTestEnvironment.java b/...onnectors/kafka/KafkaTestEnvironment.java → ...onnectors/kafka/KafkaTestEnvironment.java
diff --git a/...onnectors/kafka/TestFixedPartitioner.java → ...onnectors/kafka/TestFixedPartitioner.java b/...onnectors/kafka/TestFixedPartitioner.java → ...onnectors/kafka/TestFixedPartitioner.java
diff --git a/...ernals/AbstractFetcherTimestampsTest.java → ...ernals/AbstractFetcherTimestampsTest.java b/...ernals/AbstractFetcherTimestampsTest.java → ...ernals/AbstractFetcherTimestampsTest.java
diff --git a/...ka/internals/KafkaTopicPartitionTest.java → ...ka/internals/KafkaTopicPartitionTest.java b/...ka/internals/KafkaTopicPartitionTest.java → ...ka/internals/KafkaTopicPartitionTest.java
diff --git a/...ctors/kafka/testutils/DataGenerators.java → ...ctors/kafka/testutils/DataGenerators.java b/...ctors/kafka/testutils/DataGenerators.java → ...ctors/kafka/testutils/DataGenerators.java
diff --git a/...afka/testutils/FailingIdentityMapper.java → ...afka/testutils/FailingIdentityMapper.java b/...afka/testutils/FailingIdentityMapper.java → ...afka/testutils/FailingIdentityMapper.java
diff --git a/...testutils/FakeStandardProducerConfig.java → ...testutils/FakeStandardProducerConfig.java b/...testutils/FakeStandardProducerConfig.java → ...testutils/FakeStandardProducerConfig.java
diff --git a/...stutils/JobManagerCommunicationUtils.java → ...stutils/JobManagerCommunicationUtils.java b/...stutils/JobManagerCommunicationUtils.java → ...stutils/JobManagerCommunicationUtils.java
diff --git a/.../testutils/PartitionValidatingMapper.java → .../testutils/PartitionValidatingMapper.java b/.../testutils/PartitionValidatingMapper.java → .../testutils/PartitionValidatingMapper.java
diff --git a/...tors/kafka/testutils/ThrottledMapper.java → ...tors/kafka/testutils/ThrottledMapper.java b/...tors/kafka/testutils/ThrottledMapper.java → ...tors/kafka/testutils/ThrottledMapper.java
diff --git a/...rs/kafka/testutils/Tuple2Partitioner.java → ...rs/kafka/testutils/Tuple2Partitioner.java b/...rs/kafka/testutils/Tuple2Partitioner.java → ...rs/kafka/testutils/Tuple2Partitioner.java
diff --git a/.../testutils/ValidatingExactlyOnceSink.java → .../testutils/ValidatingExactlyOnceSink.java b/.../testutils/ValidatingExactlyOnceSink.java → .../testutils/ValidatingExactlyOnceSink.java
diff --git a/.../testutils/ZooKeeperStringSerializer.java → .../testutils/ZooKeeperStringSerializer.java b/.../testutils/ZooKeeperStringSerializer.java → .../testutils/ZooKeeperStringSerializer.java
diff --git a/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties b/.../src/test/resources/log4j-test.properties → .../src/test/resources/log4j-test.properties
diff --git a/...-base/src/test/resources/logback-test.xml → ...-base/src/test/resources/logback-test.xml b/...-base/src/test/resources/logback-test.xml → ...-base/src/test/resources/logback-test.xml
diff --git a/...onnectors/flink-connector-kinesis/pom.xml → ...onnectors/flink-connector-kinesis/pom.xml b/...onnectors/flink-connector-kinesis/pom.xml → ...onnectors/flink-connector-kinesis/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...nectors/kinesis/FlinkKinesisConsumer.java → ...nectors/kinesis/FlinkKinesisConsumer.java b/...nectors/kinesis/FlinkKinesisConsumer.java → ...nectors/kinesis/FlinkKinesisConsumer.java
diff --git a/...nectors/kinesis/FlinkKinesisProducer.java → ...nectors/kinesis/FlinkKinesisProducer.java b/...nectors/kinesis/FlinkKinesisProducer.java → ...nectors/kinesis/FlinkKinesisProducer.java
diff --git a/...onnectors/kinesis/KinesisPartitioner.java → ...onnectors/kinesis/KinesisPartitioner.java b/...onnectors/kinesis/KinesisPartitioner.java → ...onnectors/kinesis/KinesisPartitioner.java
diff --git a/...rs/kinesis/config/AWSConfigConstants.java → ...rs/kinesis/config/AWSConfigConstants.java b/...rs/kinesis/config/AWSConfigConstants.java → ...rs/kinesis/config/AWSConfigConstants.java
diff --git a/...nesis/config/ConsumerConfigConstants.java → ...nesis/config/ConsumerConfigConstants.java b/...nesis/config/ConsumerConfigConstants.java → ...nesis/config/ConsumerConfigConstants.java
diff --git a/...nesis/config/ProducerConfigConstants.java → ...nesis/config/ProducerConfigConstants.java b/...nesis/config/ProducerConfigConstants.java → ...nesis/config/ProducerConfigConstants.java
diff --git a/.../kinesis/examples/ConsumeFromKinesis.java → .../kinesis/examples/ConsumeFromKinesis.java b/.../kinesis/examples/ConsumeFromKinesis.java → .../kinesis/examples/ConsumeFromKinesis.java
diff --git a/.../kinesis/examples/ProduceIntoKinesis.java → .../kinesis/examples/ProduceIntoKinesis.java b/.../kinesis/examples/ProduceIntoKinesis.java → .../kinesis/examples/ProduceIntoKinesis.java
diff --git a/...kinesis/internals/KinesisDataFetcher.java → ...kinesis/internals/KinesisDataFetcher.java b/...kinesis/internals/KinesisDataFetcher.java → ...kinesis/internals/KinesisDataFetcher.java
diff --git a/...tors/kinesis/internals/ShardConsumer.java → ...tors/kinesis/internals/ShardConsumer.java b/...tors/kinesis/internals/ShardConsumer.java → ...tors/kinesis/internals/ShardConsumer.java
diff --git a/...ors/kinesis/model/KinesisStreamShard.java → ...ors/kinesis/model/KinesisStreamShard.java b/...ors/kinesis/model/KinesisStreamShard.java → ...ors/kinesis/model/KinesisStreamShard.java
diff --git a/...inesis/model/KinesisStreamShardState.java → ...inesis/model/KinesisStreamShardState.java b/...inesis/model/KinesisStreamShardState.java → ...inesis/model/KinesisStreamShardState.java
diff --git a/...kinesis/model/SentinelSequenceNumber.java → ...kinesis/model/SentinelSequenceNumber.java b/...kinesis/model/SentinelSequenceNumber.java → ...kinesis/model/SentinelSequenceNumber.java
diff --git a/...nectors/kinesis/model/SequenceNumber.java → ...nectors/kinesis/model/SequenceNumber.java b/...nectors/kinesis/model/SequenceNumber.java → ...nectors/kinesis/model/SequenceNumber.java
diff --git a/...ors/kinesis/proxy/GetShardListResult.java → ...ors/kinesis/proxy/GetShardListResult.java b/...ors/kinesis/proxy/GetShardListResult.java → ...ors/kinesis/proxy/GetShardListResult.java
diff --git a/...onnectors/kinesis/proxy/KinesisProxy.java → ...onnectors/kinesis/proxy/KinesisProxy.java b/...onnectors/kinesis/proxy/KinesisProxy.java → ...onnectors/kinesis/proxy/KinesisProxy.java
diff --git a/.../kinesis/proxy/KinesisProxyInterface.java → .../kinesis/proxy/KinesisProxyInterface.java b/.../kinesis/proxy/KinesisProxyInterface.java → .../kinesis/proxy/KinesisProxyInterface.java
diff --git a/...ization/KinesisDeserializationSchema.java → ...ization/KinesisDeserializationSchema.java b/...ization/KinesisDeserializationSchema.java → ...ization/KinesisDeserializationSchema.java
diff --git a/.../KinesisDeserializationSchemaWrapper.java → .../KinesisDeserializationSchemaWrapper.java b/.../KinesisDeserializationSchemaWrapper.java → .../KinesisDeserializationSchemaWrapper.java
diff --git a/...alization/KinesisSerializationSchema.java → ...alization/KinesisSerializationSchema.java b/...alization/KinesisSerializationSchema.java → ...alization/KinesisSerializationSchema.java
diff --git a/...ming/connectors/kinesis/util/AWSUtil.java → ...ming/connectors/kinesis/util/AWSUtil.java b/...ming/connectors/kinesis/util/AWSUtil.java → ...ming/connectors/kinesis/util/AWSUtil.java
diff --git a/...ctors/kinesis/util/KinesisConfigUtil.java → ...ctors/kinesis/util/KinesisConfigUtil.java b/...ctors/kinesis/util/KinesisConfigUtil.java → ...ctors/kinesis/util/KinesisConfigUtil.java
diff --git a/...nesis/src/main/resources/log4j.properties → ...nesis/src/main/resources/log4j.properties b/...nesis/src/main/resources/log4j.properties → ...nesis/src/main/resources/log4j.properties
diff --git a/...ors/kinesis/FlinkKinesisConsumerTest.java → ...ors/kinesis/FlinkKinesisConsumerTest.java b/...ors/kinesis/FlinkKinesisConsumerTest.java → ...ors/kinesis/FlinkKinesisConsumerTest.java
diff --git a/...sis/internals/KinesisDataFetcherTest.java → ...sis/internals/KinesisDataFetcherTest.java b/...sis/internals/KinesisDataFetcherTest.java → ...sis/internals/KinesisDataFetcherTest.java
diff --git a/.../kinesis/internals/ShardConsumerTest.java → .../kinesis/internals/ShardConsumerTest.java b/.../kinesis/internals/ShardConsumerTest.java → .../kinesis/internals/ShardConsumerTest.java
diff --git a/...nualtests/ManualConsumerProducerTest.java → ...nualtests/ManualConsumerProducerTest.java b/...nualtests/ManualConsumerProducerTest.java → ...nualtests/ManualConsumerProducerTest.java
diff --git a/...is/manualtests/ManualExactlyOnceTest.java → ...is/manualtests/ManualExactlyOnceTest.java b/...is/manualtests/ManualExactlyOnceTest.java → ...is/manualtests/ManualExactlyOnceTest.java
diff --git a/...lExactlyOnceWithStreamReshardingTest.java → ...lExactlyOnceWithStreamReshardingTest.java b/...lExactlyOnceWithStreamReshardingTest.java → ...lExactlyOnceWithStreamReshardingTest.java
diff --git a/...nesis/manualtests/ManualProducerTest.java → ...nesis/manualtests/ManualProducerTest.java b/...nesis/manualtests/ManualProducerTest.java → ...nesis/manualtests/ManualProducerTest.java
diff --git a/.../ExactlyOnceValidatingConsumerThread.java → .../ExactlyOnceValidatingConsumerThread.java b/.../ExactlyOnceValidatingConsumerThread.java → .../ExactlyOnceValidatingConsumerThread.java
diff --git a/...stutils/FakeKinesisBehavioursFactory.java → ...stutils/FakeKinesisBehavioursFactory.java b/...stutils/FakeKinesisBehavioursFactory.java → ...stutils/FakeKinesisBehavioursFactory.java
diff --git a/...KinesisEventsGeneratorProducerThread.java → ...KinesisEventsGeneratorProducerThread.java b/...KinesisEventsGeneratorProducerThread.java → ...KinesisEventsGeneratorProducerThread.java
diff --git a/...is/testutils/KinesisShardIdGenerator.java → ...is/testutils/KinesisShardIdGenerator.java b/...is/testutils/KinesisShardIdGenerator.java → ...is/testutils/KinesisShardIdGenerator.java
diff --git a/...stutils/TestableFlinkKinesisConsumer.java → ...stutils/TestableFlinkKinesisConsumer.java b/...stutils/TestableFlinkKinesisConsumer.java → ...stutils/TestableFlinkKinesisConsumer.java
diff --git a/...testutils/TestableKinesisDataFetcher.java → ...testutils/TestableKinesisDataFetcher.java b/...testutils/TestableKinesisDataFetcher.java → ...testutils/TestableKinesisDataFetcher.java
diff --git a/...g-connectors/flink-connector-nifi/pom.xml → ...k-connectors/flink-connector-nifi/pom.xml b/...g-connectors/flink-connector-nifi/pom.xml → ...k-connectors/flink-connector-nifi/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...aming/connectors/nifi/NiFiDataPacket.java → ...aming/connectors/nifi/NiFiDataPacket.java b/...aming/connectors/nifi/NiFiDataPacket.java → ...aming/connectors/nifi/NiFiDataPacket.java
diff --git a/...onnectors/nifi/NiFiDataPacketBuilder.java → ...onnectors/nifi/NiFiDataPacketBuilder.java b/...onnectors/nifi/NiFiDataPacketBuilder.java → ...onnectors/nifi/NiFiDataPacketBuilder.java
diff --git a/...k/streaming/connectors/nifi/NiFiSink.java → ...k/streaming/connectors/nifi/NiFiSink.java b/...k/streaming/connectors/nifi/NiFiSink.java → ...k/streaming/connectors/nifi/NiFiSink.java
diff --git a/...streaming/connectors/nifi/NiFiSource.java → ...streaming/connectors/nifi/NiFiSource.java b/...streaming/connectors/nifi/NiFiSource.java → ...streaming/connectors/nifi/NiFiSource.java
diff --git a/...nnectors/nifi/StandardNiFiDataPacket.java → ...nnectors/nifi/StandardNiFiDataPacket.java b/...nnectors/nifi/StandardNiFiDataPacket.java → ...nnectors/nifi/StandardNiFiDataPacket.java
diff --git a/...ifi/examples/NiFiSinkTopologyExample.java → ...ifi/examples/NiFiSinkTopologyExample.java b/...ifi/examples/NiFiSinkTopologyExample.java → ...ifi/examples/NiFiSinkTopologyExample.java
diff --git a/...i/examples/NiFiSourceTopologyExample.java → ...i/examples/NiFiSourceTopologyExample.java b/...i/examples/NiFiSourceTopologyExample.java → ...i/examples/NiFiSourceTopologyExample.java
diff --git a/...or-nifi/src/test/resources/NiFi_Flink.xml → ...or-nifi/src/test/resources/NiFi_Flink.xml b/...or-nifi/src/test/resources/NiFi_Flink.xml → ...or-nifi/src/test/resources/NiFi_Flink.xml
diff --git a/...nnectors/flink-connector-rabbitmq/pom.xml → ...nnectors/flink-connector-rabbitmq/pom.xml b/...nnectors/flink-connector-rabbitmq/pom.xml → ...nnectors/flink-connector-rabbitmq/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...treaming/connectors/rabbitmq/RMQSink.java → ...treaming/connectors/rabbitmq/RMQSink.java b/...treaming/connectors/rabbitmq/RMQSink.java → ...treaming/connectors/rabbitmq/RMQSink.java
diff --git a/...eaming/connectors/rabbitmq/RMQSource.java → ...eaming/connectors/rabbitmq/RMQSource.java b/...eaming/connectors/rabbitmq/RMQSource.java → ...eaming/connectors/rabbitmq/RMQSource.java
diff --git a/.../rabbitmq/common/RMQConnectionConfig.java → .../rabbitmq/common/RMQConnectionConfig.java b/.../rabbitmq/common/RMQConnectionConfig.java → .../rabbitmq/common/RMQConnectionConfig.java
diff --git a/...ng/connectors/rabbitmq/RMQSourceTest.java → ...ng/connectors/rabbitmq/RMQSourceTest.java b/...ng/connectors/rabbitmq/RMQSourceTest.java → ...ng/connectors/rabbitmq/RMQSourceTest.java
diff --git a/...bitmq/common/RMQConnectionConfigTest.java → ...bitmq/common/RMQConnectionConfigTest.java b/...bitmq/common/RMQConnectionConfigTest.java → ...bitmq/common/RMQConnectionConfigTest.java
diff --git a/...nnectors/rabbitmq/common/RMQSinkTest.java → ...nnectors/rabbitmq/common/RMQSinkTest.java b/...nnectors/rabbitmq/common/RMQSinkTest.java → ...nnectors/rabbitmq/common/RMQSinkTest.java
diff --git a/...-connectors/flink-connector-redis/pom.xml → ...-connectors/flink-connector-redis/pom.xml b/...-connectors/flink-connector-redis/pom.xml → ...-connectors/flink-connector-redis/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...streaming/connectors/redis/RedisSink.java → ...streaming/connectors/redis/RedisSink.java b/...streaming/connectors/redis/RedisSink.java → ...streaming/connectors/redis/RedisSink.java
diff --git a/...ommon/config/FlinkJedisClusterConfig.java → ...ommon/config/FlinkJedisClusterConfig.java b/...ommon/config/FlinkJedisClusterConfig.java → ...ommon/config/FlinkJedisClusterConfig.java
diff --git a/...s/common/config/FlinkJedisConfigBase.java → ...s/common/config/FlinkJedisConfigBase.java b/...s/common/config/FlinkJedisConfigBase.java → ...s/common/config/FlinkJedisConfigBase.java
diff --git a/...s/common/config/FlinkJedisPoolConfig.java → ...s/common/config/FlinkJedisPoolConfig.java b/...s/common/config/FlinkJedisPoolConfig.java → ...s/common/config/FlinkJedisPoolConfig.java
diff --git a/...mmon/config/FlinkJedisSentinelConfig.java → ...mmon/config/FlinkJedisSentinelConfig.java b/...mmon/config/FlinkJedisSentinelConfig.java → ...mmon/config/FlinkJedisSentinelConfig.java
diff --git a/...mmon/container/RedisClusterContainer.java → ...mmon/container/RedisClusterContainer.java b/...mmon/container/RedisClusterContainer.java → ...mmon/container/RedisClusterContainer.java
diff --git a/...mon/container/RedisCommandsContainer.java → ...mon/container/RedisCommandsContainer.java b/...mon/container/RedisCommandsContainer.java → ...mon/container/RedisCommandsContainer.java
diff --git a/...tainer/RedisCommandsContainerBuilder.java → ...tainer/RedisCommandsContainerBuilder.java b/...tainer/RedisCommandsContainerBuilder.java → ...tainer/RedisCommandsContainerBuilder.java
diff --git a/...edis/common/container/RedisContainer.java → ...edis/common/container/RedisContainer.java b/...edis/common/container/RedisContainer.java → ...edis/common/container/RedisContainer.java
diff --git a/...ors/redis/common/mapper/RedisCommand.java → ...ors/redis/common/mapper/RedisCommand.java b/...ors/redis/common/mapper/RedisCommand.java → ...ors/redis/common/mapper/RedisCommand.java
diff --git a/...ommon/mapper/RedisCommandDescription.java → ...ommon/mapper/RedisCommandDescription.java b/...ommon/mapper/RedisCommandDescription.java → ...ommon/mapper/RedisCommandDescription.java
diff --git a/...rs/redis/common/mapper/RedisDataType.java → ...rs/redis/common/mapper/RedisDataType.java b/...rs/redis/common/mapper/RedisDataType.java → ...rs/redis/common/mapper/RedisDataType.java
diff --git a/...tors/redis/common/mapper/RedisMapper.java → ...tors/redis/common/mapper/RedisMapper.java b/...tors/redis/common/mapper/RedisMapper.java → ...tors/redis/common/mapper/RedisMapper.java
diff --git a/...ing/connectors/redis/RedisITCaseBase.java → ...ing/connectors/redis/RedisITCaseBase.java b/...ing/connectors/redis/RedisITCaseBase.java → ...ing/connectors/redis/RedisITCaseBase.java
diff --git a/...ctors/redis/RedisSentinelClusterTest.java → ...ctors/redis/RedisSentinelClusterTest.java b/...ctors/redis/RedisSentinelClusterTest.java → ...ctors/redis/RedisSentinelClusterTest.java
diff --git a/...ing/connectors/redis/RedisSinkITCase.java → ...ing/connectors/redis/RedisSinkITCase.java b/...ing/connectors/redis/RedisSinkITCase.java → ...ing/connectors/redis/RedisSinkITCase.java
diff --git a/...nectors/redis/RedisSinkPublishITCase.java → ...nectors/redis/RedisSinkPublishITCase.java b/...nectors/redis/RedisSinkPublishITCase.java → ...nectors/redis/RedisSinkPublishITCase.java
diff --git a/...aming/connectors/redis/RedisSinkTest.java → ...aming/connectors/redis/RedisSinkTest.java b/...aming/connectors/redis/RedisSinkTest.java → ...aming/connectors/redis/RedisSinkTest.java
diff --git a/...mmon/config/FlinkJedisConfigBaseTest.java → ...mmon/config/FlinkJedisConfigBaseTest.java b/...mmon/config/FlinkJedisConfigBaseTest.java → ...mmon/config/FlinkJedisConfigBaseTest.java
diff --git a/...common/config/JedisClusterConfigTest.java → ...common/config/JedisClusterConfigTest.java b/...common/config/JedisClusterConfigTest.java → ...common/config/JedisClusterConfigTest.java
diff --git a/...is/common/config/JedisPoolConfigTest.java → ...is/common/config/JedisPoolConfigTest.java b/...is/common/config/JedisPoolConfigTest.java → ...is/common/config/JedisPoolConfigTest.java
diff --git a/...ommon/config/JedisSentinelConfigTest.java → ...ommon/config/JedisSentinelConfigTest.java b/...ommon/config/JedisSentinelConfigTest.java → ...ommon/config/JedisSentinelConfigTest.java
diff --git a/.../mapper/RedisDataTypeDescriptionTest.java → .../mapper/RedisDataTypeDescriptionTest.java b/.../mapper/RedisDataTypeDescriptionTest.java → .../mapper/RedisDataTypeDescriptionTest.java
diff --git a/...onnectors/flink-connector-twitter/pom.xml → ...onnectors/flink-connector-twitter/pom.xml b/...onnectors/flink-connector-twitter/pom.xml → ...onnectors/flink-connector-twitter/pom.xml
@@ -25,7 +25,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-streaming-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/...ing/connectors/twitter/TwitterSource.java → ...ing/connectors/twitter/TwitterSource.java b/...ing/connectors/twitter/TwitterSource.java → ...ing/connectors/twitter/TwitterSource.java
diff --git a/...ectors/flink-hadoop-compatibility/pom.xml → ...ectors/flink-hadoop-compatibility/pom.xml b/...ectors/flink-hadoop-compatibility/pom.xml → ...ectors/flink-hadoop-compatibility/pom.xml
@@ -24,7 +24,7 @@ under the License.
 
  <parent>
  <groupId>org.apache.flink</groupId>
- <artifactId>flink-batch-connectors</artifactId>
+ <artifactId>flink-connectors</artifactId>
  <version>1.2-SNAPSHOT</version>
  <relativePath>..</relativePath>
  </parent>

diff --git a/.../api/java/typeutils/WritableTypeInfo.java → .../api/java/typeutils/WritableTypeInfo.java b/.../api/java/typeutils/WritableTypeInfo.java → .../api/java/typeutils/WritableTypeInfo.java
diff --git a/...typeutils/runtime/WritableComparator.java → ...typeutils/runtime/WritableComparator.java b/...typeutils/runtime/WritableComparator.java → ...typeutils/runtime/WritableComparator.java
diff --git a/...typeutils/runtime/WritableSerializer.java → ...typeutils/runtime/WritableSerializer.java b/...typeutils/runtime/WritableSerializer.java → ...typeutils/runtime/WritableSerializer.java
diff --git a/...ink/hadoopcompatibility/HadoopInputs.java → ...ink/hadoopcompatibility/HadoopInputs.java b/...ink/hadoopcompatibility/HadoopInputs.java → ...ink/hadoopcompatibility/HadoopInputs.java
diff --git a/...link/hadoopcompatibility/HadoopUtils.java → ...link/hadoopcompatibility/HadoopUtils.java b/...link/hadoopcompatibility/HadoopUtils.java → ...link/hadoopcompatibility/HadoopUtils.java
diff --git a/...mpatibility/mapred/HadoopMapFunction.java → ...mpatibility/mapred/HadoopMapFunction.java b/...mpatibility/mapred/HadoopMapFunction.java → ...mpatibility/mapred/HadoopMapFunction.java
diff --git a/...y/mapred/HadoopReduceCombineFunction.java → ...y/mapred/HadoopReduceCombineFunction.java b/...y/mapred/HadoopReduceCombineFunction.java → ...y/mapred/HadoopReduceCombineFunction.java
diff --git a/...tibility/mapred/HadoopReduceFunction.java → ...tibility/mapred/HadoopReduceFunction.java b/...tibility/mapred/HadoopReduceFunction.java → ...tibility/mapred/HadoopReduceFunction.java
diff --git a/...mapred/wrapper/HadoopOutputCollector.java → ...mapred/wrapper/HadoopOutputCollector.java b/...mapred/wrapper/HadoopOutputCollector.java → ...mapred/wrapper/HadoopOutputCollector.java
diff --git a/...rapper/HadoopTupleUnwrappingIterator.java → ...rapper/HadoopTupleUnwrappingIterator.java b/...rapper/HadoopTupleUnwrappingIterator.java → ...rapper/HadoopTupleUnwrappingIterator.java
diff --git a/...oopcompatibility/scala/HadoopInputs.scala → ...oopcompatibility/scala/HadoopInputs.scala b/...oopcompatibility/scala/HadoopInputs.scala → ...oopcompatibility/scala/HadoopInputs.scala
diff --git a/...ava/typeutils/WritableExtractionTest.java → ...ava/typeutils/WritableExtractionTest.java b/...ava/typeutils/WritableExtractionTest.java → ...ava/typeutils/WritableExtractionTest.java
diff --git a/...ava/typeutils/WritableInfoParserTest.java → ...ava/typeutils/WritableInfoParserTest.java b/...ava/typeutils/WritableInfoParserTest.java → ...ava/typeutils/WritableInfoParserTest.java
diff --git a/.../java/typeutils/WritableTypeInfoTest.java → .../java/typeutils/WritableTypeInfoTest.java b/.../java/typeutils/WritableTypeInfoTest.java → .../java/typeutils/WritableTypeInfoTest.java
diff --git a/...ypeutils/runtime/StringArrayWritable.java → ...ypeutils/runtime/StringArrayWritable.java b/...ypeutils/runtime/StringArrayWritable.java → ...ypeutils/runtime/StringArrayWritable.java