This is an automated email from the ASF dual-hosted git repository.
stoty pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix-queryserver.git
The following commit(s) were added to refs/heads/master by this push:
new 5645c0f PHOENIX-5964 Rename queryserver subprojects
5645c0f is described below
commit 5645c0f7dd20e1ee4a6074f1487688a67bd49566
Author: Istvan Toth <st...@apache.org>
AuthorDate: Mon Jun 29 15:59:59 2020 +0200
PHOENIX-5964 Rename queryserver subprojects
Closes #40
---
{assembly => phoenix-queryserver-assembly}/pom.xml | 11 ++++++-----
.../src/assembly/cluster.xml | 4 ++--
.../pom.xml | 6 +++---
.../apache/phoenix/queryserver/client/Driver.java | 0
.../client/KerberosLoginFromTicketCache.java | 0
.../phoenix/queryserver/client/SqllineWrapper.java | 0
.../main/resources/META-INF/services/java.sql.Driver | 0
.../org-apache-phoenix-remote-jdbc.properties | 0
{queryserver-it => phoenix-queryserver-it}/pom.xml | 10 +++++-----
.../src/it/bin/test_phoenixdb.py | 0
.../src/it/bin/test_phoenixdb.sh | 0
.../end2end/HttpParamImpersonationQueryServerIT.java | 0
.../apache/phoenix/end2end/QueryServerBasicsIT.java | 0
.../phoenix/end2end/QueryServerEnvironment.java | 0
.../apache/phoenix/end2end/QueryServerTestUtil.java | 0
.../apache/phoenix/end2end/QueryServerThread.java | 0
.../apache/phoenix/end2end/SecureQueryServerIT.java | 0
.../end2end/SecureQueryServerPhoenixDBIT.java | 0
.../apache/phoenix/end2end/ServerCustomizersIT.java | 0
.../it/java/org/apache/phoenix/end2end/TlsUtil.java | 0
.../src/it/resources/log4j.properties | 0
.../pom.xml | 8 ++++----
.../phoenix/end2end/LoadBalancerEnd2EndIT.java | 0
.../service/LoadBalanceZookeeperConfImpl.java | 0
.../phoenix/loadbalancer/service/LoadBalancer.java | 0
.../queryserver/register/ZookeeperRegistry.java | 0
...nix.loadbalancer.service.LoadBalanceZookeeperConf | 0
.../org.apache.phoenix.queryserver.register.Registry | 0
.../service/LoadBalanceZookeeperConfImplTest.java | 0
.../pom.xml | 7 ++++---
.../tool/ParameterizedPhoenixCanaryToolIT.java | 0
.../orchestrator/QueryServerCanaryOrchestrator.java | 0
.../queryserver/orchestrator/TestExecutorClient.java | 0
.../queryserver/orchestrator/ToolWrapper.java | 0
.../org/apache/phoenix/tool/CanaryTestResult.java | 0
.../org/apache/phoenix/tool/PhoenixCanaryTool.java | 0
.../apache/phoenix/tool/PhoenixCanaryToolTest.java | 0
{queryserver => phoenix-queryserver}/pom.xml | 8 ++++----
.../src/build/query-server-runnable.xml | 0
.../service/LoadBalanceZookeeperConf.java | 0
.../phoenix/queryserver/QueryServerOptions.java | 0
.../phoenix/queryserver/QueryServerProperties.java | 0
.../phoenix/queryserver/register/Registry.java | 0
.../server/AvaticaServerConfigurationFactory.java | 0
.../queryserver/server/PhoenixMetaFactory.java | 0
.../queryserver/server/PhoenixMetaFactoryImpl.java | 0
.../phoenix/queryserver/server/QueryServer.java | 0
.../server/RemoteUserExtractorFactory.java | 0
.../queryserver/server/ServerCustomizersFactory.java | 0
.../BasicAuthenticationServerCustomizer.java | 0
.../HostedClientJarsServerCustomizer.java | 0
.../java/org/apache/phoenix/util/HostAndPort.java | 0
.../org/apache/phoenix/util/InstanceResolver.java | 0
.../java/org/apache/phoenix/util/SimpleLRUCache.java | 0
.../java/org/apache/phoenix/util/ThinClientUtil.java | 0
.../org/apache/phoenix/DriverCohabitationTest.java | 0
.../server/CustomAvaticaServerConfigurationTest.java | 0
.../queryserver/server/PhoenixDoAsCallbackTest.java | 0
.../server/PhoenixRemoteUserExtractorTest.java | 0
.../server/QueryServerConfigurationTest.java | 0
.../phoenix/queryserver/server/QueryServerTest.java | 0
.../server/RemoteUserExtractorFactoryTest.java | 0
.../queryserver/server/ServerCustomizersTest.java | 0
.../HostedClientJarsServerCustomizerTest.java | 0
.../phoenix/queryserver/util/SimpleLRUCacheTest.java | 0
pom.xml | 20 ++++++++++----------
66 files changed, 38 insertions(+), 36 deletions(-)
diff --git a/assembly/pom.xml b/phoenix-queryserver-assembly/pom.xml
similarity index 91%
rename from assembly/pom.xml
rename to phoenix-queryserver-assembly/pom.xml
index 97b062e..a8d9bde 100644
--- a/assembly/pom.xml
+++ b/phoenix-queryserver-assembly/pom.xml
@@ -24,21 +24,22 @@
<parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>assembly</artifactId>
+ <artifactId>phoenix-queryserver-assembly</artifactId>
<packaging>pom</packaging>
+ <name>Phoenix Query Server Distribution Assembly</name>
<dependencies>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver</artifactId>
+ <artifactId>phoenix-queryserver</artifactId>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver-client</artifactId>
+ <artifactId>phoenix-queryserver-client</artifactId>
</dependency>
<dependency>
<groupId>sqlline</groupId>
@@ -81,7 +82,7 @@
<goal>copy-dependencies</goal>
</goals>
<configuration>
-
<includeArtifactIds>phoenix-client,queryserver-client</includeArtifactIds>
+
<includeArtifactIds>phoenix-client,phoenix-queryserver-client</includeArtifactIds>
<outputDirectory>${project.build.directory}/maven-repo</outputDirectory>
<overWriteIfNewer>true</overWriteIfNewer>
<useRepositoryLayout>true</useRepositoryLayout>
diff --git a/assembly/src/assembly/cluster.xml
b/phoenix-queryserver-assembly/src/assembly/cluster.xml
similarity index 94%
rename from assembly/src/assembly/cluster.xml
rename to phoenix-queryserver-assembly/src/assembly/cluster.xml
index 118ba1a..d55a63d 100644
--- a/assembly/src/assembly/cluster.xml
+++ b/phoenix-queryserver-assembly/src/assembly/cluster.xml
@@ -35,14 +35,14 @@
</excludes>
</fileSet>
<fileSet>
- <directory>${project.basedir}/../queryserver/target</directory>
+
<directory>${project.basedir}/../phoenix-queryserver/target</directory>
<outputDirectory>${project.parent.artifactId}-${project.parent.version}/</outputDirectory>
<includes>
<include>queryserver-${project.parent.version}.jar</include>
</includes>
</fileSet>
<fileSet>
-
<directory>${project.basedir}/../queryserver-client/target</directory>
+
<directory>${project.basedir}/../phoenix-queryserver-client/target</directory>
<outputDirectory>${project.parent.artifactId}-${project.parent.version}/</outputDirectory>
<includes>
<include>queryserver-client-${project.parent.version}.jar</include>
diff --git a/queryserver-client/pom.xml b/phoenix-queryserver-client/pom.xml
similarity index 96%
rename from queryserver-client/pom.xml
rename to phoenix-queryserver-client/pom.xml
index c07ceaa..8d6dbff 100644
--- a/queryserver-client/pom.xml
+++ b/phoenix-queryserver-client/pom.xml
@@ -28,12 +28,12 @@
<parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>queryserver-client</artifactId>
- <name>Query Server Client</name>
+ <artifactId>phoenix-queryserver-client</artifactId>
+ <name>Phoenix Query Server Client</name>
<description>A thin JDBC client for interacting with the query
server</description>
<licenses>
diff --git
a/queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/Driver.java
b/phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/Driver.java
similarity index 100%
rename from
queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/Driver.java
rename to
phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/Driver.java
diff --git
a/queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/KerberosLoginFromTicketCache.java
b/phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/KerberosLoginFromTicketCache.java
similarity index 100%
rename from
queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/KerberosLoginFromTicketCache.java
rename to
phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/KerberosLoginFromTicketCache.java
diff --git
a/queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/SqllineWrapper.java
b/phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/SqllineWrapper.java
similarity index 100%
rename from
queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/SqllineWrapper.java
rename to
phoenix-queryserver-client/src/main/java/org/apache/phoenix/queryserver/client/SqllineWrapper.java
diff --git
a/queryserver-client/src/main/resources/META-INF/services/java.sql.Driver
b/phoenix-queryserver-client/src/main/resources/META-INF/services/java.sql.Driver
similarity index 100%
rename from
queryserver-client/src/main/resources/META-INF/services/java.sql.Driver
rename to
phoenix-queryserver-client/src/main/resources/META-INF/services/java.sql.Driver
diff --git
a/queryserver-client/src/main/resources/version/org-apache-phoenix-remote-jdbc.properties
b/phoenix-queryserver-client/src/main/resources/version/org-apache-phoenix-remote-jdbc.properties
similarity index 100%
rename from
queryserver-client/src/main/resources/version/org-apache-phoenix-remote-jdbc.properties
rename to
phoenix-queryserver-client/src/main/resources/version/org-apache-phoenix-remote-jdbc.properties
diff --git a/queryserver-it/pom.xml b/phoenix-queryserver-it/pom.xml
similarity index 96%
rename from queryserver-it/pom.xml
rename to phoenix-queryserver-it/pom.xml
index e660c71..6979f79 100644
--- a/queryserver-it/pom.xml
+++ b/phoenix-queryserver-it/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>queryserver-it</artifactId>
- <name>Query Server Integration Tests</name>
+ <artifactId>phoenix-queryserver-it</artifactId>
+ <name>Phoenix Query Server Integration Tests</name>
<description>Integration tests for the Query Server</description>
<properties>
@@ -104,13 +104,13 @@
<dependencies>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver</artifactId>
+ <artifactId>phoenix-queryserver</artifactId>
</dependency>
<!-- for tests -->
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver-client</artifactId>
+ <artifactId>phoenix-queryserver-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/queryserver-it/src/it/bin/test_phoenixdb.py
b/phoenix-queryserver-it/src/it/bin/test_phoenixdb.py
similarity index 100%
rename from queryserver-it/src/it/bin/test_phoenixdb.py
rename to phoenix-queryserver-it/src/it/bin/test_phoenixdb.py
diff --git a/queryserver-it/src/it/bin/test_phoenixdb.sh
b/phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
similarity index 100%
rename from queryserver-it/src/it/bin/test_phoenixdb.sh
rename to phoenix-queryserver-it/src/it/bin/test_phoenixdb.sh
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/HttpParamImpersonationQueryServerIT.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerBasicsIT.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerEnvironment.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerTestUtil.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerTestUtil.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerTestUtil.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerTestUtil.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/QueryServerThread.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerIT.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/SecureQueryServerPhoenixDBIT.java
diff --git
a/queryserver-it/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java
similarity index 100%
rename from
queryserver-it/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/ServerCustomizersIT.java
diff --git a/queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
b/phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
similarity index 100%
rename from queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
rename to
phoenix-queryserver-it/src/it/java/org/apache/phoenix/end2end/TlsUtil.java
diff --git a/queryserver-it/src/it/resources/log4j.properties
b/phoenix-queryserver-it/src/it/resources/log4j.properties
similarity index 100%
rename from queryserver-it/src/it/resources/log4j.properties
rename to phoenix-queryserver-it/src/it/resources/log4j.properties
diff --git a/load-balancer/pom.xml b/phoenix-queryserver-load-balancer/pom.xml
similarity index 95%
rename from load-balancer/pom.xml
rename to phoenix-queryserver-load-balancer/pom.xml
index 70e072a..7a52fca 100644
--- a/load-balancer/pom.xml
+++ b/phoenix-queryserver-load-balancer/pom.xml
@@ -26,11 +26,11 @@
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>load-balancer</artifactId>
- <name>Phoenix Load Balancer</name>
+ <artifactId>phoenix-queryserver-load-balancer</artifactId>
+ <name>Phoenix Query Server Load Balancer</name>
<description>A Load balancer which routes calls to Phoenix Query
Server</description>
<build>
@@ -90,7 +90,7 @@
<dependencies>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver</artifactId>
+ <artifactId>phoenix-queryserver</artifactId>
</dependency>
<dependency>
<groupId>org.apache.hbase</groupId>
diff --git
a/load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java
b/phoenix-queryserver-load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java
similarity index 100%
rename from
load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java
rename to
phoenix-queryserver-load-balancer/src/it/java/org/apache/phoenix/end2end/LoadBalancerEnd2EndIT.java
diff --git
a/load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImpl.java
b/phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImpl.java
similarity index 100%
rename from
load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImpl.java
rename to
phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImpl.java
diff --git
a/load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalancer.java
b/phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalancer.java
similarity index 100%
rename from
load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalancer.java
rename to
phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalancer.java
diff --git
a/load-balancer/src/main/java/org/apache/phoenix/queryserver/register/ZookeeperRegistry.java
b/phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/queryserver/register/ZookeeperRegistry.java
similarity index 100%
rename from
load-balancer/src/main/java/org/apache/phoenix/queryserver/register/ZookeeperRegistry.java
rename to
phoenix-queryserver-load-balancer/src/main/java/org/apache/phoenix/queryserver/register/ZookeeperRegistry.java
diff --git
a/load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf
b/phoenix-queryserver-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf
similarity index 100%
rename from
load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf
rename to
phoenix-queryserver-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.loadbalancer.service.LoadBalanceZookeeperConf
diff --git
a/load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
b/phoenix-queryserver-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
similarity index 100%
rename from
load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
rename to
phoenix-queryserver-load-balancer/src/main/resources/META-INF/services/org.apache.phoenix.queryserver.register.Registry
diff --git
a/load-balancer/src/test/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImplTest.java
b/phoenix-queryserver-load-balancer/src/test/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImplTest.java
similarity index 100%
rename from
load-balancer/src/test/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImplTest.java
rename to
phoenix-queryserver-load-balancer/src/test/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConfImplTest.java
diff --git a/queryserver-orchestrator/pom.xml
b/phoenix-queryserver-orchestrator/pom.xml
similarity index 95%
rename from queryserver-orchestrator/pom.xml
rename to phoenix-queryserver-orchestrator/pom.xml
index 5a3dbff..c05737b 100644
--- a/queryserver-orchestrator/pom.xml
+++ b/phoenix-queryserver-orchestrator/pom.xml
@@ -26,12 +26,13 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<groupId>org.apache.phoenix</groupId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>queryserver-orchestrator</artifactId>
+ <artifactId>phoenix-queryserver-orchestrator</artifactId>
+ <name>Phoenix Query Server Orchestrator</name>
<build>
<plugins>
@@ -120,4 +121,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git
a/queryserver-orchestrator/src/it/java/org/apache/phoenix/tool/ParameterizedPhoenixCanaryToolIT.java
b/phoenix-queryserver-orchestrator/src/it/java/org/apache/phoenix/tool/ParameterizedPhoenixCanaryToolIT.java
similarity index 100%
rename from
queryserver-orchestrator/src/it/java/org/apache/phoenix/tool/ParameterizedPhoenixCanaryToolIT.java
rename to
phoenix-queryserver-orchestrator/src/it/java/org/apache/phoenix/tool/ParameterizedPhoenixCanaryToolIT.java
diff --git
a/queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/QueryServerCanaryOrchestrator.java
b/phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/QueryServerCanaryOrchestrator.java
similarity index 100%
rename from
queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/QueryServerCanaryOrchestrator.java
rename to
phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/QueryServerCanaryOrchestrator.java
diff --git
a/queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/TestExecutorClient.java
b/phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/TestExecutorClient.java
similarity index 100%
rename from
queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/TestExecutorClient.java
rename to
phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/TestExecutorClient.java
diff --git
a/queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/ToolWrapper.java
b/phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/ToolWrapper.java
similarity index 100%
rename from
queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/ToolWrapper.java
rename to
phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/queryserver/orchestrator/ToolWrapper.java
diff --git
a/queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/CanaryTestResult.java
b/phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/CanaryTestResult.java
similarity index 100%
rename from
queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/CanaryTestResult.java
rename to
phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/CanaryTestResult.java
diff --git
a/queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/PhoenixCanaryTool.java
b/phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/PhoenixCanaryTool.java
similarity index 100%
rename from
queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/PhoenixCanaryTool.java
rename to
phoenix-queryserver-orchestrator/src/main/java/org/apache/phoenix/tool/PhoenixCanaryTool.java
diff --git
a/queryserver-orchestrator/src/test/java/org/apache/phoenix/tool/PhoenixCanaryToolTest.java
b/phoenix-queryserver-orchestrator/src/test/java/org/apache/phoenix/tool/PhoenixCanaryToolTest.java
similarity index 100%
rename from
queryserver-orchestrator/src/test/java/org/apache/phoenix/tool/PhoenixCanaryToolTest.java
rename to
phoenix-queryserver-orchestrator/src/test/java/org/apache/phoenix/tool/PhoenixCanaryToolTest.java
diff --git a/queryserver/pom.xml b/phoenix-queryserver/pom.xml
similarity index 97%
rename from queryserver/pom.xml
rename to phoenix-queryserver/pom.xml
index ebded63..2d057ef 100644
--- a/queryserver/pom.xml
+++ b/phoenix-queryserver/pom.xml
@@ -27,12 +27,12 @@
<parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
- <artifactId>queryserver</artifactId>
- <name>Query Server</name>
+ <artifactId>phoenix-queryserver</artifactId>
+ <name>Phoenix Query Server</name>
<description>A query server for exposing Phoenix to thin
clients</description>
<properties>
@@ -222,7 +222,7 @@
<!-- for tests -->
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver-client</artifactId>
+ <artifactId>phoenix-queryserver-client</artifactId>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/queryserver/src/build/query-server-runnable.xml
b/phoenix-queryserver/src/build/query-server-runnable.xml
similarity index 100%
rename from queryserver/src/build/query-server-runnable.xml
rename to phoenix-queryserver/src/build/query-server-runnable.xml
diff --git
a/queryserver/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConf.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConf.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConf.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/loadbalancer/service/LoadBalanceZookeeperConf.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerOptions.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/QueryServerProperties.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/register/Registry.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/register/Registry.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/register/Registry.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/register/Registry.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/AvaticaServerConfigurationFactory.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/AvaticaServerConfigurationFactory.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/AvaticaServerConfigurationFactory.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/AvaticaServerConfigurationFactory.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactory.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactory.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactory.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactory.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactoryImpl.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactoryImpl.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactoryImpl.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/PhoenixMetaFactoryImpl.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/QueryServer.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactory.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactory.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactory.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactory.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/ServerCustomizersFactory.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/BasicAuthenticationServerCustomizer.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/BasicAuthenticationServerCustomizer.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/BasicAuthenticationServerCustomizer.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/BasicAuthenticationServerCustomizer.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizer.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizer.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizer.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizer.java
diff --git a/queryserver/src/main/java/org/apache/phoenix/util/HostAndPort.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/HostAndPort.java
similarity index 100%
rename from queryserver/src/main/java/org/apache/phoenix/util/HostAndPort.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/util/HostAndPort.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/util/InstanceResolver.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/util/SimpleLRUCache.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/SimpleLRUCache.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/util/SimpleLRUCache.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/util/SimpleLRUCache.java
diff --git
a/queryserver/src/main/java/org/apache/phoenix/util/ThinClientUtil.java
b/phoenix-queryserver/src/main/java/org/apache/phoenix/util/ThinClientUtil.java
similarity index 100%
rename from
queryserver/src/main/java/org/apache/phoenix/util/ThinClientUtil.java
rename to
phoenix-queryserver/src/main/java/org/apache/phoenix/util/ThinClientUtil.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/DriverCohabitationTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/DriverCohabitationTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/DriverCohabitationTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/DriverCohabitationTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/CustomAvaticaServerConfigurationTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/CustomAvaticaServerConfigurationTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/CustomAvaticaServerConfigurationTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/CustomAvaticaServerConfigurationTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixDoAsCallbackTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/PhoenixRemoteUserExtractorTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerConfigurationTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/QueryServerTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactoryTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactoryTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactoryTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/RemoteUserExtractorFactoryTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/ServerCustomizersTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizerTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizerTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizerTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/server/customizers/HostedClientJarsServerCustomizerTest.java
diff --git
a/queryserver/src/test/java/org/apache/phoenix/queryserver/util/SimpleLRUCacheTest.java
b/phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/util/SimpleLRUCacheTest.java
similarity index 100%
rename from
queryserver/src/test/java/org/apache/phoenix/queryserver/util/SimpleLRUCacheTest.java
rename to
phoenix-queryserver/src/test/java/org/apache/phoenix/queryserver/util/SimpleLRUCacheTest.java
diff --git a/pom.xml b/pom.xml
index 274f522..f7a0cd9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -30,10 +30,10 @@
</parent>
<groupId>org.apache.phoenix</groupId>
- <artifactId>phoenix-queryserver</artifactId>
+ <artifactId>phoenix-queryserver-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Phoenix Query Server</name>
+ <name>Phoenix Query Server Maven Parent Project</name>
<licenses>
<license>
@@ -50,12 +50,12 @@
</organization>
<modules>
- <module>queryserver</module>
- <module>queryserver-it</module>
- <module>queryserver-client</module>
- <module>load-balancer</module>
- <module>assembly</module>
- <module>queryserver-orchestrator</module>
+ <module>phoenix-queryserver</module>
+ <module>phoenix-queryserver-it</module>
+ <module>phoenix-queryserver-client</module>
+ <module>phoenix-queryserver-load-balancer</module>
+ <module>phoenix-queryserver-assembly</module>
+ <module>phoenix-queryserver-orchestrator</module>
</modules>
<scm>
@@ -340,12 +340,12 @@
<!-- Intra-project dependencies -->
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver</artifactId>
+ <artifactId>phoenix-queryserver</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>org.apache.phoenix</groupId>
- <artifactId>queryserver-client</artifactId>
+ <artifactId>phoenix-queryserver-client</artifactId>
<version>${project.version}</version>
</dependency>
