This is an automated email from the ASF dual-hosted git repository. liubao pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-java-chassis.git.
from 40d2aa0 [SCB-1937] fix integration test(TestAsyncInvoke) always timeout problem new 2eac3a4 [SCB-1935]add a demo to show using local registry and service center together new 5af49a4 [SCB-1935]publish service center port to local access new 4cc3834 [SCB-1935]reorganize test case The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../demo-multi-registries-client}/pom.xml | 10 ++-- .../servicecomb/demo/registry/Application.java | 14 ++--- .../demo/registry/IServiceCenterEndpoint.java | 17 +++--- .../registry/MultiRegistriesServerTestCase.java} | 36 +++++++------ .../demo/registry/ServiceCenterEndpoint.java} | 26 +++++----- .../demo/registry/ServiceCenterTestCase.java | 60 ++++++++++++++++++++++ .../src/main/resources/application.yml | 4 +- .../src/main/resources/logback.xml | 0 .../ServiceCenterEndpoint.yaml} | 42 ++++++++++----- .../src/main/resources/registry.yaml | 10 ++-- .../demo/registry/MultiRegistriesIT.java} | 2 +- .../demo-multi-registries-server}/pom.xml | 6 +-- .../demo/registry/SelfServiceInvoker.java | 2 +- .../demo/registry/ServerApplication.java | 0 .../servicecomb/demo/registry/ServerEndpoint.java | 0 .../src/main/resources/application.yml | 12 ++--- .../src/main/resources/logback.xml | 0 .../pom.xml | 12 +++-- .../servicecomb/demo/CategorizedTestCase.java | 4 ++ .../demo/CategorizedTestCaseRunner.java | 8 ++- demo/docker-run-config-edge/pom.xml | 4 +- demo/docker-run-config-local/pom.xml | 31 ----------- demo/docker-run-config/pom.xml | 4 +- demo/pom.xml | 1 + .../serviceregistry/DiscoveryManager.java | 7 ++- .../serviceregistry/RegistrationManager.java | 1 + .../serviceregistry/{ => api}/Discovery.java | 21 +++++--- .../serviceregistry/{ => api}/LifeCycle.java | 2 +- .../serviceregistry/{ => api}/Registration.java | 2 +- .../client/http/MicroserviceInstances.java | 18 +++++-- .../servicecomb/localregistry/LocalDiscovery.java | 4 +- .../localregistry/LocalRegistration.java | 2 +- ...ache.servicecomb.serviceregistry.api.Discovery} | 0 ...e.servicecomb.serviceregistry.api.Registration} | 0 .../serviceregistry/ServiceCenterDiscovery.java | 4 +- .../serviceregistry/ServiceCenterRegistration.java | 1 + .../client/http/ServiceRegistryClientImpl.java | 1 + ...ache.servicecomb.serviceregistry.api.Discovery} | 0 ...e.servicecomb.serviceregistry.api.Registration} | 0 39 files changed, 227 insertions(+), 141 deletions(-) copy demo/{demo-local-registry/demo-local-registry-client => demo-multi-registries/demo-multi-registries-client}/pom.xml (88%) copy demo/{demo-local-registry/demo-local-registry-client => demo-multi-registries/demo-multi-registries-client}/src/main/java/org/apache/servicecomb/demo/registry/Application.java (80%) copy swagger/swagger-invocation/invocation-core/src/test/java/org/apache/servicecomb/swagger/invocation/schemas/SpringmvcAddV2.java => demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/IServiceCenterEndpoint.java (62%) copy demo/{demo-register-url-prefix/demo-register-url-prefix-client/src/main/java/org/apache/servicecomb/demo/prefix/Application.java => demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/MultiRegistriesServerTestCase.java} (57%) copy demo/{demo-local-registry/demo-local-registry-server/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java => demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterEndpoint.java} (63%) create mode 100644 demo/demo-multi-registries/demo-multi-registries-client/src/main/java/org/apache/servicecomb/demo/registry/ServiceCenterTestCase.java copy demo/{demo-register-url-prefix/demo-register-url-prefix-client => demo-multi-registries/demo-multi-registries-client}/src/main/resources/application.yml (91%) copy demo/{demo-register-url-prefix/demo-register-url-prefix-server => demo-multi-registries/demo-multi-registries-client}/src/main/resources/logback.xml (100%) copy demo/{demo-local-registry/demo-local-registry-client/src/main/resources/microservices/demo-local-registry-server/ServerEndpoint.yaml => demo-multi-registries/demo-multi-registries-client/src/main/resources/microservices/thirdParty-service-center/ServiceCenterEndpoint.yaml} (61%) copy demo/{demo-local-registry/demo-local-registry-client => demo-multi-registries/demo-multi-registries-client}/src/main/resources/registry.yaml (87%) copy demo/{demo-local-registry/demo-local-registry-client/src/test/java/org/apache/servicecomb/demo/registry/LocalRegistryIT.java => demo-multi-registries/demo-multi-registries-client/src/test/java/org/apache/servicecomb/demo/registry/MultiRegistriesIT.java} (97%) copy demo/{demo-local-registry/demo-local-registry-server => demo-multi-registries/demo-multi-registries-server}/pom.xml (95%) copy demo/{demo-local-registry/demo-local-registry-server => demo-multi-registries/demo-multi-registries-server}/src/main/java/org/apache/servicecomb/demo/registry/SelfServiceInvoker.java (93%) copy demo/{demo-local-registry/demo-local-registry-server => demo-multi-registries/demo-multi-registries-server}/src/main/java/org/apache/servicecomb/demo/registry/ServerApplication.java (100%) copy demo/{demo-local-registry/demo-local-registry-server => demo-multi-registries/demo-multi-registries-server}/src/main/java/org/apache/servicecomb/demo/registry/ServerEndpoint.java (100%) copy demo/{demo-spring-boot-transport/demo-spring-boot-pojo-server => demo-multi-registries/demo-multi-registries-server}/src/main/resources/application.yml (87%) copy demo/{demo-register-url-prefix/demo-register-url-prefix-server => demo-multi-registries/demo-multi-registries-server}/src/main/resources/logback.xml (100%) copy demo/{demo-spring-boot-transport => demo-multi-registries}/pom.xml (84%) rename foundations/foundation-registry/src/main/java/org/apache/servicecomb/serviceregistry/{ => api}/Discovery.java (74%) rename foundations/foundation-registry/src/main/java/org/apache/servicecomb/serviceregistry/{ => api}/LifeCycle.java (94%) rename foundations/foundation-registry/src/main/java/org/apache/servicecomb/serviceregistry/{ => api}/Registration.java (97%) rename service-registry/registry-local/src/main/resources/META-INF/services/{org.apache.servicecomb.serviceregistry.Discovery => org.apache.servicecomb.serviceregistry.api.Discovery} (100%) rename service-registry/registry-local/src/main/resources/META-INF/services/{org.apache.servicecomb.serviceregistry.Registration => org.apache.servicecomb.serviceregistry.api.Registration} (100%) rename service-registry/registry-service-center/src/main/resources/META-INF/services/{org.apache.servicecomb.serviceregistry.Discovery => org.apache.servicecomb.serviceregistry.api.Discovery} (100%) rename service-registry/registry-service-center/src/main/resources/META-INF/services/{org.apache.servicecomb.serviceregistry.Registration => org.apache.servicecomb.serviceregistry.api.Registration} (100%)