diff --git a/client/kie-client/README.md b/clients/kie-client/README.md similarity index 100% rename from client/kie-client/README.md rename to clients/kie-client/README.md diff --git a/client/kie-client/pom.xml b/clients/kie-client/pom.xml similarity index 95% rename from client/kie-client/pom.xml rename to clients/kie-client/pom.xml index 3c431b2bec..4359fc2798 100755 --- a/client/kie-client/pom.xml +++ b/clients/kie-client/pom.xml @@ -21,10 +21,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + clients org.apache.servicecomb - java-chassis-parent 2.0.0-SNAPSHOT - ../parents/default 4.0.0 diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieClient.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieClient.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieClient.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieClient.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieRawClient.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieRawClient.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieRawClient.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/KieRawClient.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpRequest.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpRequest.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpRequest.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpRequest.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpResponse.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpResponse.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpResponse.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpResponse.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransport.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransport.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransport.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransport.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportFactory.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportFactory.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportFactory.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportFactory.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportImpl.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportImpl.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportImpl.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/http/HttpTransportImpl.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVBody.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVBody.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVBody.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVBody.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVDoc.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVDoc.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVDoc.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVDoc.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVResponse.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVResponse.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVResponse.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/KVResponse.java diff --git a/client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/LabelDocResponse.java b/clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/LabelDocResponse.java similarity index 100% rename from client/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/LabelDocResponse.java rename to clients/kie-client/src/main/java/org/apache/servicecomb/kie/client/model/LabelDocResponse.java diff --git a/client/kie-client/src/test/java/org/apache/servicecomb/kie/client/HttpTransportTest.java b/clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/HttpTransportTest.java similarity index 100% rename from client/kie-client/src/test/java/org/apache/servicecomb/kie/client/HttpTransportTest.java rename to clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/HttpTransportTest.java diff --git a/client/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieClientTest.java b/clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieClientTest.java similarity index 100% rename from client/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieClientTest.java rename to clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieClientTest.java diff --git a/client/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieRawClientTest.java b/clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieRawClientTest.java similarity index 100% rename from client/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieRawClientTest.java rename to clients/kie-client/src/test/java/org/apache/servicecomb/kie/client/KieRawClientTest.java diff --git a/clients/pom.xml b/clients/pom.xml new file mode 100644 index 0000000000..886f844484 --- /dev/null +++ b/clients/pom.xml @@ -0,0 +1,39 @@ + + + + + + + org.apache.servicecomb + java-chassis-parent + 2.0.0-SNAPSHOT + ../parents/default + + 4.0.0 + + clients + ServiceComb::Client + pom + + kie-client + service-center-client + + + diff --git a/client/service-center-client/README.md b/clients/service-center-client/README.md similarity index 100% rename from client/service-center-client/README.md rename to clients/service-center-client/README.md diff --git a/client/service-center-client/pom.xml b/clients/service-center-client/pom.xml similarity index 95% rename from client/service-center-client/pom.xml rename to clients/service-center-client/pom.xml index bcee97a707..4191c44bf3 100755 --- a/client/service-center-client/pom.xml +++ b/clients/service-center-client/pom.xml @@ -20,10 +20,9 @@ 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"> + clients org.apache.servicecomb - java-chassis-parent 2.0.0-SNAPSHOT - ../../parents/default 4.0.0 diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterClient.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/exception/OperationException.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/exception/OperationException.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/exception/OperationException.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/exception/OperationException.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpRequest.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpRequest.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpRequest.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpRequest.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpResponse.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpResponse.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpResponse.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpResponse.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransport.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransport.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransport.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransport.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportFactory.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportFactory.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportFactory.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportFactory.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportImpl.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportImpl.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportImpl.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/HttpTransportImpl.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSConfig.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSConfig.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSConfig.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSConfig.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSHttpsTransport.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSHttpsTransport.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSHttpsTransport.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/http/TLSHttpsTransport.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/BasePath.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/BasePath.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/BasePath.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/BasePath.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/DataCenterInfo.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/DataCenterInfo.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/DataCenterInfo.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/DataCenterInfo.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Framework.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Framework.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Framework.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Framework.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheck.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheck.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheck.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheck.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheckMode.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheckMode.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheckMode.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HealthCheckMode.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HeartbeatsRequest.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HeartbeatsRequest.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HeartbeatsRequest.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/HeartbeatsRequest.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/InstancesRequest.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/InstancesRequest.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/InstancesRequest.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/InstancesRequest.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Microservice.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Microservice.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Microservice.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/Microservice.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstance.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstance.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstance.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstance.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstanceStatus.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstanceStatus.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstanceStatus.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstanceStatus.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstancesResponse.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstancesResponse.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstancesResponse.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceInstancesResponse.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceStatus.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceStatus.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceStatus.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroserviceStatus.java diff --git a/client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroservicesResponse.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroservicesResponse.java similarity index 100% rename from client/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroservicesResponse.java rename to clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/model/MicroservicesResponse.java diff --git a/client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/HttpTransportImplTest.java b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/HttpTransportImplTest.java similarity index 100% rename from client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/HttpTransportImplTest.java rename to clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/HttpTransportImplTest.java diff --git a/client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java similarity index 100% rename from client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java rename to clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterClientTest.java diff --git a/client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClientTest.java b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClientTest.java similarity index 100% rename from client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClientTest.java rename to clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClientTest.java diff --git a/client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/TLSHttpsTransportTest.java b/clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/TLSHttpsTransportTest.java similarity index 100% rename from client/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/TLSHttpsTransportTest.java rename to clients/service-center-client/src/test/java/org/apache/servicecomb/service/center/client/TLSHttpsTransportTest.java diff --git a/client/service-center-client/src/test/resources/tls/client.p12 b/clients/service-center-client/src/test/resources/tls/client.p12 similarity index 100% rename from client/service-center-client/src/test/resources/tls/client.p12 rename to clients/service-center-client/src/test/resources/tls/client.p12 diff --git a/client/service-center-client/src/test/resources/tls/server.jks b/clients/service-center-client/src/test/resources/tls/server.jks similarity index 100% rename from client/service-center-client/src/test/resources/tls/server.jks rename to clients/service-center-client/src/test/resources/tls/server.jks diff --git a/pom.xml b/pom.xml index 1a4e0b2a52..b307827923 100755 --- a/pom.xml +++ b/pom.xml @@ -125,8 +125,7 @@ java-chassis-spring-boot inspector solutions - client/kie-client - client/service-center-client + clients