diff --git a/build.gradle b/build.gradle index 44f94e4630a..9d6e0541186 100644 --- a/build.gradle +++ b/build.gradle @@ -205,9 +205,8 @@ subprojects { "org.elasticsearch.gradle:build-tools:${version}": ':build-tools', "org.elasticsearch:rest-api-spec:${version}": ':rest-api-spec', "org.elasticsearch:elasticsearch:${version}": ':server', - "org.elasticsearch:elasticsearch-cli:${version}": ':libs:cli', "org.elasticsearch:elasticsearch-core:${version}": ':libs:core', - "org.elasticsearch:elasticsearch-nio:${version}": ':libs:elasticsearch-nio', + "org.elasticsearch:elasticsearch-nio:${version}": ':libs:nio', "org.elasticsearch:elasticsearch-x-content:${version}": ':libs:x-content', "org.elasticsearch:elasticsearch-secure-sm:${version}": ':libs:secure-sm', "org.elasticsearch.client:elasticsearch-rest-client:${version}": ':client:rest', diff --git a/libs/elasticsearch-nio/build.gradle b/libs/nio/build.gradle similarity index 89% rename from libs/elasticsearch-nio/build.gradle rename to libs/nio/build.gradle index f8b0b8fba13..43c9a133a3f 100644 --- a/libs/elasticsearch-nio/build.gradle +++ b/libs/nio/build.gradle @@ -39,7 +39,7 @@ dependencies { testCompile "junit:junit:${versions.junit}" testCompile "org.hamcrest:hamcrest-all:${versions.hamcrest}" - if (isEclipse == false || project.path == ":libs:elasticsearch-nio-tests") { + if (isEclipse == false || project.path == ":libs:nio-tests") { testCompile("org.elasticsearch.test:framework:${version}") { exclude group: 'org.elasticsearch', module: 'elasticsearch-nio' } @@ -49,7 +49,7 @@ dependencies { if (isEclipse) { // in eclipse the project is under a fake root, we need to change around the source sets sourceSets { - if (project.path == ":libs:elasticsearch-nio") { + if (project.path == ":libs:nio") { main.java.srcDirs = ['java'] main.resources.srcDirs = ['resources'] } else { @@ -60,7 +60,7 @@ if (isEclipse) { } forbiddenApisMain { - // elasticsearch-nio does not depend on core, so only jdk signatures should be checked + // nio does not depend on core, so only jdk signatures should be checked // es-all is not checked as we connect and accept sockets signaturesURLs = [PrecommitTasks.getResource('/forbidden/jdk-signatures.txt')] } diff --git a/libs/elasticsearch-nio/src/main/eclipse-build.gradle b/libs/nio/src/main/eclipse-build.gradle similarity index 69% rename from libs/elasticsearch-nio/src/main/eclipse-build.gradle rename to libs/nio/src/main/eclipse-build.gradle index 5aa089de19e..ae3ab2b13a1 100644 --- a/libs/elasticsearch-nio/src/main/eclipse-build.gradle +++ b/libs/nio/src/main/eclipse-build.gradle @@ -1,3 +1,3 @@ -// this is just shell gradle file for eclipse to have separate projects for elasticsearch-nio src and tests +// this is just shell gradle file for eclipse to have separate projects for nio src and tests apply from: '../../build.gradle' diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesChannelContext.java b/libs/nio/src/main/java/org/elasticsearch/nio/BytesChannelContext.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesChannelContext.java rename to libs/nio/src/main/java/org/elasticsearch/nio/BytesChannelContext.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteHandler.java b/libs/nio/src/main/java/org/elasticsearch/nio/BytesWriteHandler.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/BytesWriteHandler.java rename to libs/nio/src/main/java/org/elasticsearch/nio/BytesWriteHandler.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ChannelContext.java b/libs/nio/src/main/java/org/elasticsearch/nio/ChannelContext.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ChannelContext.java rename to libs/nio/src/main/java/org/elasticsearch/nio/ChannelContext.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ChannelFactory.java b/libs/nio/src/main/java/org/elasticsearch/nio/ChannelFactory.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ChannelFactory.java rename to libs/nio/src/main/java/org/elasticsearch/nio/ChannelFactory.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/EventHandler.java b/libs/nio/src/main/java/org/elasticsearch/nio/EventHandler.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/EventHandler.java rename to libs/nio/src/main/java/org/elasticsearch/nio/EventHandler.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/FlushOperation.java b/libs/nio/src/main/java/org/elasticsearch/nio/FlushOperation.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/FlushOperation.java rename to libs/nio/src/main/java/org/elasticsearch/nio/FlushOperation.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/FlushReadyWrite.java b/libs/nio/src/main/java/org/elasticsearch/nio/FlushReadyWrite.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/FlushReadyWrite.java rename to libs/nio/src/main/java/org/elasticsearch/nio/FlushReadyWrite.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/InboundChannelBuffer.java b/libs/nio/src/main/java/org/elasticsearch/nio/InboundChannelBuffer.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/InboundChannelBuffer.java rename to libs/nio/src/main/java/org/elasticsearch/nio/InboundChannelBuffer.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioChannel.java b/libs/nio/src/main/java/org/elasticsearch/nio/NioChannel.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioChannel.java rename to libs/nio/src/main/java/org/elasticsearch/nio/NioChannel.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioGroup.java b/libs/nio/src/main/java/org/elasticsearch/nio/NioGroup.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioGroup.java rename to libs/nio/src/main/java/org/elasticsearch/nio/NioGroup.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSelector.java b/libs/nio/src/main/java/org/elasticsearch/nio/NioSelector.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSelector.java rename to libs/nio/src/main/java/org/elasticsearch/nio/NioSelector.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioServerSocketChannel.java b/libs/nio/src/main/java/org/elasticsearch/nio/NioServerSocketChannel.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioServerSocketChannel.java rename to libs/nio/src/main/java/org/elasticsearch/nio/NioServerSocketChannel.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java b/libs/nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java rename to libs/nio/src/main/java/org/elasticsearch/nio/NioSocketChannel.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadWriteHandler.java b/libs/nio/src/main/java/org/elasticsearch/nio/ReadWriteHandler.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ReadWriteHandler.java rename to libs/nio/src/main/java/org/elasticsearch/nio/ReadWriteHandler.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/RoundRobinSupplier.java b/libs/nio/src/main/java/org/elasticsearch/nio/RoundRobinSupplier.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/RoundRobinSupplier.java rename to libs/nio/src/main/java/org/elasticsearch/nio/RoundRobinSupplier.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/SelectionKeyUtils.java b/libs/nio/src/main/java/org/elasticsearch/nio/SelectionKeyUtils.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/SelectionKeyUtils.java rename to libs/nio/src/main/java/org/elasticsearch/nio/SelectionKeyUtils.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ServerChannelContext.java b/libs/nio/src/main/java/org/elasticsearch/nio/ServerChannelContext.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/ServerChannelContext.java rename to libs/nio/src/main/java/org/elasticsearch/nio/ServerChannelContext.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/SocketChannelContext.java b/libs/nio/src/main/java/org/elasticsearch/nio/SocketChannelContext.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/SocketChannelContext.java rename to libs/nio/src/main/java/org/elasticsearch/nio/SocketChannelContext.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/WriteOperation.java b/libs/nio/src/main/java/org/elasticsearch/nio/WriteOperation.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/WriteOperation.java rename to libs/nio/src/main/java/org/elasticsearch/nio/WriteOperation.java diff --git a/libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/utils/ExceptionsHelper.java b/libs/nio/src/main/java/org/elasticsearch/nio/utils/ExceptionsHelper.java similarity index 100% rename from libs/elasticsearch-nio/src/main/java/org/elasticsearch/nio/utils/ExceptionsHelper.java rename to libs/nio/src/main/java/org/elasticsearch/nio/utils/ExceptionsHelper.java diff --git a/libs/elasticsearch-nio/src/test/eclipse-build.gradle b/libs/nio/src/test/eclipse-build.gradle similarity index 55% rename from libs/elasticsearch-nio/src/test/eclipse-build.gradle rename to libs/nio/src/test/eclipse-build.gradle index 6b5d202dddd..e30e76b0da5 100644 --- a/libs/elasticsearch-nio/src/test/eclipse-build.gradle +++ b/libs/nio/src/test/eclipse-build.gradle @@ -1,7 +1,7 @@ -// this is just shell gradle file for eclipse to have separate projects for elasticsearch-nio src and tests +// this is just shell gradle file for eclipse to have separate projects for nio src and tests apply from: '../../build.gradle' dependencies { - testCompile project(':libs:elasticsearch-nio') + testCompile project(':libs:nio') } diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesChannelContextTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/BytesChannelContextTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/BytesChannelContextTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/BytesChannelContextTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/ChannelContextTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/ChannelContextTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/ChannelContextTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/ChannelContextTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/ChannelFactoryTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/ChannelFactoryTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/ChannelFactoryTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/ChannelFactoryTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/EventHandlerTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/EventHandlerTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/EventHandlerTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/EventHandlerTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/FlushOperationTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/FlushOperationTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/FlushOperationTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/FlushOperationTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/InboundChannelBufferTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/InboundChannelBufferTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/InboundChannelBufferTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/InboundChannelBufferTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/NioGroupTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/NioGroupTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/NioGroupTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/NioGroupTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/NioSelectorTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/NioSelectorTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/NioSelectorTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/NioSelectorTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketChannelContextTests.java b/libs/nio/src/test/java/org/elasticsearch/nio/SocketChannelContextTests.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/SocketChannelContextTests.java rename to libs/nio/src/test/java/org/elasticsearch/nio/SocketChannelContextTests.java diff --git a/libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/TestSelectionKey.java b/libs/nio/src/test/java/org/elasticsearch/nio/TestSelectionKey.java similarity index 100% rename from libs/elasticsearch-nio/src/test/java/org/elasticsearch/nio/TestSelectionKey.java rename to libs/nio/src/test/java/org/elasticsearch/nio/TestSelectionKey.java diff --git a/libs/elasticsearch-nio/src/test/resources/testks.jks b/libs/nio/src/test/resources/testks.jks similarity index 100% rename from libs/elasticsearch-nio/src/test/resources/testks.jks rename to libs/nio/src/test/resources/testks.jks diff --git a/settings.gradle b/settings.gradle index 3dba0d4ae00..0d9be7c2494 100644 --- a/settings.gradle +++ b/settings.gradle @@ -84,7 +84,7 @@ if (isEclipse) { // for server-src and server-tests projects << 'server-tests' projects << 'libs:core-tests' - projects << 'libs:elasticsearch-nio-tests' + projects << 'libs:nio-tests' projects << 'libs:x-content-tests' projects << 'libs:secure-sm-tests' projects << 'libs:grok-tests' @@ -103,10 +103,10 @@ if (isEclipse) { project(":libs:core").buildFileName = 'eclipse-build.gradle' project(":libs:core-tests").projectDir = new File(rootProject.projectDir, 'libs/core/src/test') project(":libs:core-tests").buildFileName = 'eclipse-build.gradle' - project(":libs:elasticsearch-nio").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/main') - project(":libs:elasticsearch-nio").buildFileName = 'eclipse-build.gradle' - project(":libs:elasticsearch-nio-tests").projectDir = new File(rootProject.projectDir, 'libs/elasticsearch-nio/src/test') - project(":libs:elasticsearch-nio-tests").buildFileName = 'eclipse-build.gradle' + project(":libs:nio").projectDir = new File(rootProject.projectDir, 'libs/nio/src/main') + project(":libs:nio").buildFileName = 'eclipse-build.gradle' + project(":libs:nio-tests").projectDir = new File(rootProject.projectDir, 'libs/nio/src/test') + project(":libs:nio-tests").buildFileName = 'eclipse-build.gradle' project(":libs:x-content").projectDir = new File(rootProject.projectDir, 'libs/x-content/src/main') project(":libs:x-content").buildFileName = 'eclipse-build.gradle' project(":libs:x-content-tests").projectDir = new File(rootProject.projectDir, 'libs/x-content/src/test')