You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2023/01/18 22:48:08 UTC
[couchdb] 02/03: move nouveau into server subdir
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch import-nouveau
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 4ddc5a2636ba99b4345c3e1bbd3b2aafb3485089
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Jan 18 22:44:24 2023 +0000
move nouveau into server subdir
---
Makefile | 6 +++---
java/nouveau/{ => server}/LICENSE | 0
java/nouveau/{ => server}/README.md | 0
java/nouveau/{ => server}/TODO | 0
java/nouveau/{ => server}/nouveau.yaml | 0
java/nouveau/{ => server}/pom.xml | 6 +++---
.../main/java/org/apache/couchdb/nouveau/NouveauApplication.java | 0
.../org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java | 0
.../main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java | 0
.../main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java | 0
.../java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java | 0
.../java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java | 0
.../main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java | 0
.../src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java | 0
.../src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java | 0
.../src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java | 0
.../src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java | 0
.../src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java | 0
.../main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java | 0
.../main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java | 0
.../couchdb/nouveau/core/FileAlreadyExistsExceptionMapper.java | 0
.../apache/couchdb/nouveau/core/FileNotFoundExceptionMapper.java | 0
.../src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java | 0
.../java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java | 0
.../org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java | 0
.../org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java | 0
.../src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java | 0
.../java/org/apache/couchdb/nouveau/core/QueryParserException.java | 0
.../org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java | 0
.../couchdb/nouveau/core/UpdatesOutOfOrderExceptionMapper.java | 0
.../org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java | 0
.../org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java | 0
.../apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java | 0
.../org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java | 0
.../org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java | 0
.../org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java | 0
.../apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java | 0
.../apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java | 0
.../main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java | 0
.../java/org/apache/couchdb/nouveau/core/ser/SupportedType.java | 0
.../org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java | 0
.../java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java | 0
.../org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java | 0
.../java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java | 0
.../java/org/apache/couchdb/nouveau/resources/IndexResource.java | 0
.../java/org/apache/couchdb/nouveau/resources/SearchResource.java | 0
java/nouveau/{ => server}/src/main/resources/banner.txt | 0
.../src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java | 0
.../org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java | 0
.../test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java | 0
.../java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java | 0
.../test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java | 0
.../java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java | 0
.../src/test/resources/fixtures/DocumentUpdateRequest.json | 0
.../{ => server}/src/test/resources/fixtures/SearchRequest.json | 0
java/nouveau/{ => server}/src/test/resources/test-nouveau.yaml | 0
56 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 19c1af066..1441a25ac 100644
--- a/Makefile
+++ b/Makefile
@@ -516,12 +516,12 @@ derived:
.PHONY: nouveau
nouveau:
- @cd java/nouveau && mvn
+ @cd java/nouveau/server && mvn
.PHONY: nouveau-clean
nouveau-clean:
- @cd java/nouveau && mvn clean
+ @cd java/nouveau/server && mvn clean
.PHONY: nouveau-start
nouveau-start: nouveau
- @cd java/nouveau && mvn exec:exec -Dexec.executable="java"
+ @cd java/nouveau/server && mvn exec:exec -Dexec.executable="java"
diff --git a/java/nouveau/LICENSE b/java/nouveau/server/LICENSE
similarity index 100%
rename from java/nouveau/LICENSE
rename to java/nouveau/server/LICENSE
diff --git a/java/nouveau/README.md b/java/nouveau/server/README.md
similarity index 100%
rename from java/nouveau/README.md
rename to java/nouveau/server/README.md
diff --git a/java/nouveau/TODO b/java/nouveau/server/TODO
similarity index 100%
rename from java/nouveau/TODO
rename to java/nouveau/server/TODO
diff --git a/java/nouveau/nouveau.yaml b/java/nouveau/server/nouveau.yaml
similarity index 100%
rename from java/nouveau/nouveau.yaml
rename to java/nouveau/server/nouveau.yaml
diff --git a/java/nouveau/pom.xml b/java/nouveau/server/pom.xml
similarity index 98%
rename from java/nouveau/pom.xml
rename to java/nouveau/server/pom.xml
index 8c4dc038c..b36273a74 100644
--- a/java/nouveau/pom.xml
+++ b/java/nouveau/server/pom.xml
@@ -13,9 +13,9 @@
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.apache.couchdb</groupId>
- <artifactId>nouveau</artifactId>
- <version>0.2.0-SNAPSHOT</version>
+ <groupId>org.apache.couchdb.nouveau</groupId>
+ <artifactId>server</artifactId>
+ <version>1.0-SNAPSHOT</version>
<name>${project.artifactId}</name>
<description>Full-text indexing for CouchDB</description>
<inceptionYear>2022</inceptionYear>
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/NouveauApplication.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/NouveauApplicationConfiguration.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeRequest.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/AnalyzeResponse.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentDeleteRequest.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequest.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexDefinition.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/IndexInfo.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/LuceneVersion.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchHit.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchRequest.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/api/SearchResults.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/AnalyzerFactory.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/DocumentFactory.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/FileAlreadyExistsExceptionMapper.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/FileAlreadyExistsExceptionMapper.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/FileAlreadyExistsExceptionMapper.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/FileAlreadyExistsExceptionMapper.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/FileNotFoundExceptionMapper.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/FileNotFoundExceptionMapper.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/FileNotFoundExceptionMapper.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/FileNotFoundExceptionMapper.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/IndexManager.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NouveauQueryParser.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/NumericRangeQueryProcessor.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ParallelSearcherFactory.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParser.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/QueryParserException.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParserException.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/QueryParserException.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/QueryParserException.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderException.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderExceptionMapper.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderExceptionMapper.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderExceptionMapper.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/UpdatesOutOfOrderExceptionMapper.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefDeserializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/BytesRefSerializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeDeserializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/DoubleRangeSerializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocDeserializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/FieldDocSerializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldDeserializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/IndexableFieldSerializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/LuceneModule.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/SupportedType.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/core/ser/TotalHitsDeserializer.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/AnalyzeHealthCheck.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/health/IndexManagerHealthCheck.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/AnalyzeResource.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/IndexResource.java
diff --git a/java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java b/java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java
similarity index 100%
rename from java/nouveau/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java
rename to java/nouveau/server/src/main/java/org/apache/couchdb/nouveau/resources/SearchResource.java
diff --git a/java/nouveau/src/main/resources/banner.txt b/java/nouveau/server/src/main/resources/banner.txt
similarity index 100%
rename from java/nouveau/src/main/resources/banner.txt
rename to java/nouveau/server/src/main/resources/banner.txt
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/IntegrationTest.java
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/DocumentUpdateRequestTest.java
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/api/SearchRequestTest.java
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/AnalyzerFactoryTest.java
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/IndexManagerTest.java
diff --git a/java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java b/java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
similarity index 100%
rename from java/nouveau/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
rename to java/nouveau/server/src/test/java/org/apache/couchdb/nouveau/core/ser/LuceneModuleTest.java
diff --git a/java/nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json b/java/nouveau/server/src/test/resources/fixtures/DocumentUpdateRequest.json
similarity index 100%
rename from java/nouveau/src/test/resources/fixtures/DocumentUpdateRequest.json
rename to java/nouveau/server/src/test/resources/fixtures/DocumentUpdateRequest.json
diff --git a/java/nouveau/src/test/resources/fixtures/SearchRequest.json b/java/nouveau/server/src/test/resources/fixtures/SearchRequest.json
similarity index 100%
rename from java/nouveau/src/test/resources/fixtures/SearchRequest.json
rename to java/nouveau/server/src/test/resources/fixtures/SearchRequest.json
diff --git a/java/nouveau/src/test/resources/test-nouveau.yaml b/java/nouveau/server/src/test/resources/test-nouveau.yaml
similarity index 100%
rename from java/nouveau/src/test/resources/test-nouveau.yaml
rename to java/nouveau/server/src/test/resources/test-nouveau.yaml