From 0bf447c697c18ec70bdec2b921b13c93be2f8eb0 Mon Sep 17 00:00:00 2001 From: Nik Everett Date: Wed, 22 Jun 2016 13:40:01 -0400 Subject: [PATCH] Group client projects under :client :client ---------> :client:rest :client-sniffer -> :client:sniffer :client-test ----> :client:test This lines the client up with how we do things like modules and plugins. --- build.gradle | 6 ++--- client/{ => rest}/build.gradle | 2 +- .../licenses/commons-codec-1.10.jar.sha1 | 0 .../rest}/licenses/commons-codec-LICENSE.txt | 0 .../rest}/licenses/commons-codec-NOTICE.txt | 0 .../licenses/commons-logging-1.1.3.jar.sha1 | 0 .../licenses/commons-logging-LICENSE.txt | 0 .../rest}/licenses/commons-logging-NOTICE.txt | 0 .../rest}/licenses/httpclient-4.5.2.jar.sha1 | 0 .../rest}/licenses/httpclient-LICENSE.txt | 0 .../rest}/licenses/httpclient-NOTICE.txt | 0 .../rest}/licenses/httpcore-4.4.4.jar.sha1 | 0 .../rest}/licenses/httpcore-LICENSE.txt | 0 .../rest}/licenses/httpcore-NOTICE.txt | 0 .../elasticsearch/client/DeadHostState.java | 0 .../client/HttpDeleteWithEntity.java | 0 .../client/HttpGetWithEntity.java | 0 .../elasticsearch/client/RequestLogger.java | 0 .../org/elasticsearch/client/Response.java | 0 .../client/ResponseException.java | 0 .../org/elasticsearch/client/RestClient.java | 0 .../client/CloseableBasicHttpResponse.java | 0 .../client/RequestLoggerTests.java | 0 .../client/RestClientBuilderTests.java | 0 .../client/RestClientIntegTests.java | 0 .../client/RestClientMultipleHostsTests.java | 0 .../client/RestClientSingleHostTests.java | 0 .../client/TrackingFailureListener.java | 0 .../sniffer}/build.gradle | 4 ++-- .../licenses/commons-codec-1.10.jar.sha1 | 0 .../licenses/commons-codec-LICENSE.txt | 0 .../licenses/commons-codec-NOTICE.txt | 0 .../licenses/commons-logging-1.1.3.jar.sha1 | 0 .../licenses/commons-logging-LICENSE.txt | 0 .../licenses/commons-logging-NOTICE.txt | 0 .../licenses/httpclient-4.5.2.jar.sha1 | 0 .../licenses/httpclient-LICENSE.txt | 0 .../licenses/httpclient-NOTICE.txt | 0 .../licenses/httpcore-4.4.4.jar.sha1 | 0 .../licenses/httpcore-LICENSE.txt | 0 .../licenses/httpcore-NOTICE.txt | 0 .../licenses/jackson-core-2.7.1.jar.sha1 | 0 .../sniffer}/licenses/jackson-core-LICENSE | 0 .../sniffer}/licenses/jackson-core-NOTICE | 0 .../client/sniff/HostsSniffer.java | 0 .../client/sniff/SniffOnFailureListener.java | 0 .../elasticsearch/client/sniff/Sniffer.java | 0 .../sniff/HostsSnifferBuilderTests.java | 0 .../client/sniff/HostsSnifferTests.java | 0 .../client/sniff/MockHostsSniffer.java | 0 .../sniff/SniffOnFailureListenerTests.java | 0 .../client/sniff/SnifferBuilderTests.java | 0 {client-test => client/test}/build.gradle | 0 .../client/RestClientTestCase.java | 0 .../client/RestClientTestUtil.java | 0 settings.gradle | 6 ++--- test/framework/build.gradle | 24 +++++++++---------- 57 files changed, 21 insertions(+), 21 deletions(-) rename client/{ => rest}/build.gradle (98%) rename {client-sniffer => client/rest}/licenses/commons-codec-1.10.jar.sha1 (100%) rename {client-sniffer => client/rest}/licenses/commons-codec-LICENSE.txt (100%) rename {client-sniffer => client/rest}/licenses/commons-codec-NOTICE.txt (100%) rename {client-sniffer => client/rest}/licenses/commons-logging-1.1.3.jar.sha1 (100%) rename {client-sniffer => client/rest}/licenses/commons-logging-LICENSE.txt (100%) rename {client-sniffer => client/rest}/licenses/commons-logging-NOTICE.txt (100%) rename {client-sniffer => client/rest}/licenses/httpclient-4.5.2.jar.sha1 (100%) rename {client-sniffer => client/rest}/licenses/httpclient-LICENSE.txt (100%) rename {client-sniffer => client/rest}/licenses/httpclient-NOTICE.txt (100%) rename {client-sniffer => client/rest}/licenses/httpcore-4.4.4.jar.sha1 (100%) rename {client-sniffer => client/rest}/licenses/httpcore-LICENSE.txt (100%) rename {client-sniffer => client/rest}/licenses/httpcore-NOTICE.txt (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/DeadHostState.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/RequestLogger.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/Response.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/ResponseException.java (100%) rename client/{ => rest}/src/main/java/org/elasticsearch/client/RestClient.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/RequestLoggerTests.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/RestClientIntegTests.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java (100%) rename client/{ => rest}/src/test/java/org/elasticsearch/client/TrackingFailureListener.java (100%) rename {client-sniffer => client/sniffer}/build.gradle (96%) rename client/{ => sniffer}/licenses/commons-codec-1.10.jar.sha1 (100%) rename client/{ => sniffer}/licenses/commons-codec-LICENSE.txt (100%) rename client/{ => sniffer}/licenses/commons-codec-NOTICE.txt (100%) rename client/{ => sniffer}/licenses/commons-logging-1.1.3.jar.sha1 (100%) rename client/{ => sniffer}/licenses/commons-logging-LICENSE.txt (100%) rename client/{ => sniffer}/licenses/commons-logging-NOTICE.txt (100%) rename client/{ => sniffer}/licenses/httpclient-4.5.2.jar.sha1 (100%) rename client/{ => sniffer}/licenses/httpclient-LICENSE.txt (100%) rename client/{ => sniffer}/licenses/httpclient-NOTICE.txt (100%) rename client/{ => sniffer}/licenses/httpcore-4.4.4.jar.sha1 (100%) rename client/{ => sniffer}/licenses/httpcore-LICENSE.txt (100%) rename client/{ => sniffer}/licenses/httpcore-NOTICE.txt (100%) rename {client-sniffer => client/sniffer}/licenses/jackson-core-2.7.1.jar.sha1 (100%) rename {client-sniffer => client/sniffer}/licenses/jackson-core-LICENSE (100%) rename {client-sniffer => client/sniffer}/licenses/jackson-core-NOTICE (100%) rename {client-sniffer => client/sniffer}/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java (100%) rename {client-sniffer => client/sniffer}/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java (100%) rename {client-sniffer => client/sniffer}/src/main/java/org/elasticsearch/client/sniff/Sniffer.java (100%) rename {client-sniffer => client/sniffer}/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java (100%) rename {client-sniffer => client/sniffer}/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java (100%) rename {client-sniffer => client/sniffer}/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java (100%) rename {client-sniffer => client/sniffer}/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java (100%) rename {client-sniffer => client/sniffer}/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java (100%) rename {client-test => client/test}/build.gradle (100%) rename {client-test => client/test}/src/main/java/org/elasticsearch/client/RestClientTestCase.java (100%) rename {client-test => client/test}/src/main/java/org/elasticsearch/client/RestClientTestUtil.java (100%) diff --git a/build.gradle b/build.gradle index 32fde425793..540f27503f0 100644 --- a/build.gradle +++ b/build.gradle @@ -163,9 +163,9 @@ subprojects { "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', "org.elasticsearch:elasticsearch:${version}": ':core', - "org.elasticsearch:client:${version}": ':client', - "org.elasticsearch:client-sniffer:${version}": ':client-sniffer', - "org.elasticsearch:client-test:${version}": ':client-test', + "org.elasticsearch.client:rest:${version}": ':client:rest', + "org.elasticsearch.client:sniffer:${version}": ':client:sniffer', + "org.elasticsearch.client:test:${version}": ':client:test', "org.elasticsearch.test:framework:${version}": ':test:framework', "org.elasticsearch.distribution.integ-test-zip:elasticsearch:${version}": ':distribution:integ-test-zip', "org.elasticsearch.distribution.zip:elasticsearch:${version}": ':distribution:zip', diff --git a/client/build.gradle b/client/rest/build.gradle similarity index 98% rename from client/build.gradle rename to client/rest/build.gradle index 2a2e77f88a4..e578126b381 100644 --- a/client/build.gradle +++ b/client/rest/build.gradle @@ -32,7 +32,7 @@ dependencies { compile "commons-codec:commons-codec:${versions.commonscodec}" compile "commons-logging:commons-logging:${versions.commonslogging}" - testCompile "org.elasticsearch:client-test:${version}" + testCompile "org.elasticsearch.client:test:${version}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "junit:junit:${versions.junit}" testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" diff --git a/client-sniffer/licenses/commons-codec-1.10.jar.sha1 b/client/rest/licenses/commons-codec-1.10.jar.sha1 similarity index 100% rename from client-sniffer/licenses/commons-codec-1.10.jar.sha1 rename to client/rest/licenses/commons-codec-1.10.jar.sha1 diff --git a/client-sniffer/licenses/commons-codec-LICENSE.txt b/client/rest/licenses/commons-codec-LICENSE.txt similarity index 100% rename from client-sniffer/licenses/commons-codec-LICENSE.txt rename to client/rest/licenses/commons-codec-LICENSE.txt diff --git a/client-sniffer/licenses/commons-codec-NOTICE.txt b/client/rest/licenses/commons-codec-NOTICE.txt similarity index 100% rename from client-sniffer/licenses/commons-codec-NOTICE.txt rename to client/rest/licenses/commons-codec-NOTICE.txt diff --git a/client-sniffer/licenses/commons-logging-1.1.3.jar.sha1 b/client/rest/licenses/commons-logging-1.1.3.jar.sha1 similarity index 100% rename from client-sniffer/licenses/commons-logging-1.1.3.jar.sha1 rename to client/rest/licenses/commons-logging-1.1.3.jar.sha1 diff --git a/client-sniffer/licenses/commons-logging-LICENSE.txt b/client/rest/licenses/commons-logging-LICENSE.txt similarity index 100% rename from client-sniffer/licenses/commons-logging-LICENSE.txt rename to client/rest/licenses/commons-logging-LICENSE.txt diff --git a/client-sniffer/licenses/commons-logging-NOTICE.txt b/client/rest/licenses/commons-logging-NOTICE.txt similarity index 100% rename from client-sniffer/licenses/commons-logging-NOTICE.txt rename to client/rest/licenses/commons-logging-NOTICE.txt diff --git a/client-sniffer/licenses/httpclient-4.5.2.jar.sha1 b/client/rest/licenses/httpclient-4.5.2.jar.sha1 similarity index 100% rename from client-sniffer/licenses/httpclient-4.5.2.jar.sha1 rename to client/rest/licenses/httpclient-4.5.2.jar.sha1 diff --git a/client-sniffer/licenses/httpclient-LICENSE.txt b/client/rest/licenses/httpclient-LICENSE.txt similarity index 100% rename from client-sniffer/licenses/httpclient-LICENSE.txt rename to client/rest/licenses/httpclient-LICENSE.txt diff --git a/client-sniffer/licenses/httpclient-NOTICE.txt b/client/rest/licenses/httpclient-NOTICE.txt similarity index 100% rename from client-sniffer/licenses/httpclient-NOTICE.txt rename to client/rest/licenses/httpclient-NOTICE.txt diff --git a/client-sniffer/licenses/httpcore-4.4.4.jar.sha1 b/client/rest/licenses/httpcore-4.4.4.jar.sha1 similarity index 100% rename from client-sniffer/licenses/httpcore-4.4.4.jar.sha1 rename to client/rest/licenses/httpcore-4.4.4.jar.sha1 diff --git a/client-sniffer/licenses/httpcore-LICENSE.txt b/client/rest/licenses/httpcore-LICENSE.txt similarity index 100% rename from client-sniffer/licenses/httpcore-LICENSE.txt rename to client/rest/licenses/httpcore-LICENSE.txt diff --git a/client-sniffer/licenses/httpcore-NOTICE.txt b/client/rest/licenses/httpcore-NOTICE.txt similarity index 100% rename from client-sniffer/licenses/httpcore-NOTICE.txt rename to client/rest/licenses/httpcore-NOTICE.txt diff --git a/client/src/main/java/org/elasticsearch/client/DeadHostState.java b/client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/DeadHostState.java rename to client/rest/src/main/java/org/elasticsearch/client/DeadHostState.java diff --git a/client/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java b/client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java rename to client/rest/src/main/java/org/elasticsearch/client/HttpDeleteWithEntity.java diff --git a/client/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java b/client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java rename to client/rest/src/main/java/org/elasticsearch/client/HttpGetWithEntity.java diff --git a/client/src/main/java/org/elasticsearch/client/RequestLogger.java b/client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/RequestLogger.java rename to client/rest/src/main/java/org/elasticsearch/client/RequestLogger.java diff --git a/client/src/main/java/org/elasticsearch/client/Response.java b/client/rest/src/main/java/org/elasticsearch/client/Response.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/Response.java rename to client/rest/src/main/java/org/elasticsearch/client/Response.java diff --git a/client/src/main/java/org/elasticsearch/client/ResponseException.java b/client/rest/src/main/java/org/elasticsearch/client/ResponseException.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/ResponseException.java rename to client/rest/src/main/java/org/elasticsearch/client/ResponseException.java diff --git a/client/src/main/java/org/elasticsearch/client/RestClient.java b/client/rest/src/main/java/org/elasticsearch/client/RestClient.java similarity index 100% rename from client/src/main/java/org/elasticsearch/client/RestClient.java rename to client/rest/src/main/java/org/elasticsearch/client/RestClient.java diff --git a/client/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java b/client/rest/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java rename to client/rest/src/test/java/org/elasticsearch/client/CloseableBasicHttpResponse.java diff --git a/client/src/test/java/org/elasticsearch/client/RequestLoggerTests.java b/client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/RequestLoggerTests.java rename to client/rest/src/test/java/org/elasticsearch/client/RequestLoggerTests.java diff --git a/client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java rename to client/rest/src/test/java/org/elasticsearch/client/RestClientBuilderTests.java diff --git a/client/src/test/java/org/elasticsearch/client/RestClientIntegTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientIntegTests.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/RestClientIntegTests.java rename to client/rest/src/test/java/org/elasticsearch/client/RestClientIntegTests.java diff --git a/client/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java rename to client/rest/src/test/java/org/elasticsearch/client/RestClientMultipleHostsTests.java diff --git a/client/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java b/client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java rename to client/rest/src/test/java/org/elasticsearch/client/RestClientSingleHostTests.java diff --git a/client/src/test/java/org/elasticsearch/client/TrackingFailureListener.java b/client/rest/src/test/java/org/elasticsearch/client/TrackingFailureListener.java similarity index 100% rename from client/src/test/java/org/elasticsearch/client/TrackingFailureListener.java rename to client/rest/src/test/java/org/elasticsearch/client/TrackingFailureListener.java diff --git a/client-sniffer/build.gradle b/client/sniffer/build.gradle similarity index 96% rename from client-sniffer/build.gradle rename to client/sniffer/build.gradle index ffd776ccae2..748c3e2261e 100644 --- a/client-sniffer/build.gradle +++ b/client/sniffer/build.gradle @@ -27,14 +27,14 @@ targetCompatibility = JavaVersion.VERSION_1_7 sourceCompatibility = JavaVersion.VERSION_1_7 dependencies { - compile "org.elasticsearch:client:${version}" + compile "org.elasticsearch.client:rest:${version}" compile "org.apache.httpcomponents:httpclient:${versions.httpclient}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "commons-codec:commons-codec:${versions.commonscodec}" compile "commons-logging:commons-logging:${versions.commonslogging}" compile "com.fasterxml.jackson.core:jackson-core:${versions.jackson}" - testCompile "org.elasticsearch:client-test:${version}" + testCompile "org.elasticsearch.client:test:${version}" testCompile "com.carrotsearch.randomizedtesting:randomizedtesting-runner:${versions.randomizedrunner}" testCompile "junit:junit:${versions.junit}" testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" diff --git a/client/licenses/commons-codec-1.10.jar.sha1 b/client/sniffer/licenses/commons-codec-1.10.jar.sha1 similarity index 100% rename from client/licenses/commons-codec-1.10.jar.sha1 rename to client/sniffer/licenses/commons-codec-1.10.jar.sha1 diff --git a/client/licenses/commons-codec-LICENSE.txt b/client/sniffer/licenses/commons-codec-LICENSE.txt similarity index 100% rename from client/licenses/commons-codec-LICENSE.txt rename to client/sniffer/licenses/commons-codec-LICENSE.txt diff --git a/client/licenses/commons-codec-NOTICE.txt b/client/sniffer/licenses/commons-codec-NOTICE.txt similarity index 100% rename from client/licenses/commons-codec-NOTICE.txt rename to client/sniffer/licenses/commons-codec-NOTICE.txt diff --git a/client/licenses/commons-logging-1.1.3.jar.sha1 b/client/sniffer/licenses/commons-logging-1.1.3.jar.sha1 similarity index 100% rename from client/licenses/commons-logging-1.1.3.jar.sha1 rename to client/sniffer/licenses/commons-logging-1.1.3.jar.sha1 diff --git a/client/licenses/commons-logging-LICENSE.txt b/client/sniffer/licenses/commons-logging-LICENSE.txt similarity index 100% rename from client/licenses/commons-logging-LICENSE.txt rename to client/sniffer/licenses/commons-logging-LICENSE.txt diff --git a/client/licenses/commons-logging-NOTICE.txt b/client/sniffer/licenses/commons-logging-NOTICE.txt similarity index 100% rename from client/licenses/commons-logging-NOTICE.txt rename to client/sniffer/licenses/commons-logging-NOTICE.txt diff --git a/client/licenses/httpclient-4.5.2.jar.sha1 b/client/sniffer/licenses/httpclient-4.5.2.jar.sha1 similarity index 100% rename from client/licenses/httpclient-4.5.2.jar.sha1 rename to client/sniffer/licenses/httpclient-4.5.2.jar.sha1 diff --git a/client/licenses/httpclient-LICENSE.txt b/client/sniffer/licenses/httpclient-LICENSE.txt similarity index 100% rename from client/licenses/httpclient-LICENSE.txt rename to client/sniffer/licenses/httpclient-LICENSE.txt diff --git a/client/licenses/httpclient-NOTICE.txt b/client/sniffer/licenses/httpclient-NOTICE.txt similarity index 100% rename from client/licenses/httpclient-NOTICE.txt rename to client/sniffer/licenses/httpclient-NOTICE.txt diff --git a/client/licenses/httpcore-4.4.4.jar.sha1 b/client/sniffer/licenses/httpcore-4.4.4.jar.sha1 similarity index 100% rename from client/licenses/httpcore-4.4.4.jar.sha1 rename to client/sniffer/licenses/httpcore-4.4.4.jar.sha1 diff --git a/client/licenses/httpcore-LICENSE.txt b/client/sniffer/licenses/httpcore-LICENSE.txt similarity index 100% rename from client/licenses/httpcore-LICENSE.txt rename to client/sniffer/licenses/httpcore-LICENSE.txt diff --git a/client/licenses/httpcore-NOTICE.txt b/client/sniffer/licenses/httpcore-NOTICE.txt similarity index 100% rename from client/licenses/httpcore-NOTICE.txt rename to client/sniffer/licenses/httpcore-NOTICE.txt diff --git a/client-sniffer/licenses/jackson-core-2.7.1.jar.sha1 b/client/sniffer/licenses/jackson-core-2.7.1.jar.sha1 similarity index 100% rename from client-sniffer/licenses/jackson-core-2.7.1.jar.sha1 rename to client/sniffer/licenses/jackson-core-2.7.1.jar.sha1 diff --git a/client-sniffer/licenses/jackson-core-LICENSE b/client/sniffer/licenses/jackson-core-LICENSE similarity index 100% rename from client-sniffer/licenses/jackson-core-LICENSE rename to client/sniffer/licenses/jackson-core-LICENSE diff --git a/client-sniffer/licenses/jackson-core-NOTICE b/client/sniffer/licenses/jackson-core-NOTICE similarity index 100% rename from client-sniffer/licenses/jackson-core-NOTICE rename to client/sniffer/licenses/jackson-core-NOTICE diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java similarity index 100% rename from client-sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java rename to client/sniffer/src/main/java/org/elasticsearch/client/sniff/HostsSniffer.java diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java similarity index 100% rename from client-sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java rename to client/sniffer/src/main/java/org/elasticsearch/client/sniff/SniffOnFailureListener.java diff --git a/client-sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java b/client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java similarity index 100% rename from client-sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java rename to client/sniffer/src/main/java/org/elasticsearch/client/sniff/Sniffer.java diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java similarity index 100% rename from client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java rename to client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferBuilderTests.java diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java similarity index 100% rename from client-sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java rename to client/sniffer/src/test/java/org/elasticsearch/client/sniff/HostsSnifferTests.java diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java similarity index 100% rename from client-sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java rename to client/sniffer/src/test/java/org/elasticsearch/client/sniff/MockHostsSniffer.java diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java similarity index 100% rename from client-sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java rename to client/sniffer/src/test/java/org/elasticsearch/client/sniff/SniffOnFailureListenerTests.java diff --git a/client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java b/client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java similarity index 100% rename from client-sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java rename to client/sniffer/src/test/java/org/elasticsearch/client/sniff/SnifferBuilderTests.java diff --git a/client-test/build.gradle b/client/test/build.gradle similarity index 100% rename from client-test/build.gradle rename to client/test/build.gradle diff --git a/client-test/src/main/java/org/elasticsearch/client/RestClientTestCase.java b/client/test/src/main/java/org/elasticsearch/client/RestClientTestCase.java similarity index 100% rename from client-test/src/main/java/org/elasticsearch/client/RestClientTestCase.java rename to client/test/src/main/java/org/elasticsearch/client/RestClientTestCase.java diff --git a/client-test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java b/client/test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java similarity index 100% rename from client-test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java rename to client/test/src/main/java/org/elasticsearch/client/RestClientTestUtil.java diff --git a/settings.gradle b/settings.gradle index a1585a7bdf2..c0d7a72b2a5 100644 --- a/settings.gradle +++ b/settings.gradle @@ -5,9 +5,9 @@ List projects = [ 'rest-api-spec', 'core', 'docs', - 'client', - 'client-sniffer', - 'client-test', + 'client:rest', + 'client:sniffer', + 'client:test', 'benchmarks', 'distribution:integ-test-zip', 'distribution:zip', diff --git a/test/framework/build.gradle b/test/framework/build.gradle index 6ddcb7598a1..8be06574df8 100644 --- a/test/framework/build.gradle +++ b/test/framework/build.gradle @@ -26,7 +26,7 @@ dependencies { compile "org.hamcrest:hamcrest-all:${versions.hamcrest}" compile "org.apache.lucene:lucene-test-framework:${versions.lucene}" compile "org.apache.lucene:lucene-codecs:${versions.lucene}" - compile "org.elasticsearch:client:${version}" + compile "org.elasticsearch.client:rest:${version}" compile "org.apache.httpcomponents:httpclient:${versions.httpclient}" compile "org.apache.httpcomponents:httpcore:${versions.httpcore}" compile "commons-logging:commons-logging:${versions.commonslogging}" @@ -48,17 +48,17 @@ dependencyLicenses.enabled = false thirdPartyAudit.excludes = [ // classes are missing - 'javax.servlet.ServletContextEvent', - 'javax.servlet.ServletContextListener', - 'org.apache.avalon.framework.logger.Logger', - 'org.apache.log.Hierarchy', - 'org.apache.log.Logger', + 'javax.servlet.ServletContextEvent', + 'javax.servlet.ServletContextListener', + 'org.apache.avalon.framework.logger.Logger', + 'org.apache.log.Hierarchy', + 'org.apache.log.Logger', // we intentionally exclude the ant tasks because people were depending on them from their tests!!!!!!! - 'org.apache.tools.ant.BuildException', - 'org.apache.tools.ant.DirectoryScanner', - 'org.apache.tools.ant.Task', - 'org.apache.tools.ant.types.FileSet', - 'org.easymock.EasyMock', - 'org.easymock.IArgumentMatcher', + 'org.apache.tools.ant.BuildException', + 'org.apache.tools.ant.DirectoryScanner', + 'org.apache.tools.ant.Task', + 'org.apache.tools.ant.types.FileSet', + 'org.easymock.EasyMock', + 'org.easymock.IArgumentMatcher', 'org.jmock.core.Constraint', ]