This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch import-nouveau-reorg in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit affc8358fc45ed4c51f317d3849a84e548fa5e12 Author: Robert Newson <[email protected]> AuthorDate: Wed Dec 28 20:23:50 2022 +0000 move server into module --- java/nouveau/pom.xml | 268 +++++---------------- java/nouveau/{ => server}/nouveau.yaml | 0 java/nouveau/{ => server}/pom.xml | 12 +- .../apache/couchdb/nouveau/NouveauApplication.java | 0 .../nouveau/NouveauApplicationConfiguration.java | 0 .../apache/couchdb/nouveau/api/AnalyzeRequest.java | 0 .../couchdb/nouveau/api/AnalyzeResponse.java | 0 .../couchdb/nouveau/api/DocumentDeleteRequest.java | 0 .../couchdb/nouveau/api/DocumentUpdateRequest.java | 0 .../couchdb/nouveau/api/IndexDefinition.java | 0 .../org/apache/couchdb/nouveau/api/IndexInfo.java | 0 .../apache/couchdb/nouveau/api/LuceneVersion.java | 0 .../org/apache/couchdb/nouveau/api/SearchHit.java | 0 .../apache/couchdb/nouveau/api/SearchRequest.java | 0 .../apache/couchdb/nouveau/api/SearchResults.java | 0 .../couchdb/nouveau/core/AnalyzerFactory.java | 0 .../couchdb/nouveau/core/DocumentFactory.java | 0 .../core/FileAlreadyExistsExceptionMapper.java | 0 .../nouveau/core/FileNotFoundExceptionMapper.java | 0 .../apache/couchdb/nouveau/core/IndexManager.java | 0 .../couchdb/nouveau/core/NouveauQueryParser.java | 0 .../nouveau/core/NumericRangeQueryProcessor.java | 0 .../nouveau/core/ParallelSearcherFactory.java | 0 .../apache/couchdb/nouveau/core/QueryParser.java | 0 .../couchdb/nouveau/core/QueryParserException.java | 0 .../nouveau/core/UpdatesOutOfOrderException.java | 0 .../core/UpdatesOutOfOrderExceptionMapper.java | 0 .../nouveau/core/ser/BytesRefDeserializer.java | 0 .../nouveau/core/ser/BytesRefSerializer.java | 0 .../nouveau/core/ser/DoubleRangeDeserializer.java | 0 .../nouveau/core/ser/DoubleRangeSerializer.java | 0 .../nouveau/core/ser/FieldDocDeserializer.java | 0 .../nouveau/core/ser/FieldDocSerializer.java | 0 .../core/ser/IndexableFieldDeserializer.java | 0 .../nouveau/core/ser/IndexableFieldSerializer.java | 0 .../couchdb/nouveau/core/ser/LuceneModule.java | 0 .../couchdb/nouveau/core/ser/SupportedType.java | 0 .../nouveau/core/ser/TotalHitsDeserializer.java | 0 .../couchdb/nouveau/health/AnalyzeHealthCheck.java | 0 .../nouveau/health/IndexManagerHealthCheck.java | 0 .../couchdb/nouveau/resources/AnalyzeResource.java | 0 .../couchdb/nouveau/resources/IndexResource.java | 0 .../couchdb/nouveau/resources/SearchResource.java | 0 .../{ => server}/src/main/resources/banner.txt | 0 .../apache/couchdb/nouveau/IntegrationTest.java | 0 .../nouveau/api/DocumentUpdateRequestTest.java | 0 .../couchdb/nouveau/api/SearchRequestTest.java | 0 .../couchdb/nouveau/core/AnalyzerFactoryTest.java | 0 .../couchdb/nouveau/core/IndexManagerTest.java | 0 .../couchdb/nouveau/core/ser/LuceneModuleTest.java | 0 .../resources/fixtures/DocumentUpdateRequest.json | 0 .../src/test/resources/fixtures/SearchRequest.json | 0 .../src/test/resources/test-nouveau.yaml | 0 53 files changed, 63 insertions(+), 217 deletions(-) diff --git a/java/nouveau/pom.xml b/java/nouveau/pom.xml index 8c4dc038c..4eb8cd23e 100644 --- a/java/nouveau/pom.xml +++ b/java/nouveau/pom.xml @@ -1,228 +1,68 @@ -<!-- - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<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";> +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<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/xsd/maven-4.0.0.xsd";> <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.couchdb</groupId> - <artifactId>nouveau</artifactId> - <version>0.2.0-SNAPSHOT</version> - <name>${project.artifactId}</name> - <description>Full-text indexing for CouchDB</description> - <inceptionYear>2022</inceptionYear> - + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + <packaging>pom</packaging> <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <maven.compiler.source>11</maven.compiler.source> <maven.compiler.target>11</maven.compiler.target> <argLine>-Duser.language=en -Duser.region=US -Duser.timezone=UTC</argLine> - <dropwizard.version>2.1.4</dropwizard.version> - <lucene.version>9.4.2</lucene.version> - <slf4j.version>1.7.32</slf4j.version> - <junit5.version>5.8.2</junit5.version> </properties> - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.junit</groupId> - <artifactId>junit-bom</artifactId> - <version>${junit5.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - <dependency> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-dependencies</artifactId> - <version>${dropwizard.version}</version> - <type>pom</type> - <scope>import</scope> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <!-- Lucene --> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-core</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-grouping</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-queryparser</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-common</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-stempel</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-smartcn</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-analysis-kuromoji</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-facet</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-spatial-extras</artifactId> - <version>${lucene.version}</version> - </dependency> - <dependency> - <groupId>org.apache.lucene</groupId> - <artifactId>lucene-misc</artifactId> - <version>${lucene.version}</version> - </dependency> - - <!-- Dropwizard --> - <dependency> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-core</artifactId> - </dependency> - <dependency> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-http2</artifactId> - </dependency> - <dependency> - <groupId>com.fasterxml.jackson.module</groupId> - <artifactId>jackson-module-afterburner</artifactId> - </dependency> - - <!-- Dropwizard metrics --> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-core</artifactId> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-caffeine</artifactId> - </dependency> - <dependency> - <groupId>io.dropwizard.metrics</groupId> - <artifactId>metrics-jersey2</artifactId> - </dependency> - - <!-- Test --> - <dependency> - <groupId>io.dropwizard</groupId> - <artifactId>dropwizard-testing</artifactId> - <scope>test</scope> - <exclusions> - <exclusion> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter</artifactId> - <version>${junit5.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.junit.jupiter</groupId> - <artifactId>junit-jupiter-engine</artifactId> - <version>${junit5.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.assertj</groupId> - <artifactId>assertj-core</artifactId> - <version>3.22.0</version> - <scope>test</scope> - </dependency> - </dependencies> - - <scm> - <developerConnection>scm:git:[email protected]:rnewson/nouveau.git</developerConnection> - <tag>HEAD</tag> - </scm> + <modules> + <module>server</module> + </modules> <build> - <defaultGoal>package</defaultGoal> - <plugins> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-release-plugin</artifactId> - <version>3.0.0-M5</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-jar-plugin</artifactId> - <version>2.4</version> - <configuration> - <archive> - <manifest> - <addDefaultImplementationEntries>true</addDefaultImplementationEntries> - </manifest> - </archive> - </configuration> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>3.1.0</version> - <executions> - <execution> - <goals> - <goal>exec</goal> - </goals> - </execution> - </executions> - <configuration> - <executable>java</executable> - <arguments> - <argument>-classpath</argument> - <classpath/> - <argument>org.apache.couchdb.nouveau.NouveauApplication</argument> - <argument>server</argument> - <argument>nouveau.yaml</argument> - </arguments> - </configuration> - </plugin> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <version>2.22.2</version> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-javadoc-plugin</artifactId> - <version>3.4.0</version> - <configuration> - </configuration> - </plugin> - </plugins> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <version>3.8.0</version> + <configuration> + <source>11</source> + <target>11</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-clean-plugin</artifactId> + <version>3.1.0</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>3.0.2</version> + </plugin> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>2.22.1</version> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <version>3.0.2</version> + </plugin> + <plugin> + <artifactId>maven-install-plugin</artifactId> + <version>2.5.2</version> + </plugin> + <plugin> + <artifactId>maven-deploy-plugin</artifactId> + <version>2.8.2</version> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <version>3.7.1</version> + </plugin> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <version>3.0.0</version> + </plugin> + </plugins> + </pluginManagement> </build> </project> 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 96% copy from java/nouveau/pom.xml copy to java/nouveau/server/pom.xml index 8c4dc038c..8d8d30932 100644 --- a/java/nouveau/pom.xml +++ b/java/nouveau/server/pom.xml @@ -13,9 +13,15 @@ --> <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> + <parent> + <groupId>org.apache.couchdb.nouveau</groupId> + <artifactId>parent</artifactId> + <version>1.0-SNAPSHOT</version> + </parent> + + <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
