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 0f4d00892 [SCB-2785]support spring boot auto configure and remove
component scan (#3684)
add b55c6a452 [SCB-2785]support spring boot auto configure and remove
component scan (#3686)
No new revisions were added by this update.
Summary of changes:
.../core/ServiceCombCoreConfiguration.java | 20 ++++-----
core/src/main/resources/META-INF/spring.factories | 3 +-
.../main/resources/META-INF/spring/cse.bean.xml | 7 ---
.../servicecomb/demo/crossapp/CrossappClient.java | 2 +
.../servicecomb/demo/crossapp/CrossappServer.java | 2 +
.../demo/edge/authentication/AuthMain.java | 2 +
.../demo/edge/business/BusinessMain_V1_1_0.java | 2 +
.../demo/edge/business/BusinessMain_V1_0_0.java | 2 +
.../demo/edge/business/BusinessMain_V2_0_0.java | 2 +
.../demo/edge/consumer/ConsumerMain.java | 2 +
.../org/apache/servicecomb/demo/edge/EdgeMain.java | 2 +
.../servicecomb/demo/filter/FilterClient.java | 2 +
.../apache/servicecomb/demo/filter/FilterEdge.java | 2 +
.../servicecomb/demo/filter/FilterServer.java | 2 +
.../servicecomb/demo/filter/FilterTests.java | 2 +
.../apache/servicecomb/demo/jaxrs/JaxrsClient.java | 2 +
.../apache/servicecomb/demo/jaxrs/JaxrsServer.java | 2 +
.../demo/multiple/client/MultipleClient.java | 5 +++
.../demo/multiple/server/MultipleServer.java | 5 +++
.../servicecomb/demo/pojo/client/PojoClient.java | 2 +
.../servicecomb/demo/pojo/server/PojoServer.java | 2 +
.../demo-spring-boot-pojo-client/pom.xml | 2 +-
.../{ => springboot/pojo/client}/DemoConst.java | 2 +-
.../springboot/pojo/client/PojoClient.java | 3 +-
.../pojo/client/PojoClientTest.java | 16 +++----
.../demo/{ => springboot/pojo/client}/TestMgr.java | 2 +-
.../pojo/server/schema}/server/Test.java | 2 +-
.../pojo/server/schema}/server/TestRequest.java | 2 +-
.../pojo/server/schema}/server/TestResponse.java | 2 +-
.../pojo/server/schema}/server/User.java | 2 +-
.../resources/META-INF/spring/pojo.client.bean.xml | 4 +-
.../springboot/pojo/client/PojoClientIT.java | 4 +-
.../demo-spring-boot-pojo-server/pom.xml | 2 +-
.../springboot/pojo/server/PojoServer.java | 2 +-
.../springboot/pojo/server}/handler/MyHandler.java | 4 +-
.../pojo/server/schema}/greeter/Hello.java | 2 +-
.../pojo/server/schema}/server/HelloImpl.java | 4 +-
.../pojo/server/schema}/server/Test.java | 2 +-
.../pojo/server/schema}/server/TestImpl.java | 5 +--
.../pojo/server/schema}/server/TestRequest.java | 2 +-
.../pojo/server/schema}/server/TestResponse.java | 2 +-
.../pojo/server/schema}/server/User.java | 2 +-
.../main/resources/microservices/pojo/server.yaml | 4 +-
.../demo/springmvc/SpringmvcClient.java | 2 +
.../demo/springmvc/SpringmvcServer.java | 2 +
.../edge/core/CommonHttpEdgeDispatcher.java | 3 +-
.../src/main/resources/META-INF/spring.factories | 3 +-
.../servicecomb/config/DynamicPropertiesImpl.java | 2 +-
.../servicecomb/loadbalance/BeansHolder.java | 32 --------------
.../servicecomb/loadbalance/ExtensionsManager.java | 11 +++--
.../loadbalance/LoadBalanceConfiguration.java | 11 ++++-
.../servicecomb/loadbalance/LoadBalanceFilter.java | 11 +++--
.../main/resources/META-INF/spring/cse.bean.xml | 25 -----------
.../loadbalance/TestExtensionsManager.java | 26 +++--------
.../loadbalance/TestLoadBalanceFilter.java | 6 +--
.../loadbalance/TestLoadBalanceFilter2.java | 18 ++++----
.../servicecomb/provider/pojo/PojoConfig.java | 50 ----------------------
.../lightweight/AbstractLightweightDiscovery.java | 15 ++-----
.../LightWeightRegistryConfiguration.java | 10 +++++
.../registry/lightweight/VirtualDiscoverySvc.java | 2 -
.../SchemaDiscoveryConfiguration.java | 9 ++--
.../src/main/resources/META-INF/spring.factories | 2 +-
.../starter/ServiceCombSpringConfiguration.java | 11 +----
63 files changed, 154 insertions(+), 241 deletions(-)
copy
edge/edge-core/src/main/java/org/apache/servicecomb/edge/core/EdgeCoreConfiguration.java
=>
core/src/main/java/org/apache/servicecomb/core/ServiceCombCoreConfiguration.java
(64%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/{
=> springboot/pojo/client}/DemoConst.java (94%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/{
=> demo}/springboot/pojo/client/PojoClient.java (92%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/{
=> springboot}/pojo/client/PojoClientTest.java (92%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/{
=> springboot/pojo/client}/TestMgr.java (97%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/{
=> springboot/pojo/server/schema}/server/Test.java (93%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/TestRequest.java
(95%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/TestResponse.java
(93%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/User.java
(95%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-client/src/test/java/org/apache/servicecomb/{
=> demo}/springboot/pojo/client/PojoClientIT.java (89%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/{
=> demo}/springboot/pojo/server/PojoServer.java (95%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/{
=> demo/springboot/pojo/server}/handler/MyHandler.java (94%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/{helloworld
=> springboot/pojo/server/schema}/greeter/Hello.java (92%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/{pojo
=> springboot/pojo/server/schema}/server/HelloImpl.java (88%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/{
=> springboot/pojo/server/schema}/server/Test.java (93%)
rename
demo/demo-spring-boot-transport/demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/{pojo
=> springboot/pojo/server/schema}/server/TestImpl.java (93%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/TestRequest.java
(95%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/TestResponse.java
(93%)
rename
demo/demo-spring-boot-transport/{demo-spring-boot-pojo-client/src/main/java/org/apache/servicecomb/demo
=>
demo-spring-boot-pojo-server/src/main/java/org/apache/servicecomb/demo/springboot/pojo/server/schema}/server/User.java
(95%)
delete mode 100644
handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/BeansHolder.java
delete mode 100644
handlers/handler-loadbalance/src/main/resources/META-INF/spring/cse.bean.xml
delete mode 100644
providers/provider-pojo/src/main/java/org/apache/servicecomb/provider/pojo/PojoConfig.java
copy
metrics/metrics-core/src/main/java/org/apache/servicecomb/metrics/core/MetricsCoreConfiguration.java
=>
service-registry/registry-schema-discovery/src/main/java/org/apache/servicecomb/schemadiscovery/SchemaDiscoveryConfiguration.java
(82%)
copy {handlers/handler-router =>
service-registry/registry-schema-discovery}/src/main/resources/META-INF/spring.factories
(93%)
