diff --git a/spring-cloud-alibaba-coverage/pom.xml b/alibaba-coverage-spring-cloud/pom.xml similarity index 68% rename from spring-cloud-alibaba-coverage/pom.xml rename to alibaba-coverage-spring-cloud/pom.xml index cad22a3cc..018865e21 100644 --- a/spring-cloud-alibaba-coverage/pom.xml +++ b/alibaba-coverage-spring-cloud/pom.xml @@ -3,13 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + com.alibaba.cloud spring-cloud-alibaba - org.springframework.cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 - spring-cloud-alibaba-coverage + alibaba-coverage-spring-cloud Spring Cloud Alibaba Coverage @@ -17,53 +17,53 @@ - org.springframework.cloud - spring-cloud-alibaba-dubbo + com.alibaba.cloud + alibaba-dubbo-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alibaba-sentinel-datasource + com.alibaba.cloud + alibaba-sentinel-datasource-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alicloud-acm + com.alibaba.cloud + alicloud-acm-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-stream-binder-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-stream-binder ${spring.cloud.alibaba.version} - org.springframework.cloud - spring-cloud-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud ${spring.cloud.alibaba.version} diff --git a/spring-cloud-alibaba-docs/pom.xml b/alibaba-docs-spring-cloud/pom.xml similarity index 92% rename from spring-cloud-alibaba-docs/pom.xml rename to alibaba-docs-spring-cloud/pom.xml index eb1684eaf..c0b8f0383 100644 --- a/spring-cloud-alibaba-docs/pom.xml +++ b/alibaba-docs-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-docs + com.alibaba.cloud + alibaba-docs-spring-cloud Spring Cloud Alibaba Documentation pom diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/acm.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/acm.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/acm.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/ans.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/ans.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/ans.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/dependency-management.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/dependency-management.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/dependency-management.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config-custom-solution.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-config-custom-solution.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config-custom-solution.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-config-custom-solution.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-config.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-config.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-config.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-discovery.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/nacos-discovery.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/nacos-discovery.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/oss.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/oss.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/oss.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/rocketmq.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/rocketmq.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/rocketmq.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/schedulerx.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/schedulerx.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/sentinel.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/sentinel.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/sms.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/sms.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/sms.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/spring-cloud-alibaba.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc-zh/spring-cloud-alibaba.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc-zh/spring-cloud-alibaba.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc-zh/spring-cloud-alibaba.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/acm.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/acm.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/acm.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/ans.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/ans.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/ans.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/dependency-management.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/dependency-management.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/dependency-management.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/nacos-config.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/nacos-config.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/nacos-config.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/nacos-discovery.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/nacos-discovery.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/nacos-discovery.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/oss.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/oss.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/oss.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/rocketmq.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/rocketmq.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/rocketmq.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/schedulerx.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/schedulerx.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/sentinel.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/sentinel.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/sms.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/sms.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/sms.adoc diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/spring-cloud-alibaba.adoc b/alibaba-docs-spring-cloud/src/main/asciidoc/spring-cloud-alibaba.adoc similarity index 100% rename from spring-cloud-alibaba-docs/src/main/asciidoc/spring-cloud-alibaba.adoc rename to alibaba-docs-spring-cloud/src/main/asciidoc/spring-cloud-alibaba.adoc diff --git a/spring-cloud-alibaba-dubbo/README.md b/alibaba-dubbo-spring-cloud/README.md similarity index 100% rename from spring-cloud-alibaba-dubbo/README.md rename to alibaba-dubbo-spring-cloud/README.md diff --git a/spring-cloud-alibaba-dubbo/README_CN.md b/alibaba-dubbo-spring-cloud/README_CN.md similarity index 100% rename from spring-cloud-alibaba-dubbo/README_CN.md rename to alibaba-dubbo-spring-cloud/README_CN.md diff --git a/spring-cloud-alibaba-dubbo/pom.xml b/alibaba-dubbo-spring-cloud/pom.xml similarity index 97% rename from spring-cloud-alibaba-dubbo/pom.xml rename to alibaba-dubbo-spring-cloud/pom.xml index c09b6fecd..f543e4846 100644 --- a/spring-cloud-alibaba-dubbo/pom.xml +++ b/alibaba-dubbo-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - spring-cloud-alibaba-dubbo + alibaba-dubbo-spring-cloud Spring Cloud Alibaba Dubbo @@ -142,8 +142,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter true diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/annotation/DubboTransported.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/annotation/DubboTransported.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/annotation/DubboTransported.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/annotation/DubboTransported.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponse.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponse.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponse.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponse.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboClientHttpResponseFactory.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboHttpOutputMessage.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboHttpOutputMessage.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboHttpOutputMessage.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboHttpOutputMessage.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboMetadataInitializerInterceptor.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboTransporterInterceptor.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboTransporterInterceptor.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboTransporterInterceptor.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/client/loadbalancer/DubboTransporterInterceptor.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboCloudProperties.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboCloudProperties.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboCloudProperties.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboCloudProperties.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/ByteArrayHttpInputMessage.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/ByteArrayHttpInputMessage.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/ByteArrayHttpInputMessage.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/ByteArrayHttpInputMessage.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpRequest.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpRequest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpRequest.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpRequest.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/MutableHttpServerRequest.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/MutableHttpServerRequest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/MutableHttpServerRequest.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/MutableHttpServerRequest.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/converter/HttpMessageConverterHolder.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/converter/HttpMessageConverterHolder.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/converter/HttpMessageConverterHolder.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/converter/HttpMessageConverterHolder.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/CompositeHttpRequestMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/CompositeHttpRequestMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/CompositeHttpRequestMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/CompositeHttpRequestMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestConsumersMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestConsumersMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestConsumersMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestConsumersMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestHeadersMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestPathMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestPathMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestPathMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestPathMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestProducesMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestProducesMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestProducesMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestProducesMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/MediaTypeExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/MediaTypeExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/MediaTypeExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/MediaTypeExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/NameValueExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/NameValueExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/NameValueExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/NameValueExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpression.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpression.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpression.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpression.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/RequestMetadataMatcher.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/RequestMetadataMatcher.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/RequestMetadataMatcher.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/matcher/RequestMetadataMatcher.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpMessageConverterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpMessageConverterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpMessageConverterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpMessageConverterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtils.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtils.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtils.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtils.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboProtocolConfigSupplier.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboProtocolConfigSupplier.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboProtocolConfigSupplier.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboProtocolConfigSupplier.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboRestServiceMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboRestServiceMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboRestServiceMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboRestServiceMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboTransportedMethodMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboTransportedMethodMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboTransportedMethodMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboTransportedMethodMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/ServiceRestMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/ServiceRestMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/ServiceRestMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/ServiceRestMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/repository/DubboServiceMetadataRepository.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/MetadataResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/MetadataResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/MetadataResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/MetadataResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/AbstractSpringCloudRegistry.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/AbstractSpringCloudRegistry.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/AbstractSpringCloudRegistry.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/AbstractSpringCloudRegistry.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DelegatingRegistration.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DelegatingRegistration.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DelegatingRegistration.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DelegatingRegistration.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistryFactory.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistryFactory.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistryFactory.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistryFactory.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstanceRegisteredEvent.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstanceRegisteredEvent.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstanceRegisteredEvent.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/event/ServiceInstanceRegisteredEvent.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/IntrospectiveDubboMetadataService.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/IntrospectiveDubboMetadataService.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/IntrospectiveDubboMetadataService.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/IntrospectiveDubboMetadataService.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/DubboGenericServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/DubboGenericServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/DubboGenericServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/DubboGenericServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/PathVariableServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/PathVariableServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/PathVariableServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/PathVariableServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestBodyServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestParamServiceParameterResolver.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestParamServiceParameterResolver.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestParamServiceParameterResolver.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/service/parameter/RequestParamServiceParameterResolver.java diff --git a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/util/JSONUtils.java b/alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/util/JSONUtils.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/util/JSONUtils.java rename to alibaba-dubbo-spring-cloud/src/main/java/org/springframework/cloud/alibaba/dubbo/util/JSONUtils.java diff --git a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory rename to alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory diff --git a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties rename to alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/default/actuator-endpoints.properties diff --git a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories rename to alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/AbstractNameValueExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HeaderExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcherTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcherTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcherTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/HttpRequestParamsMatcherTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ParamExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtilsTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtilsTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtilsTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/http/util/HttpUtilsTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java b/alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java rename to alibaba-dubbo-spring-cloud/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java diff --git a/spring-cloud-alibaba-dubbo/src/test/resources/application.yaml b/alibaba-dubbo-spring-cloud/src/test/resources/application.yaml similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/resources/application.yaml rename to alibaba-dubbo-spring-cloud/src/test/resources/application.yaml diff --git a/spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml b/alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml similarity index 100% rename from spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml rename to alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml diff --git a/spring-cloud-alibaba-nacos-config-server/pom.xml b/alibaba-nacos-config-server-spring-cloud/pom.xml similarity index 94% rename from spring-cloud-alibaba-nacos-config-server/pom.xml rename to alibaba-nacos-config-server-spring-cloud/pom.xml index 475f96cd1..d0bab0618 100644 --- a/spring-cloud-alibaba-nacos-config-server/pom.xml +++ b/alibaba-nacos-config-server-spring-cloud/pom.xml @@ -3,15 +3,15 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-nacos-config-server + com.alibaba.cloud + alibaba-nacos-config-server-spring-cloud Spring Cloud Alibaba Nacos Config Server diff --git a/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java b/alibaba-nacos-config-server-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java rename to alibaba-nacos-config-server-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/NacosConfigServerAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/environment/NacosEnvironmentRepository.java b/alibaba-nacos-config-server-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/environment/NacosEnvironmentRepository.java similarity index 100% rename from spring-cloud-alibaba-nacos-config-server/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/environment/NacosEnvironmentRepository.java rename to alibaba-nacos-config-server-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/config/server/environment/NacosEnvironmentRepository.java diff --git a/spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories b/alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories rename to alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java b/alibaba-nacos-config-server-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java similarity index 100% rename from spring-cloud-alibaba-nacos-config-server/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java rename to alibaba-nacos-config-server-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java diff --git a/spring-cloud-alibaba-nacos-config-server/src/test/resources/application.properties b/alibaba-nacos-config-server-spring-cloud/src/test/resources/application.properties similarity index 100% rename from spring-cloud-alibaba-nacos-config-server/src/test/resources/application.properties rename to alibaba-nacos-config-server-spring-cloud/src/test/resources/application.properties diff --git a/spring-cloud-alibaba-nacos-config/pom.xml b/alibaba-nacos-config-spring-cloud/pom.xml similarity index 96% rename from spring-cloud-alibaba-nacos-config/pom.xml rename to alibaba-nacos-config-spring-cloud/pom.xml index e719cfcfc..232fdf3d6 100644 --- a/spring-cloud-alibaba-nacos-config/pom.xml +++ b/alibaba-nacos-config-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud Spring Cloud Alibaba Nacos Config diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosPropertySourceRepository.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySource.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySource.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySource.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySource.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceBuilder.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureException.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureException.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureException.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/diagnostics/analyzer/NacosConnectionFailureException.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpoint.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigHealthIndicator.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigHealthIndicator.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigHealthIndicator.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigHealthIndicator.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosContextRefresher.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshHistory.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshProperties.java b/alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshProperties.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshProperties.java rename to alibaba-nacos-config-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/refresh/NacosRefreshProperties.java diff --git a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories b/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories rename to alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationExtConfigTests.java diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigurationTests.java diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosFileExtensionTest.java b/alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosFileExtensionTest.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosFileExtensionTest.java rename to alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosFileExtensionTest.java diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointTests.java b/alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointTests.java rename to alibaba-nacos-config-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/pom.xml b/alibaba-nacos-discovery-spring-cloud/pom.xml similarity index 96% rename from spring-cloud-alibaba-nacos-discovery/pom.xml rename to alibaba-nacos-discovery-spring-cloud/pom.xml index 4b3b52874..fbe853a4a 100644 --- a/spring-cloud-alibaba-nacos-discovery/pom.xml +++ b/alibaba-nacos-discovery-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud Spring Cloud Alibaba Nacos Discovery diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ConditionalOnNacosDiscoveryEnabled.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ConditionalOnNacosDiscoveryEnabled.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ConditionalOnNacosDiscoveryEnabled.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ConditionalOnNacosDiscoveryEnabled.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryProperties.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosServiceInstance.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosServiceInstance.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/NacosServiceInstance.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/NacosServiceInstance.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClient.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClient.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClient.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClient.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/NacosWatch.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java similarity index 97% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java index f1cf3f3f9..72f4b8d6c 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java +++ b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java @@ -1,57 +1,57 @@ -/* - * Copyright (C) 2018 the original author or authors. - * - * 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. - */ - -package org.springframework.cloud.alibaba.nacos.discovery.configclient; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.context.properties.EnableConfigurationProperties; -import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; -import org.springframework.cloud.config.server.config.ConfigServerProperties; -import org.springframework.context.annotation.Configuration; -import org.springframework.util.StringUtils; - -import javax.annotation.PostConstruct; - -/** - * Extra configuration for config server if it happens to be registered with Nacos. - * - * @author JevonYang - */ -@Configuration -@EnableConfigurationProperties -@ConditionalOnClass({ NacosDiscoveryProperties.class, ConfigServerProperties.class }) -public class NacosConfigServerAutoConfiguration { - - @Autowired(required = false) - private NacosDiscoveryProperties properties; - - @Autowired(required = false) - private ConfigServerProperties server; - - @PostConstruct - public void init() { - if (this.properties == null || this.server == null) { - return; - } - String prefix = this.server.getPrefix(); - if (StringUtils.hasText(prefix) && !StringUtils - .hasText(this.properties.getMetadata().get("configPath"))) { - this.properties.getMetadata().put("configPath", prefix); - } - } - -} +/* + * Copyright (C) 2018 the original author or authors. + * + * 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. + */ + +package org.springframework.cloud.alibaba.nacos.discovery.configclient; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties; +import org.springframework.cloud.config.server.config.ConfigServerProperties; +import org.springframework.context.annotation.Configuration; +import org.springframework.util.StringUtils; + +import javax.annotation.PostConstruct; + +/** + * Extra configuration for config server if it happens to be registered with Nacos. + * + * @author JevonYang + */ +@Configuration +@EnableConfigurationProperties +@ConditionalOnClass({ NacosDiscoveryProperties.class, ConfigServerProperties.class }) +public class NacosConfigServerAutoConfiguration { + + @Autowired(required = false) + private NacosDiscoveryProperties properties; + + @Autowired(required = false) + private ConfigServerProperties server; + + @PostConstruct + public void init() { + if (this.properties == null || this.server == null) { + return; + } + String prefix = this.server.getPrefix(); + if (StringUtils.hasText(prefix) && !StringUtils + .hasText(this.properties.getMetadata().get("configPath"))) { + this.properties.getMetadata().put("configPath", prefix); + } + } + +} diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java similarity index 97% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java index aaf35632a..7717538c5 100644 --- a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java +++ b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java @@ -1,41 +1,41 @@ -/* - * Copyright (C) 2018 the original author or authors. - * - * 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. - */ - -package org.springframework.cloud.alibaba.nacos.discovery.configclient; - -import org.springframework.boot.autoconfigure.ImportAutoConfiguration; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration; -import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration; -import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; -import org.springframework.context.annotation.Configuration; - -import javax.annotation.PostConstruct; - -/** - * Helper for config client that wants to lookup the config server via discovery. - * - * @author JevonYang - */ -@ConditionalOnClass(ConfigServicePropertySourceLocator.class) -@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) -@Configuration -@ImportAutoConfiguration({ NacosDiscoveryClientAutoConfiguration.class, - NacosDiscoveryAutoConfiguration.class }) -public class NacosDiscoveryClientConfigServiceBootstrapConfiguration { - -} +/* + * Copyright (C) 2018 the original author or authors. + * + * 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. + */ + +package org.springframework.cloud.alibaba.nacos.discovery.configclient; + +import org.springframework.boot.autoconfigure.ImportAutoConfiguration; +import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration; +import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration; +import org.springframework.cloud.config.client.ConfigServicePropertySourceLocator; +import org.springframework.context.annotation.Configuration; + +import javax.annotation.PostConstruct; + +/** + * Helper for config client that wants to lookup the config server via discovery. + * + * @author JevonYang + */ +@ConditionalOnClass(ConfigServicePropertySourceLocator.class) +@ConditionalOnProperty(value = "spring.cloud.config.discovery.enabled", matchIfMissing = false) +@Configuration +@ImportAutoConfiguration({ NacosDiscoveryClientAutoConfiguration.class, + NacosDiscoveryAutoConfiguration.class }) +public class NacosDiscoveryClientConfigServiceBootstrapConfiguration { + +} diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpoint.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosRegistration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/registry/NacosServiceRegistry.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ConditionalOnRibbonNacos.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ConditionalOnRibbonNacos.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ConditionalOnRibbonNacos.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ConditionalOnRibbonNacos.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ExtendBalancer.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ExtendBalancer.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ExtendBalancer.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/ExtendBalancer.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfiguration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRule.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRule.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRule.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRule.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServer.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerIntrospector.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerIntrospector.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerIntrospector.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerIntrospector.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerList.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/RibbonNacosAutoConfiguration.java b/alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/RibbonNacosAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/RibbonNacosAutoConfiguration.java rename to alibaba-nacos-discovery-spring-cloud/src/main/java/org/springframework/cloud/alibaba/nacos/ribbon/RibbonNacosAutoConfiguration.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories b/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories rename to alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryClientTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationIpTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationPortTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationPortTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationPortTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationPortTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/registry/NacosAutoServiceRegistrationTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosRibbonClientConfigurationTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerListTests.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerListTests.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerListTests.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/ribbon/NacosServerListTests.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/test/CommonTestConfig.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/CommonTestConfig.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/test/CommonTestConfig.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/CommonTestConfig.java diff --git a/spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/test/NacosMockTest.java b/alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/NacosMockTest.java similarity index 100% rename from spring-cloud-alibaba-nacos-discovery/src/test/java/org/springframework/cloud/alibaba/nacos/test/NacosMockTest.java rename to alibaba-nacos-discovery-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/test/NacosMockTest.java diff --git a/spring-cloud-alibaba-seata/pom.xml b/alibaba-seata-spring-cloud/pom.xml similarity index 93% rename from spring-cloud-alibaba-seata/pom.xml rename to alibaba-seata-spring-cloud/pom.xml index 947b0e263..2bf361553 100644 --- a/spring-cloud-alibaba-seata/pom.xml +++ b/alibaba-seata-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud Spring Cloud Alibaba Seata @@ -27,8 +27,8 @@ true - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter provided true diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/SeataProperties.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/SeataProperties.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/SeataProperties.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/SeataProperties.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataBeanPostProcessor.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataBeanPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataBeanPostProcessor.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataBeanPostProcessor.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataContextBeanPostProcessor.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataContextBeanPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataContextBeanPostProcessor.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataContextBeanPostProcessor.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignBuilder.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignBuilder.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignBuilder.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignBuilder.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignContext.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignContext.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignContext.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignContext.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignObjectWrapper.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignObjectWrapper.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignObjectWrapper.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignObjectWrapper.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataHystrixFeignBuilder.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataHystrixFeignBuilder.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataHystrixFeignBuilder.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataHystrixFeignBuilder.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataLoadBalancerFeignClient.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataLoadBalancerFeignClient.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataLoadBalancerFeignClient.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataLoadBalancerFeignClient.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataSentinelFeignBuilder.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataSentinelFeignBuilder.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataSentinelFeignBuilder.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataSentinelFeignBuilder.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixAutoConfiguration.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixAutoConfiguration.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixAutoConfiguration.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java diff --git a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptorConfiguration.java b/alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptorConfiguration.java similarity index 100% rename from spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptorConfiguration.java rename to alibaba-seata-spring-cloud/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptorConfiguration.java diff --git a/spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories b/alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories rename to alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-sentinel-datasource/pom.xml b/alibaba-sentinel-datasource-spring-cloud/pom.xml similarity index 96% rename from spring-cloud-alibaba-sentinel-datasource/pom.xml rename to alibaba-sentinel-datasource-spring-cloud/pom.xml index 6dfee847c..570f28a54 100644 --- a/spring-cloud-alibaba-sentinel-datasource/pom.xml +++ b/alibaba-sentinel-datasource-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-sentinel-datasource + com.alibaba.cloud + alibaba-sentinel-datasource-spring-cloud Spring Cloud Alibaba Sentinel DataSource diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleType.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleType.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleType.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleType.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ApolloDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ApolloDataSourceProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ApolloDataSourceProperties.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ApolloDataSourceProperties.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/DataSourcePropertiesConfiguration.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/DataSourcePropertiesConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/DataSourcePropertiesConfiguration.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/DataSourcePropertiesConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/FileDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/FileDataSourceProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/FileDataSourceProperties.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/FileDataSourceProperties.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/NacosDataSourceProperties.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ZookeeperDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ZookeeperDataSourceProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ZookeeperDataSourceProperties.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/ZookeeperDataSourceProperties.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/SentinelConverter.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/SentinelConverter.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/SentinelConverter.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/SentinelConverter.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java rename to alibaba-sentinel-datasource-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties b/alibaba-sentinel-datasource-spring-cloud/src/main/resources/META-INF/sentinel-datasource.properties similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/main/resources/META-INF/sentinel-datasource.properties rename to alibaba-sentinel-datasource-spring-cloud/src/main/resources/META-INF/sentinel-datasource.properties diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesConfigurationTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesConfigurationTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesConfigurationTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourcePropertiesTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourceFactoryBeanTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourceFactoryBeanTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourceFactoryBeanTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourceFactoryBeanTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourcePropertiesTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourcePropertiesTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourcePropertiesTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/NacosDataSourcePropertiesTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleTypeTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleTypeTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleTypeTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/RuleTypeTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelConverterTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelConverterTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelConverterTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelConverterTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java b/alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java rename to alibaba-sentinel-datasource-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorcontent.json b/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorcontent.json similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorcontent.json rename to alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorcontent.json diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorformat.json b/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorformat.json similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule-errorformat.json rename to alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule-errorformat.json diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.json b/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.json similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.json rename to alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.json diff --git a/spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.xml b/alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.xml similarity index 100% rename from spring-cloud-alibaba-sentinel-datasource/src/test/resources/flowrule.xml rename to alibaba-sentinel-datasource-spring-cloud/src/test/resources/flowrule.xml diff --git a/spring-cloud-alibaba-sentinel-gateway/README.md b/alibaba-sentinel-gateway-spring-cloud/README.md similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/README.md rename to alibaba-sentinel-gateway-spring-cloud/README.md diff --git a/spring-cloud-alibaba-sentinel-gateway/pom.xml b/alibaba-sentinel-gateway-spring-cloud/pom.xml similarity index 89% rename from spring-cloud-alibaba-sentinel-gateway/pom.xml rename to alibaba-sentinel-gateway-spring-cloud/pom.xml index 498e370b2..13333c296 100644 --- a/spring-cloud-alibaba-sentinel-gateway/pom.xml +++ b/alibaba-sentinel-gateway-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + com.alibaba.cloud spring-cloud-alibaba - org.springframework.cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-sentinel-gateway + com.alibaba.cloud + alibaba-sentinel-gateway-spring-cloud Spring Cloud Alibaba Sentinel Gateway @@ -36,8 +36,8 @@ sentinel-spring-cloud-gateway-adapter - org.springframework.cloud - spring-cloud-alibaba-sentinel-datasource + com.alibaba.cloud + alibaba-sentinel-datasource-spring-cloud org.springframework.cloud diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/ConfigConstants.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/ConfigConstants.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/ConfigConstants.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/ConfigConstants.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/FallbackProperties.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/FallbackProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/FallbackProperties.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/FallbackProperties.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelGatewayAutoConfiguration.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelGatewayAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelGatewayAutoConfiguration.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/SentinelGatewayAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelGatewayProperties.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelGatewayProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelGatewayProperties.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelGatewayProperties.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/FallBackProviderHandler.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/FallBackProviderHandler.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/FallBackProviderHandler.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/FallBackProviderHandler.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulProperties.java b/alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulProperties.java rename to alibaba-sentinel-gateway-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/gateway/zuul/SentinelZuulProperties.java diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories b/alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories rename to alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/alibaba-sentinel-spring-cloud/pom.xml similarity index 95% rename from spring-cloud-alibaba-sentinel/pom.xml rename to alibaba-sentinel-spring-cloud/pom.xml index 77c69e6a2..50f6bb455 100644 --- a/spring-cloud-alibaba-sentinel/pom.xml +++ b/alibaba-sentinel-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud Spring Cloud Alibaba Sentinel @@ -101,8 +101,8 @@ - org.springframework.cloud - spring-cloud-alibaba-sentinel-datasource + com.alibaba.cloud + alibaba-sentinel-datasource-spring-cloud diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebFluxAutoConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebFluxAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebFluxAutoConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebFluxAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelRestTemplate.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelRestTemplate.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelRestTemplate.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelRestTemplate.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelContractHolder.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelContractHolder.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelContractHolder.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelContractHolder.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeignAutoConfiguration.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeignAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeignAutoConfiguration.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeignAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelInvocationHandler.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelInvocationHandler.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelInvocationHandler.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelInvocationHandler.java diff --git a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java b/alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java rename to alibaba-sentinel-spring-cloud/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to alibaba-sentinel-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories b/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories rename to alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelBeanAutowiredTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelBeanAutowiredTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelBeanAutowiredTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelBeanAutowiredTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelDataSourceTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelDataSourceTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelDataSourceTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelDataSourceTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelFeignTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelFeignTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelFeignTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelFeignTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelRestTemplateTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelRestTemplateTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelRestTemplateTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelRestTemplateTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/TestConverter.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/TestConverter.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/TestConverter.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/TestConverter.java diff --git a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java b/alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java rename to alibaba-sentinel-spring-cloud/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java diff --git a/spring-cloud-alibaba-sentinel/src/test/resources/authority.json b/alibaba-sentinel-spring-cloud/src/test/resources/authority.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/resources/authority.json rename to alibaba-sentinel-spring-cloud/src/test/resources/authority.json diff --git a/spring-cloud-alibaba-sentinel/src/test/resources/degraderule.json b/alibaba-sentinel-spring-cloud/src/test/resources/degraderule.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/resources/degraderule.json rename to alibaba-sentinel-spring-cloud/src/test/resources/degraderule.json diff --git a/spring-cloud-alibaba-sentinel/src/test/resources/flowrule.json b/alibaba-sentinel-spring-cloud/src/test/resources/flowrule.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/resources/flowrule.json rename to alibaba-sentinel-spring-cloud/src/test/resources/flowrule.json diff --git a/spring-cloud-alibaba-sentinel/src/test/resources/param-flow.json b/alibaba-sentinel-spring-cloud/src/test/resources/param-flow.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/resources/param-flow.json rename to alibaba-sentinel-spring-cloud/src/test/resources/param-flow.json diff --git a/spring-cloud-alibaba-sentinel/src/test/resources/system.json b/alibaba-sentinel-spring-cloud/src/test/resources/system.json similarity index 100% rename from spring-cloud-alibaba-sentinel/src/test/resources/system.json rename to alibaba-sentinel-spring-cloud/src/test/resources/system.json diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/alibaba-spring-cloud-dependencies/pom.xml similarity index 80% rename from spring-cloud-alibaba-dependencies/pom.xml rename to alibaba-spring-cloud-dependencies/pom.xml index 1fc4be42c..f0f25de3a 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/alibaba-spring-cloud-dependencies/pom.xml @@ -10,11 +10,12 @@ - spring-cloud-alibaba-dependencies + com.alibaba.cloud + alibaba-spring-cloud-dependencies 0.9.1.BUILD-SNAPSHOT pom Spring Cloud Alibaba Dependencies - Spring Cloud Alibaba Dependencies + BOM for Spring Cloud Alibaba Dependencies 1.6.2 @@ -178,7 +179,7 @@ ${sentinel.version} - org.springframework.cloud + com.alibaba.cloud sentinel-dubbo-api ${project.version} @@ -257,157 +258,157 @@ - org.springframework.cloud - spring-cloud-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-sentinel-datasource + com.alibaba.cloud + alibaba-sentinel-datasource-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-sentinel-gateway + com.alibaba.cloud + alibaba-sentinel-gateway-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-oss + com.alibaba.cloud + alicloud-oss-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-nacos-config-server + com.alibaba.cloud + alibaba-nacos-config-server-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-acm + com.alibaba.cloud + alicloud-acm-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-schedulerx + com.alibaba.cloud + alicloud-schedulerx-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-sms + com.alibaba.cloud + alicloud-sms-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-stream-binder-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-stream-binder ${project.version} - org.springframework.cloud - spring-cloud-alibaba-dubbo + com.alibaba.cloud + alibaba-dubbo-spring-cloud ${project.version} - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alicloud-oss + com.alibaba.cloud + alicloud-oss-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-config-server + com.alibaba.cloud + alibaba-nacos-config-server-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alicloud-acm + com.alibaba.cloud + alicloud-acm-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-alicloud-schedulerx + com.alibaba.cloud + alicloud-schedulerx-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-stream-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-stream ${project.version} - org.springframework.cloud - spring-cloud-starter-bus-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-bus ${project.version} - org.springframework.cloud - spring-cloud-starter-alicloud-sms + com.alibaba.cloud + alicloud-sms-spring-cloud-starter ${project.version} - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter ${project.version} diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml b/alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml similarity index 63% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml rename to alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml index 85cb1ca47..74188bee3 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config-server/pom.xml +++ b/alibaba-spring-cloud-starter/alibaba-nacos-config-server-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-nacos-config-server + alibaba-nacos-config-server-spring-cloud-starter Spring Cloud Starter Alibaba Nacos Config Server - org.springframework.cloud - spring-cloud-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml b/alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml similarity index 62% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml rename to alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml index 7dc1bb0d2..57a62ea25 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-config/pom.xml +++ b/alibaba-spring-cloud-starter/alibaba-nacos-config-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-nacos-config + alibaba-nacos-config-spring-cloud-starter Spring Cloud Starter Alibaba Nacos Config - org.springframework.cloud - spring-cloud-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml b/alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml similarity index 62% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml rename to alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml index 9bccd45c6..0fdc0a15a 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-nacos-discovery/pom.xml +++ b/alibaba-spring-cloud-starter/alibaba-nacos-discovery-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-nacos-discovery + alibaba-nacos-discovery-spring-cloud-starter Spring Cloud Starter Alibaba Nacos Discovery - org.springframework.cloud - spring-cloud-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml b/alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml similarity index 61% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml rename to alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml index bc4eb0b60..d50735abf 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-seata/pom.xml +++ b/alibaba-spring-cloud-starter/alibaba-seata-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-seata + alibaba-seata-spring-cloud-starter Spring Cloud Starter Alibaba Seata - org.springframework.cloud - spring-cloud-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml b/alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml similarity index 61% rename from spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml rename to alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml index 24c53c678..f841c1ff9 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml +++ b/alibaba-spring-cloud-starter/alibaba-sentinel-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alibaba-sentinel + alibaba-sentinel-spring-cloud-starter Spring Cloud Starter Alibaba Sentinel - org.springframework.cloud - spring-cloud-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml b/alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml similarity index 63% rename from spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml rename to alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml index 5afd88018..6449fc410 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-dubbo/pom.xml +++ b/alibaba-spring-cloud-starter/dubbo-spring-cloud-starter/pom.xml @@ -3,21 +3,20 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - ../pom.xml 4.0.0 - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter Spring Cloud Starter Dubbo ${project.groupId} - spring-cloud-alibaba-dubbo + alibaba-dubbo-spring-cloud ${project.version} diff --git a/spring-cloud-starter-alibaba/pom.xml b/alibaba-spring-cloud-starter/pom.xml similarity index 50% rename from spring-cloud-starter-alibaba/pom.xml rename to alibaba-spring-cloud-starter/pom.xml index 1b3da1a63..981ac2944 100644 --- a/spring-cloud-starter-alibaba/pom.xml +++ b/alibaba-spring-cloud-starter/pom.xml @@ -2,23 +2,23 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT ../pom.xml - spring-cloud-starter-alibaba + alibaba-spring-cloud-starter pom Spring Cloud Alibaba Starters Spring Cloud Alibaba Starters - spring-cloud-starter-alibaba-nacos-config - spring-cloud-starter-alibaba-nacos-config-server - spring-cloud-starter-alibaba-nacos-discovery - spring-cloud-starter-alibaba-sentinel - spring-cloud-starter-alibaba-seata - spring-cloud-starter-stream-rocketmq - spring-cloud-starter-bus-rocketmq - spring-cloud-starter-dubbo + alibaba-nacos-config-spring-cloud-starter + alibaba-nacos-config-server-spring-cloud-starter + alibaba-nacos-discovery-spring-cloud-starter + alibaba-sentinel-spring-cloud-starter + alibaba-seata-spring-cloud-starter + rocketmq-spring-cloud-starter-stream + rocketmq-spring-cloud-starter-bus + dubbo-spring-cloud-starter \ No newline at end of file diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml similarity index 65% rename from spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml rename to alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml index 8d6b9c231..5fff9af85 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/pom.xml +++ b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/pom.xml @@ -3,23 +3,22 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - ../pom.xml 4.0.0 - org.springframework.cloud - spring-cloud-starter-bus-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-bus Spring Cloud Alibaba Bus RocketMQ - org.springframework.cloud - spring-cloud-stream-binder-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-stream-binder diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java similarity index 100% rename from spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java rename to alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/java/org/springframework/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/resources/META-INF/spring.factories b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-starter-alibaba/spring-cloud-starter-bus-rocketmq/src/main/resources/META-INF/spring.factories rename to alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-bus/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml similarity index 58% rename from spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml rename to alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml index 9c818cafc..8a6a9f979 100644 --- a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml +++ b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml @@ -3,18 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alibaba + com.alibaba.cloud + alibaba-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - ../pom.xml - spring-cloud-starter-stream-rocketmq + rocketmq-spring-cloud-starter-stream Spring Cloud Starter Stream RocketMQ - org.springframework.cloud - spring-cloud-stream-binder-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-stream-binder diff --git a/spring-cloud-alibaba-test/core-support/pom.xml b/alibaba-test-spring-cloud/core-support/pom.xml similarity index 89% rename from spring-cloud-alibaba-test/core-support/pom.xml rename to alibaba-test-spring-cloud/core-support/pom.xml index 4d3a92540..b96bbb883 100644 --- a/spring-cloud-alibaba-test/core-support/pom.xml +++ b/alibaba-test-spring-cloud/core-support/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-alibaba-test + com.alibaba.cloud + alibaba-test-spring-cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 diff --git a/spring-cloud-alibaba-test/pom.xml b/alibaba-test-spring-cloud/pom.xml similarity index 90% rename from spring-cloud-alibaba-test/pom.xml rename to alibaba-test-spring-cloud/pom.xml index 16a7088ff..146d79f0e 100644 --- a/spring-cloud-alibaba-test/pom.xml +++ b/alibaba-test-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - spring-cloud-alibaba-test + alibaba-test-spring-cloud pom spring cloud alibaba test support diff --git a/spring-cloud-alibaba-test/sentinel-test-support/pom.xml b/alibaba-test-spring-cloud/sentinel-test-support/pom.xml similarity index 89% rename from spring-cloud-alibaba-test/sentinel-test-support/pom.xml rename to alibaba-test-spring-cloud/sentinel-test-support/pom.xml index 6a453721b..b8e18a09b 100644 --- a/spring-cloud-alibaba-test/sentinel-test-support/pom.xml +++ b/alibaba-test-spring-cloud/sentinel-test-support/pom.xml @@ -3,8 +3,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud - spring-cloud-alibaba-test + com.alibaba.cloud + alibaba-test-spring-cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 diff --git a/spring-cloud-alicloud-acm/pom.xml b/alicloud-acm-spring-cloud/pom.xml similarity index 93% rename from spring-cloud-alicloud-acm/pom.xml rename to alicloud-acm-spring-cloud/pom.xml index d5092b4b2..9e53d62cc 100644 --- a/spring-cloud-alicloud-acm/pom.xml +++ b/alicloud-acm-spring-cloud/pom.xml @@ -5,19 +5,19 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT - spring-cloud-alicloud-acm + alicloud-acm-spring-cloud Spring Cloud Alibaba Cloud ACM - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmPropertySourceRepository.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/AcmPropertySourceRepository.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmPropertySourceRepository.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/AcmPropertySourceRepository.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java diff --git a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java b/alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java similarity index 100% rename from spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java rename to alicloud-acm-spring-cloud/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java diff --git a/spring-cloud-alicloud-acm/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alicloud-acm-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alicloud-acm/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to alicloud-acm-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories b/alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories rename to alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java b/alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java similarity index 100% rename from spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java rename to alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java diff --git a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java b/alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java similarity index 100% rename from spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java rename to alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java diff --git a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java b/alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java similarity index 100% rename from spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java rename to alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java diff --git a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java b/alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java similarity index 100% rename from spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java rename to alicloud-acm-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java diff --git a/spring-cloud-alicloud-ans/pom.xml b/alicloud-ans-spring-cloud/pom.xml similarity index 94% rename from spring-cloud-alicloud-ans/pom.xml rename to alicloud-ans-spring-cloud/pom.xml index 4b36ec074..fd0f2d3ec 100644 --- a/spring-cloud-alicloud-ans/pom.xml +++ b/alicloud-ans-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + com.alibaba.cloud spring-cloud-alibaba - org.springframework.cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud Spring Cloud Alibaba Cloud ANS @@ -31,8 +31,8 @@ - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsServiceInstance.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsServiceInstance.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsServiceInstance.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/AnsServiceInstance.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ConditionalOnAnsEnabled.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ConditionalOnAnsEnabled.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ConditionalOnAnsEnabled.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ConditionalOnAnsEnabled.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/ConditionalOnRibbonAns.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/ConditionalOnRibbonAns.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/ConditionalOnRibbonAns.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/ConditionalOnRibbonAns.java diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java b/alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java rename to alicloud-ans-spring-cloud/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java diff --git a/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories b/alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories rename to alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerListTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerListTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerListTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerListTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServiceListTests.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServiceListTests.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServiceListTests.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServiceListTests.java diff --git a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/test/AnsMockTest.java b/alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/test/AnsMockTest.java similarity index 100% rename from spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/test/AnsMockTest.java rename to alicloud-ans-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/test/AnsMockTest.java diff --git a/spring-cloud-alicloud-context/pom.xml b/alicloud-context-spring-cloud/pom.xml similarity index 96% rename from spring-cloud-alicloud-context/pom.xml rename to alicloud-context-spring-cloud/pom.xml index ab98c6f3e..bd758eb11 100644 --- a/spring-cloud-alicloud-context/pom.xml +++ b/alicloud-context-spring-cloud/pom.xml @@ -3,14 +3,14 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud Spring Cloud AliCloud Context diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/AliCloudProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/AliCloudProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/Constants.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/Constants.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/Constants.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/Constants.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmContextBootstrapConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmContextBootstrapConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmContextBootstrapConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmContextBootstrapConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmIntegrationProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmIntegrationProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmIntegrationProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmIntegrationProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListener.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListener.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListener.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListener.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/oss/OssProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/oss/OssProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsContextAutoConfiguration.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsContextAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsContextAutoConfiguration.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsContextAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsProperties.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsProperties.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsProperties.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsProperties.java diff --git a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java b/alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java similarity index 100% rename from spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java rename to alicloud-context-spring-cloud/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java diff --git a/spring-cloud-alicloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/alicloud-context-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alicloud-context/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to alicloud-context-spring-cloud/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories b/alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories rename to alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alicloud-context/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java b/alicloud-context-spring-cloud/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java rename to alicloud-context-spring-cloud/src/test/java/com/alibaba/csp/sentinel/datasource/nacos/NacosDataSource.java diff --git a/spring-cloud-alicloud-context/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java b/alicloud-context-spring-cloud/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java rename to alicloud-context-spring-cloud/src/test/java/com/aliyuncs/dysmsapi/model/v20170525/SendSmsRequest.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/AliCloudPropertiesTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/AliCloudPropertiesTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/AliCloudPropertiesTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/AliCloudPropertiesTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/BaseAliCloudSpringApplication.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/BaseAliCloudSpringApplication.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/BaseAliCloudSpringApplication.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/BaseAliCloudSpringApplication.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/acm/AcmPropertiesTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/acm/AcmPropertiesTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/acm/AcmPropertiesTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/acm/AcmPropertiesTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListenerTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListenerTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListenerTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListenerTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/edas/EdasPropertiesTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/edas/EdasPropertiesTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/edas/EdasPropertiesTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/edas/EdasPropertiesTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sms/SmsPropertiesTests.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/sms/SmsPropertiesTests.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sms/SmsPropertiesTests.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/context/sms/SmsPropertiesTests.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java diff --git a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/utils/ChangeOrderUtils.java b/alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/utils/ChangeOrderUtils.java similarity index 100% rename from spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/utils/ChangeOrderUtils.java rename to alicloud-context-spring-cloud/src/test/java/org/springframework/cloud/alicloud/utils/ChangeOrderUtils.java diff --git a/spring-cloud-alicloud-oss/pom.xml b/alicloud-oss-spring-cloud/pom.xml similarity index 90% rename from spring-cloud-alicloud-oss/pom.xml rename to alicloud-oss-spring-cloud/pom.xml index 29acc945c..be485d114 100644 --- a/spring-cloud-alicloud-oss/pom.xml +++ b/alicloud-oss-spring-cloud/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alicloud-oss + com.alibaba.cloud + alicloud-oss-spring-cloud Spring Cloud Alibaba Cloud OSS - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssConstants.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssConstants.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssConstants.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/OssConstants.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpoint.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpoint.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpoint.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpoint.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java diff --git a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageResource.java b/alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageResource.java similarity index 100% rename from spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageResource.java rename to alicloud-oss-spring-cloud/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageResource.java diff --git a/spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories b/alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories rename to alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alicloud-schedulerx/pom.xml b/alicloud-schedulerx-spring-cloud/pom.xml similarity index 91% rename from spring-cloud-alicloud-schedulerx/pom.xml rename to alicloud-schedulerx-spring-cloud/pom.xml index 5424847ec..f06c1d580 100644 --- a/spring-cloud-alicloud-schedulerx/pom.xml +++ b/alicloud-schedulerx-spring-cloud/pom.xml @@ -3,18 +3,18 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> + com.alibaba.cloud spring-cloud-alibaba - org.springframework.cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 - spring-cloud-alicloud-schedulerx + alicloud-schedulerx-spring-cloud Spring Cloud Alibaba Cloud SchedulerX - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud org.slf4j diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java b/alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java rename to alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java b/alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java similarity index 100% rename from spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java rename to alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java diff --git a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java b/alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java rename to alicloud-schedulerx-spring-cloud/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java diff --git a/spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories b/alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories rename to alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alicloud-sms/pom.xml b/alicloud-sms-spring-cloud/pom.xml similarity index 92% rename from spring-cloud-alicloud-sms/pom.xml rename to alicloud-sms-spring-cloud/pom.xml index 4a8e05dcb..751d889c2 100644 --- a/spring-cloud-alicloud-sms/pom.xml +++ b/alicloud-sms-spring-cloud/pom.xml @@ -3,21 +3,21 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud - spring-cloud-alicloud-sms + com.alibaba.cloud + alicloud-sms-spring-cloud Spring Cloud Alibaba Cloud SMS - org.springframework.cloud - spring-cloud-alicloud-context + com.alibaba.cloud + alicloud-context-spring-cloud com.aliyun diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/ISmsService.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/ISmsService.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/ISmsService.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/ISmsService.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsMessageListener.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsMessageListener.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsMessageListener.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsMessageListener.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsReportMessageListener.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsReportMessageListener.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsReportMessageListener.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsReportMessageListener.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsServiceImpl.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsServiceImpl.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsServiceImpl.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsServiceImpl.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsUpMessageListener.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsUpMessageListener.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsUpMessageListener.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/SmsUpMessageListener.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java similarity index 96% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java index 4d23ccff6..9a5b05b9e 100755 --- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java +++ b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/DefaultAlicomMessagePuller.java @@ -1,431 +1,431 @@ -/* - * Copyright (C) 2019 the original author or authors. - * - * 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. - */ -package org.springframework.cloud.alicloud.sms.base; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ScheduledThreadPoolExecutor; - -import org.apache.commons.lang3.concurrent.BasicThreadFactory; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.aliyun.mns.client.CloudQueue; -import com.aliyun.mns.common.ClientException; -import com.aliyun.mns.common.ServiceException; -import com.aliyun.mns.model.Message; - -/** - * 阿里通信官方消息默认拉取工具类 - */ -public class DefaultAlicomMessagePuller { - - private static final Logger log = LoggerFactory - .getLogger(DefaultAlicomMessagePuller.class); - - private String mnsAccountEndpoint = "https://1943695596114318.mns.cn-hangzhou.aliyuncs.com/";// 阿里通信消息的endpoint,固定。 - private String endpointNameForPop = "cn-hangzhou"; - private String regionIdForPop = "cn-hangzhou"; - private String domainForPop = "dybaseapi.aliyuncs.com"; - private TokenGetterForAlicom tokenGetter; - private MessageListener messageListener; - private boolean isRunning = false; - private Integer pullMsgThreadSize = 1; - private boolean debugLogOpen = false; - private Integer sleepSecondWhenNoData = 30; - - public void openDebugLog(boolean debugLogOpen) { - this.debugLogOpen = debugLogOpen; - } - - public Integer getSleepSecondWhenNoData() { - return sleepSecondWhenNoData; - } - - public void setSleepSecondWhenNoData(Integer sleepSecondWhenNoData) { - this.sleepSecondWhenNoData = sleepSecondWhenNoData; - } - - public Integer getPullMsgThreadSize() { - return pullMsgThreadSize; - } - - public void setPullMsgThreadSize(Integer pullMsgThreadSize) { - if (pullMsgThreadSize != null && pullMsgThreadSize > 1) { - this.pullMsgThreadSize = pullMsgThreadSize; - } - } - - private ExecutorService executorService; - - public ExecutorService getExecutorService() { - return executorService; - } - - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } - - protected static final Map S_LOCK_OBJ_MAP = new HashMap<>(); - protected static Map sPollingMap = new ConcurrentHashMap<>(); - protected Object lockObj; - - public boolean setPolling(String queueName) { - synchronized (lockObj) { - Boolean ret = sPollingMap.get(queueName); - if (ret == null || !ret) { - sPollingMap.put(queueName, true); - return true; - } - return false; - } - } - - public void clearPolling(String queueName) { - synchronized (lockObj) { - sPollingMap.put(queueName, false); - lockObj.notifyAll(); - if (debugLogOpen) { - log.info("PullMessageTask_WakeUp:Everyone WakeUp and Work!"); - } - } - } - - public boolean isRunning() { - return isRunning; - } - - public void setRunning(boolean running) { - isRunning = running; - } - - private class PullMessageTask implements Runnable { - private String messageType; - private String queueName; - - @Override - public void run() { - - boolean polling = false; - while (isRunning) { - try { - synchronized (lockObj) { - Boolean p = sPollingMap.get(queueName); - if (p != null && p) { - try { - if (debugLogOpen) { - log.info("PullMessageTask_sleep:" - + Thread.currentThread().getName() - + " Have a nice sleep!"); - } - polling = false; - lockObj.wait(); - } - catch (InterruptedException e) { - if (debugLogOpen) { - log.info("PullMessageTask_Interrupted!" - + Thread.currentThread().getName() - + " QueueName is " + queueName); - } - continue; - } - } - } - - TokenForAlicom tokenObject = tokenGetter.getTokenByMessageType( - messageType, queueName, mnsAccountEndpoint); - CloudQueue queue = tokenObject.getQueue(); - Message popMsg = null; - if (!polling) { - popMsg = queue.popMessage(); - if (debugLogOpen) { - SimpleDateFormat format = new SimpleDateFormat( - "yyyy-MM-dd HH:mm:ss"); - log.info("PullMessageTask_popMessage:" - + Thread.currentThread().getName() + "-popDone at " - + "," + format.format(new Date()) + " msgSize=" - + (popMsg == null ? 0 : popMsg.getMessageId())); - } - if (popMsg == null) { - polling = true; - continue; - } - } - else { - if (setPolling(queueName)) { - if (debugLogOpen) { - log.info("PullMessageTask_setPolling:" - + Thread.currentThread().getName() + " Polling!"); - } - } - else { - continue; - } - do { - if (debugLogOpen) { - log.info("PullMessageTask_Keep_Polling" - + Thread.currentThread().getName() - + "KEEP Polling!"); - } - try { - popMsg = queue.popMessage(sleepSecondWhenNoData); - } - catch (ClientException e) { - if (debugLogOpen) { - log.info( - "PullMessageTask_Pop_Message:ClientException Refresh accessKey" - + e); - } - tokenObject = tokenGetter.getTokenByMessageType( - messageType, queueName, mnsAccountEndpoint); - queue = tokenObject.getQueue(); - - } - catch (ServiceException e) { - if (debugLogOpen) { - log.info( - "PullMessageTask_Pop_Message:ServiceException Refresh accessKey" - + e); - } - tokenObject = tokenGetter.getTokenByMessageType( - messageType, queueName, mnsAccountEndpoint); - queue = tokenObject.getQueue(); - - } - catch (Exception e) { - if (debugLogOpen) { - log.info( - "PullMessageTask_Pop_Message:Exception Happened when polling popMessage: " - + e); - } - } - } - while (popMsg == null && isRunning); - clearPolling(queueName); - } - boolean dealResult = messageListener.dealMessage(popMsg); - if (dealResult) { - // remember to delete message when consume message successfully. - if (debugLogOpen) { - log.info("PullMessageTask_Deal_Message:" - + Thread.currentThread().getName() + "deleteMessage " - + popMsg.getMessageId()); - } - queue.deleteMessage(popMsg.getReceiptHandle()); - } - } - catch (ClientException e) { - log.error("PullMessageTask_execute_error,messageType:" + messageType - + ",queueName:" + queueName, e); - break; - - } - catch (ServiceException e) { - if (e.getErrorCode().equals("AccessDenied")) { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName - + ",please check messageType and queueName", e); - } - else { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName, e); - } - break; - - } - catch (com.aliyuncs.exceptions.ClientException e) { - if (e.getErrCode().equals("InvalidAccessKeyId.NotFound")) { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName - + ",please check AccessKeyId", e); - } - if (e.getErrCode().equals("SignatureDoesNotMatch")) { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName - + ",please check AccessKeySecret", e); - } - else { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName, e); - } - break; - - } - catch (Exception e) { - log.error("PullMessageTask_execute_error,messageType:" + messageType - + ",queueName:" + queueName, e); - try { - Thread.sleep(sleepSecondWhenNoData); - } - catch (InterruptedException e1) { - log.error("PullMessageTask_execute_error,messageType:" - + messageType + ",queueName:" + queueName, e); - } - } - } - - } - - } - - /** - * @param accessKeyId accessKeyId - * @param accessKeySecret accessKeySecret - * @param messageType 消息类型 - * @param queueName 队列名称 - * @param messageListener 回调的listener,用户自己实现 - * @throws com.aliyuncs.exceptions.ClientException - * @throws ParseException - */ - public void startReceiveMsg(String accessKeyId, String accessKeySecret, - String messageType, String queueName, MessageListener messageListener) - throws com.aliyuncs.exceptions.ClientException, ParseException { - - tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, - endpointNameForPop, regionIdForPop, domainForPop, null); - - this.messageListener = messageListener; - isRunning = true; - PullMessageTask task = new PullMessageTask(); - task.messageType = messageType; - task.queueName = queueName; - - synchronized (S_LOCK_OBJ_MAP) { - lockObj = S_LOCK_OBJ_MAP.get(queueName); - if (lockObj == null) { - lockObj = new Object(); - S_LOCK_OBJ_MAP.put(queueName, lockObj); - } - } - - if (executorService == null) { - ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( - pullMsgThreadSize, - new BasicThreadFactory.Builder() - .namingPattern( - "PullMessageTask-" + messageType + "-thread-pool-%d") - .daemon(true).build()); - executorService = scheduledExecutorService; - } - for (int i = 0; i < pullMsgThreadSize; i++) { - executorService.execute(task); - } - } - - /** - * @param accessKeyId accessKeyId - * @param accessKeySecret accessKeySecret - * @param messageType 消息类型 - * @param queueName 队列名称 - * @param messageListener 回调的listener,用户自己实现 - * @throws com.aliyuncs.exceptions.ClientException - * @throws ParseException - */ - public void startReceiveMsgForVPC(String accessKeyId, String accessKeySecret, - String messageType, String queueName, String regionIdForPop, - String endpointNameForPop, String domainForPop, String mnsAccountEndpoint, - MessageListener messageListener) - throws com.aliyuncs.exceptions.ClientException, ParseException { - this.mnsAccountEndpoint = mnsAccountEndpoint; - tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, - endpointNameForPop, regionIdForPop, domainForPop, null); - - this.messageListener = messageListener; - isRunning = true; - PullMessageTask task = new PullMessageTask(); - task.messageType = messageType; - task.queueName = queueName; - - synchronized (S_LOCK_OBJ_MAP) { - lockObj = S_LOCK_OBJ_MAP.get(queueName); - if (lockObj == null) { - lockObj = new Object(); - S_LOCK_OBJ_MAP.put(queueName, lockObj); - } - } - - if (executorService == null) { - ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( - pullMsgThreadSize, - new BasicThreadFactory.Builder() - .namingPattern( - "PullMessageTask-" + messageType + "-thread-pool-%d") - .daemon(true).build()); - executorService = scheduledExecutorService; - } - for (int i = 0; i < pullMsgThreadSize; i++) { - executorService.execute(task); - } - } - - /** - * 虚商用户定制接收消息方法 - * @param accessKeyId accessKeyId - * @param accessKeySecret accessKeySecret - * @param ownerId 实际的ownerId - * @param messageType 消息类型 - * @param queueName 队列名称 - * @param messageListener 回调listener - * @throws com.aliyuncs.exceptions.ClientException - * @throws ParseException - */ - public void startReceiveMsgForPartnerUser(String accessKeyId, String accessKeySecret, - Long ownerId, String messageType, String queueName, - MessageListener messageListener) - throws com.aliyuncs.exceptions.ClientException, ParseException { - - tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, - endpointNameForPop, regionIdForPop, domainForPop, ownerId); - - this.messageListener = messageListener; - isRunning = true; - PullMessageTask task = new PullMessageTask(); - task.messageType = messageType; - task.queueName = queueName; - - synchronized (S_LOCK_OBJ_MAP) { - lockObj = S_LOCK_OBJ_MAP.get(queueName); - if (lockObj == null) { - lockObj = new Object(); - S_LOCK_OBJ_MAP.put(queueName, lockObj); - } - } - - if (executorService == null) { - ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( - pullMsgThreadSize, - new BasicThreadFactory.Builder() - .namingPattern( - "PullMessageTask-" + messageType + "-thread-pool-%d") - .daemon(true).build()); - executorService = scheduledExecutorService; - } - for (int i = 0; i < pullMsgThreadSize; i++) { - executorService.execute(task); - } - } - - public void stop() { - isRunning = false; - } - -} +/* + * Copyright (C) 2019 the original author or authors. + * + * 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. + */ +package org.springframework.cloud.alicloud.sms.base; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.Date; +import java.util.HashMap; +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ScheduledThreadPoolExecutor; + +import org.apache.commons.lang3.concurrent.BasicThreadFactory; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.aliyun.mns.client.CloudQueue; +import com.aliyun.mns.common.ClientException; +import com.aliyun.mns.common.ServiceException; +import com.aliyun.mns.model.Message; + +/** + * 阿里通信官方消息默认拉取工具类 + */ +public class DefaultAlicomMessagePuller { + + private static final Logger log = LoggerFactory + .getLogger(DefaultAlicomMessagePuller.class); + + private String mnsAccountEndpoint = "https://1943695596114318.mns.cn-hangzhou.aliyuncs.com/";// 阿里通信消息的endpoint,固定。 + private String endpointNameForPop = "cn-hangzhou"; + private String regionIdForPop = "cn-hangzhou"; + private String domainForPop = "dybaseapi.aliyuncs.com"; + private TokenGetterForAlicom tokenGetter; + private MessageListener messageListener; + private boolean isRunning = false; + private Integer pullMsgThreadSize = 1; + private boolean debugLogOpen = false; + private Integer sleepSecondWhenNoData = 30; + + public void openDebugLog(boolean debugLogOpen) { + this.debugLogOpen = debugLogOpen; + } + + public Integer getSleepSecondWhenNoData() { + return sleepSecondWhenNoData; + } + + public void setSleepSecondWhenNoData(Integer sleepSecondWhenNoData) { + this.sleepSecondWhenNoData = sleepSecondWhenNoData; + } + + public Integer getPullMsgThreadSize() { + return pullMsgThreadSize; + } + + public void setPullMsgThreadSize(Integer pullMsgThreadSize) { + if (pullMsgThreadSize != null && pullMsgThreadSize > 1) { + this.pullMsgThreadSize = pullMsgThreadSize; + } + } + + private ExecutorService executorService; + + public ExecutorService getExecutorService() { + return executorService; + } + + public void setExecutorService(ExecutorService executorService) { + this.executorService = executorService; + } + + protected static final Map S_LOCK_OBJ_MAP = new HashMap<>(); + protected static Map sPollingMap = new ConcurrentHashMap<>(); + protected Object lockObj; + + public boolean setPolling(String queueName) { + synchronized (lockObj) { + Boolean ret = sPollingMap.get(queueName); + if (ret == null || !ret) { + sPollingMap.put(queueName, true); + return true; + } + return false; + } + } + + public void clearPolling(String queueName) { + synchronized (lockObj) { + sPollingMap.put(queueName, false); + lockObj.notifyAll(); + if (debugLogOpen) { + log.info("PullMessageTask_WakeUp:Everyone WakeUp and Work!"); + } + } + } + + public boolean isRunning() { + return isRunning; + } + + public void setRunning(boolean running) { + isRunning = running; + } + + private class PullMessageTask implements Runnable { + private String messageType; + private String queueName; + + @Override + public void run() { + + boolean polling = false; + while (isRunning) { + try { + synchronized (lockObj) { + Boolean p = sPollingMap.get(queueName); + if (p != null && p) { + try { + if (debugLogOpen) { + log.info("PullMessageTask_sleep:" + + Thread.currentThread().getName() + + " Have a nice sleep!"); + } + polling = false; + lockObj.wait(); + } + catch (InterruptedException e) { + if (debugLogOpen) { + log.info("PullMessageTask_Interrupted!" + + Thread.currentThread().getName() + + " QueueName is " + queueName); + } + continue; + } + } + } + + TokenForAlicom tokenObject = tokenGetter.getTokenByMessageType( + messageType, queueName, mnsAccountEndpoint); + CloudQueue queue = tokenObject.getQueue(); + Message popMsg = null; + if (!polling) { + popMsg = queue.popMessage(); + if (debugLogOpen) { + SimpleDateFormat format = new SimpleDateFormat( + "yyyy-MM-dd HH:mm:ss"); + log.info("PullMessageTask_popMessage:" + + Thread.currentThread().getName() + "-popDone at " + + "," + format.format(new Date()) + " msgSize=" + + (popMsg == null ? 0 : popMsg.getMessageId())); + } + if (popMsg == null) { + polling = true; + continue; + } + } + else { + if (setPolling(queueName)) { + if (debugLogOpen) { + log.info("PullMessageTask_setPolling:" + + Thread.currentThread().getName() + " Polling!"); + } + } + else { + continue; + } + do { + if (debugLogOpen) { + log.info("PullMessageTask_Keep_Polling" + + Thread.currentThread().getName() + + "KEEP Polling!"); + } + try { + popMsg = queue.popMessage(sleepSecondWhenNoData); + } + catch (ClientException e) { + if (debugLogOpen) { + log.info( + "PullMessageTask_Pop_Message:ClientException Refresh accessKey" + + e); + } + tokenObject = tokenGetter.getTokenByMessageType( + messageType, queueName, mnsAccountEndpoint); + queue = tokenObject.getQueue(); + + } + catch (ServiceException e) { + if (debugLogOpen) { + log.info( + "PullMessageTask_Pop_Message:ServiceException Refresh accessKey" + + e); + } + tokenObject = tokenGetter.getTokenByMessageType( + messageType, queueName, mnsAccountEndpoint); + queue = tokenObject.getQueue(); + + } + catch (Exception e) { + if (debugLogOpen) { + log.info( + "PullMessageTask_Pop_Message:Exception Happened when polling popMessage: " + + e); + } + } + } + while (popMsg == null && isRunning); + clearPolling(queueName); + } + boolean dealResult = messageListener.dealMessage(popMsg); + if (dealResult) { + // remember to delete message when consume message successfully. + if (debugLogOpen) { + log.info("PullMessageTask_Deal_Message:" + + Thread.currentThread().getName() + "deleteMessage " + + popMsg.getMessageId()); + } + queue.deleteMessage(popMsg.getReceiptHandle()); + } + } + catch (ClientException e) { + log.error("PullMessageTask_execute_error,messageType:" + messageType + + ",queueName:" + queueName, e); + break; + + } + catch (ServiceException e) { + if (e.getErrorCode().equals("AccessDenied")) { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName + + ",please check messageType and queueName", e); + } + else { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName, e); + } + break; + + } + catch (com.aliyuncs.exceptions.ClientException e) { + if (e.getErrCode().equals("InvalidAccessKeyId.NotFound")) { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName + + ",please check AccessKeyId", e); + } + if (e.getErrCode().equals("SignatureDoesNotMatch")) { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName + + ",please check AccessKeySecret", e); + } + else { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName, e); + } + break; + + } + catch (Exception e) { + log.error("PullMessageTask_execute_error,messageType:" + messageType + + ",queueName:" + queueName, e); + try { + Thread.sleep(sleepSecondWhenNoData); + } + catch (InterruptedException e1) { + log.error("PullMessageTask_execute_error,messageType:" + + messageType + ",queueName:" + queueName, e); + } + } + } + + } + + } + + /** + * @param accessKeyId accessKeyId + * @param accessKeySecret accessKeySecret + * @param messageType 消息类型 + * @param queueName 队列名称 + * @param messageListener 回调的listener,用户自己实现 + * @throws com.aliyuncs.exceptions.ClientException + * @throws ParseException + */ + public void startReceiveMsg(String accessKeyId, String accessKeySecret, + String messageType, String queueName, MessageListener messageListener) + throws com.aliyuncs.exceptions.ClientException, ParseException { + + tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, + endpointNameForPop, regionIdForPop, domainForPop, null); + + this.messageListener = messageListener; + isRunning = true; + PullMessageTask task = new PullMessageTask(); + task.messageType = messageType; + task.queueName = queueName; + + synchronized (S_LOCK_OBJ_MAP) { + lockObj = S_LOCK_OBJ_MAP.get(queueName); + if (lockObj == null) { + lockObj = new Object(); + S_LOCK_OBJ_MAP.put(queueName, lockObj); + } + } + + if (executorService == null) { + ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( + pullMsgThreadSize, + new BasicThreadFactory.Builder() + .namingPattern( + "PullMessageTask-" + messageType + "-thread-pool-%d") + .daemon(true).build()); + executorService = scheduledExecutorService; + } + for (int i = 0; i < pullMsgThreadSize; i++) { + executorService.execute(task); + } + } + + /** + * @param accessKeyId accessKeyId + * @param accessKeySecret accessKeySecret + * @param messageType 消息类型 + * @param queueName 队列名称 + * @param messageListener 回调的listener,用户自己实现 + * @throws com.aliyuncs.exceptions.ClientException + * @throws ParseException + */ + public void startReceiveMsgForVPC(String accessKeyId, String accessKeySecret, + String messageType, String queueName, String regionIdForPop, + String endpointNameForPop, String domainForPop, String mnsAccountEndpoint, + MessageListener messageListener) + throws com.aliyuncs.exceptions.ClientException, ParseException { + this.mnsAccountEndpoint = mnsAccountEndpoint; + tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, + endpointNameForPop, regionIdForPop, domainForPop, null); + + this.messageListener = messageListener; + isRunning = true; + PullMessageTask task = new PullMessageTask(); + task.messageType = messageType; + task.queueName = queueName; + + synchronized (S_LOCK_OBJ_MAP) { + lockObj = S_LOCK_OBJ_MAP.get(queueName); + if (lockObj == null) { + lockObj = new Object(); + S_LOCK_OBJ_MAP.put(queueName, lockObj); + } + } + + if (executorService == null) { + ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( + pullMsgThreadSize, + new BasicThreadFactory.Builder() + .namingPattern( + "PullMessageTask-" + messageType + "-thread-pool-%d") + .daemon(true).build()); + executorService = scheduledExecutorService; + } + for (int i = 0; i < pullMsgThreadSize; i++) { + executorService.execute(task); + } + } + + /** + * 虚商用户定制接收消息方法 + * @param accessKeyId accessKeyId + * @param accessKeySecret accessKeySecret + * @param ownerId 实际的ownerId + * @param messageType 消息类型 + * @param queueName 队列名称 + * @param messageListener 回调listener + * @throws com.aliyuncs.exceptions.ClientException + * @throws ParseException + */ + public void startReceiveMsgForPartnerUser(String accessKeyId, String accessKeySecret, + Long ownerId, String messageType, String queueName, + MessageListener messageListener) + throws com.aliyuncs.exceptions.ClientException, ParseException { + + tokenGetter = new TokenGetterForAlicom(accessKeyId, accessKeySecret, + endpointNameForPop, regionIdForPop, domainForPop, ownerId); + + this.messageListener = messageListener; + isRunning = true; + PullMessageTask task = new PullMessageTask(); + task.messageType = messageType; + task.queueName = queueName; + + synchronized (S_LOCK_OBJ_MAP) { + lockObj = S_LOCK_OBJ_MAP.get(queueName); + if (lockObj == null) { + lockObj = new Object(); + S_LOCK_OBJ_MAP.put(queueName, lockObj); + } + } + + if (executorService == null) { + ScheduledExecutorService scheduledExecutorService = new ScheduledThreadPoolExecutor( + pullMsgThreadSize, + new BasicThreadFactory.Builder() + .namingPattern( + "PullMessageTask-" + messageType + "-thread-pool-%d") + .daemon(true).build()); + executorService = scheduledExecutorService; + } + for (int i = 0; i < pullMsgThreadSize; i++) { + executorService.execute(task); + } + } + + public void stop() { + isRunning = false; + } + +} diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java similarity index 97% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java index 9921232a6..1fcfbe70e 100755 --- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java +++ b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/MessageListener.java @@ -1,24 +1,24 @@ -/* - * Copyright (C) 2019 the original author or authors. - * - * 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. - */ -package org.springframework.cloud.alicloud.sms.base; - -import com.aliyun.mns.model.Message; - -public interface MessageListener { - - boolean dealMessage(Message message); - -} +/* + * Copyright (C) 2019 the original author or authors. + * + * 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. + */ +package org.springframework.cloud.alicloud.sms.base; + +import com.aliyun.mns.model.Message; + +public interface MessageListener { + + boolean dealMessage(Message message); + +} diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueRequest.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueRequest.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueRequest.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueRequest.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponse.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponse.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponse.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponse.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java similarity index 95% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java index 8af1a63c2..b9bcc3bd6 100755 --- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java +++ b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenForAlicom.java @@ -1,96 +1,96 @@ -/* - * Copyright (C) 2019 the original author or authors. - * - * 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. - */ -package org.springframework.cloud.alicloud.sms.base; - -import com.aliyun.mns.client.CloudQueue; -import com.aliyun.mns.client.MNSClient; - -/** - * 用于接收云通信消息的临时token - * - */ -public class TokenForAlicom { - private String messageType; - private String token; - private Long expireTime; - private String tempAccessKeyId; - private String tempAccessKeySecret; - private MNSClient client; - private CloudQueue queue; - - public String getMessageType() { - return messageType; - } - - public void setMessageType(String messageType) { - this.messageType = messageType; - } - - public String getToken() { - return token; - } - - public void setToken(String token) { - this.token = token; - } - - public Long getExpireTime() { - return expireTime; - } - - public void setExpireTime(Long expireTime) { - this.expireTime = expireTime; - } - - public String getTempAccessKeyId() { - return tempAccessKeyId; - } - - public void setTempAccessKeyId(String tempAccessKeyId) { - this.tempAccessKeyId = tempAccessKeyId; - } - - public String getTempAccessKeySecret() { - return tempAccessKeySecret; - } - - public void setTempAccessKeySecret(String tempAccessKeySecret) { - this.tempAccessKeySecret = tempAccessKeySecret; - } - - public MNSClient getClient() { - return client; - } - - public void setClient(MNSClient client) { - this.client = client; - } - - public CloudQueue getQueue() { - return queue; - } - - public void setQueue(CloudQueue queue) { - this.queue = queue; - } - - public void closeClient() { - if (client != null) { - this.client.close(); - } - } - -} +/* + * Copyright (C) 2019 the original author or authors. + * + * 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. + */ +package org.springframework.cloud.alicloud.sms.base; + +import com.aliyun.mns.client.CloudQueue; +import com.aliyun.mns.client.MNSClient; + +/** + * 用于接收云通信消息的临时token + * + */ +public class TokenForAlicom { + private String messageType; + private String token; + private Long expireTime; + private String tempAccessKeyId; + private String tempAccessKeySecret; + private MNSClient client; + private CloudQueue queue; + + public String getMessageType() { + return messageType; + } + + public void setMessageType(String messageType) { + this.messageType = messageType; + } + + public String getToken() { + return token; + } + + public void setToken(String token) { + this.token = token; + } + + public Long getExpireTime() { + return expireTime; + } + + public void setExpireTime(Long expireTime) { + this.expireTime = expireTime; + } + + public String getTempAccessKeyId() { + return tempAccessKeyId; + } + + public void setTempAccessKeyId(String tempAccessKeyId) { + this.tempAccessKeyId = tempAccessKeyId; + } + + public String getTempAccessKeySecret() { + return tempAccessKeySecret; + } + + public void setTempAccessKeySecret(String tempAccessKeySecret) { + this.tempAccessKeySecret = tempAccessKeySecret; + } + + public MNSClient getClient() { + return client; + } + + public void setClient(MNSClient client) { + this.client = client; + } + + public CloudQueue getQueue() { + return queue; + } + + public void setQueue(CloudQueue queue) { + this.queue = queue; + } + + public void closeClient() { + if (client != null) { + this.client.close(); + } + } + +} diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java similarity index 97% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java index 3daf1c83a..7e48ecc9e 100755 --- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java +++ b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/base/TokenGetterForAlicom.java @@ -1,141 +1,141 @@ -/* - * Copyright (C) 2019 the original author or authors. - * - * 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. - */ -package org.springframework.cloud.alicloud.sms.base; - -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.TimeZone; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import com.aliyun.mns.client.CloudAccount; -import com.aliyun.mns.client.CloudQueue; -import com.aliyun.mns.client.MNSClient; -import com.aliyuncs.DefaultAcsClient; -import com.aliyuncs.IAcsClient; -import com.aliyuncs.exceptions.ClientException; -import com.aliyuncs.exceptions.ServerException; -import com.aliyuncs.http.FormatType; -import com.aliyuncs.http.MethodType; -import com.aliyuncs.http.ProtocolType; -import com.aliyuncs.profile.DefaultProfile; -import com.aliyuncs.profile.IClientProfile; - -/** - * 获取接收云通信消息的临时token - * - */ -public class TokenGetterForAlicom { - private static final Logger log = LoggerFactory.getLogger(TokenGetterForAlicom.class); - private String accessKeyId; - private String accessKeySecret; - private String endpointNameForPop; - private String regionIdForPop; - private String domainForPop; - private IAcsClient iAcsClient; - private Long ownerId; - private final static String PRODUCT_NAME = "Dybaseapi"; - private long bufferTime = 1000 * 60 * 2;// 过期时间小于2分钟则重新获取,防止服务器时间误差 - private final Object lock = new Object(); - private ConcurrentMap tokenMap = new ConcurrentHashMap(); - - public TokenGetterForAlicom(String accessKeyId, String accessKeySecret, - String endpointNameForPop, String regionIdForPop, String domainForPop, - Long ownerId) throws ClientException { - this.accessKeyId = accessKeyId; - this.accessKeySecret = accessKeySecret; - this.endpointNameForPop = endpointNameForPop; - this.regionIdForPop = regionIdForPop; - this.domainForPop = domainForPop; - this.ownerId = ownerId; - init(); - } - - private void init() throws ClientException { - DefaultProfile.addEndpoint(endpointNameForPop, regionIdForPop, PRODUCT_NAME, - domainForPop); - IClientProfile profile = DefaultProfile.getProfile(regionIdForPop, accessKeyId, - accessKeySecret); - profile.getHttpClientConfig().setCompatibleMode(true); - iAcsClient = new DefaultAcsClient(profile); - } - - private TokenForAlicom getTokenFromRemote(String messageType) - throws ServerException, ClientException, ParseException { - SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - df.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); - QueryTokenForMnsQueueRequest request = new QueryTokenForMnsQueueRequest(); - request.setAcceptFormat(FormatType.JSON); - request.setMessageType(messageType); - request.setOwnerId(ownerId); - request.setProtocol(ProtocolType.HTTPS); - request.setMethod(MethodType.POST); - QueryTokenForMnsQueueResponse response = iAcsClient.getAcsResponse(request); - String resultCode = response.getCode(); - if (resultCode != null && "OK".equals(resultCode)) { - QueryTokenForMnsQueueResponse.MessageTokenDTO dto = response - .getMessageTokenDTO(); - TokenForAlicom token = new TokenForAlicom(); - String timeStr = dto.getExpireTime(); - token.setMessageType(messageType); - token.setExpireTime(df.parse(timeStr).getTime()); - token.setToken(dto.getSecurityToken()); - token.setTempAccessKeyId(dto.getAccessKeyId()); - token.setTempAccessKeySecret(dto.getAccessKeySecret()); - return token; - } - else { - log.error("getTokenFromRemote_error,messageType:" + messageType + ",code:" - + response.getCode() + ",message:" + response.getMessage()); - throw new ServerException(response.getCode(), response.getMessage()); - } - } - - public TokenForAlicom getTokenByMessageType(String messageType, String queueName, - String mnsAccountEndpoint) - throws ServerException, ClientException, ParseException { - TokenForAlicom token = tokenMap.get(messageType); - Long now = System.currentTimeMillis(); - if (token == null || (token.getExpireTime() - now) < bufferTime) {// 过期时间小于2分钟则重新获取,防止服务器时间误差 - synchronized (lock) { - token = tokenMap.get(messageType); - if (token == null || (token.getExpireTime() - now) < bufferTime) { - TokenForAlicom oldToken = null; - if (token != null) { - oldToken = token; - } - token = getTokenFromRemote(messageType); - // 因为换token时需要重建client和关闭老的client,所以创建client的代码和创建token放在一起 - CloudAccount account = new CloudAccount(token.getTempAccessKeyId(), - token.getTempAccessKeySecret(), mnsAccountEndpoint, - token.getToken()); - MNSClient client = account.getMNSClient(); - CloudQueue queue = client.getQueueRef(queueName); - token.setClient(client); - token.setQueue(queue); - tokenMap.put(messageType, token); - if (oldToken != null) { - oldToken.closeClient(); - } - } - } - } - return token; - } -} +/* + * Copyright (C) 2019 the original author or authors. + * + * 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. + */ +package org.springframework.cloud.alicloud.sms.base; + +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.TimeZone; +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.ConcurrentMap; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import com.aliyun.mns.client.CloudAccount; +import com.aliyun.mns.client.CloudQueue; +import com.aliyun.mns.client.MNSClient; +import com.aliyuncs.DefaultAcsClient; +import com.aliyuncs.IAcsClient; +import com.aliyuncs.exceptions.ClientException; +import com.aliyuncs.exceptions.ServerException; +import com.aliyuncs.http.FormatType; +import com.aliyuncs.http.MethodType; +import com.aliyuncs.http.ProtocolType; +import com.aliyuncs.profile.DefaultProfile; +import com.aliyuncs.profile.IClientProfile; + +/** + * 获取接收云通信消息的临时token + * + */ +public class TokenGetterForAlicom { + private static final Logger log = LoggerFactory.getLogger(TokenGetterForAlicom.class); + private String accessKeyId; + private String accessKeySecret; + private String endpointNameForPop; + private String regionIdForPop; + private String domainForPop; + private IAcsClient iAcsClient; + private Long ownerId; + private final static String PRODUCT_NAME = "Dybaseapi"; + private long bufferTime = 1000 * 60 * 2;// 过期时间小于2分钟则重新获取,防止服务器时间误差 + private final Object lock = new Object(); + private ConcurrentMap tokenMap = new ConcurrentHashMap(); + + public TokenGetterForAlicom(String accessKeyId, String accessKeySecret, + String endpointNameForPop, String regionIdForPop, String domainForPop, + Long ownerId) throws ClientException { + this.accessKeyId = accessKeyId; + this.accessKeySecret = accessKeySecret; + this.endpointNameForPop = endpointNameForPop; + this.regionIdForPop = regionIdForPop; + this.domainForPop = domainForPop; + this.ownerId = ownerId; + init(); + } + + private void init() throws ClientException { + DefaultProfile.addEndpoint(endpointNameForPop, regionIdForPop, PRODUCT_NAME, + domainForPop); + IClientProfile profile = DefaultProfile.getProfile(regionIdForPop, accessKeyId, + accessKeySecret); + profile.getHttpClientConfig().setCompatibleMode(true); + iAcsClient = new DefaultAcsClient(profile); + } + + private TokenForAlicom getTokenFromRemote(String messageType) + throws ServerException, ClientException, ParseException { + SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + df.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai")); + QueryTokenForMnsQueueRequest request = new QueryTokenForMnsQueueRequest(); + request.setAcceptFormat(FormatType.JSON); + request.setMessageType(messageType); + request.setOwnerId(ownerId); + request.setProtocol(ProtocolType.HTTPS); + request.setMethod(MethodType.POST); + QueryTokenForMnsQueueResponse response = iAcsClient.getAcsResponse(request); + String resultCode = response.getCode(); + if (resultCode != null && "OK".equals(resultCode)) { + QueryTokenForMnsQueueResponse.MessageTokenDTO dto = response + .getMessageTokenDTO(); + TokenForAlicom token = new TokenForAlicom(); + String timeStr = dto.getExpireTime(); + token.setMessageType(messageType); + token.setExpireTime(df.parse(timeStr).getTime()); + token.setToken(dto.getSecurityToken()); + token.setTempAccessKeyId(dto.getAccessKeyId()); + token.setTempAccessKeySecret(dto.getAccessKeySecret()); + return token; + } + else { + log.error("getTokenFromRemote_error,messageType:" + messageType + ",code:" + + response.getCode() + ",message:" + response.getMessage()); + throw new ServerException(response.getCode(), response.getMessage()); + } + } + + public TokenForAlicom getTokenByMessageType(String messageType, String queueName, + String mnsAccountEndpoint) + throws ServerException, ClientException, ParseException { + TokenForAlicom token = tokenMap.get(messageType); + Long now = System.currentTimeMillis(); + if (token == null || (token.getExpireTime() - now) < bufferTime) {// 过期时间小于2分钟则重新获取,防止服务器时间误差 + synchronized (lock) { + token = tokenMap.get(messageType); + if (token == null || (token.getExpireTime() - now) < bufferTime) { + TokenForAlicom oldToken = null; + if (token != null) { + oldToken = token; + } + token = getTokenFromRemote(messageType); + // 因为换token时需要重建client和关闭老的client,所以创建client的代码和创建token放在一起 + CloudAccount account = new CloudAccount(token.getTempAccessKeyId(), + token.getTempAccessKeySecret(), mnsAccountEndpoint, + token.getToken()); + MNSClient client = account.getMNSClient(); + CloudQueue queue = client.getQueueRef(queueName); + token.setClient(client); + token.setQueue(queue); + tokenMap.put(messageType, token); + if (oldToken != null) { + oldToken.closeClient(); + } + } + } + } + return token; + } +} diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/EndpointManager.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/EndpointManager.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/EndpointManager.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/EndpointManager.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/ReceiveMessageEntity.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/ReceiveMessageEntity.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/ReceiveMessageEntity.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/ReceiveMessageEntity.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpoint.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpoint.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpoint.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpoint.java diff --git a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java b/alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java rename to alicloud-sms-spring-cloud/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java diff --git a/spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories b/alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories rename to alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml b/alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml similarity index 61% rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml rename to alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml index ce6c184d3..18612abff 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml +++ b/alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alicloud + com.alibaba.cloud + alicloud-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud-acm + alicloud-acm-spring-cloud-starter Spring Cloud Starter Alibaba Cloud ACM - org.springframework.cloud - spring-cloud-alicloud-acm + com.alibaba.cloud + alicloud-acm-spring-cloud diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml b/alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml similarity index 62% rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml rename to alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml index 4a1ef4a52..e80a48287 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-ans/pom.xml +++ b/alicloud-spring-cloud-starter/alicloud-ans-spring-cloud-starter/pom.xml @@ -3,18 +3,18 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.cloud - spring-cloud-starter-alicloud + com.alibaba.cloud + alicloud-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud-ans + alicloud-ans-spring-cloud-starter Spring Cloud Starter Alibaba Cloud ANS - org.springframework.cloud - spring-cloud-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml b/alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml similarity index 67% rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml rename to alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml index bfafb63f5..42031a85a 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-oss/pom.xml +++ b/alicloud-spring-cloud-starter/alicloud-oss-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alicloud + com.alibaba.cloud + alicloud-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud-oss + alicloud-oss-spring-cloud-starter Spring Cloud Starter Alibaba Cloud OSS - org.springframework.cloud - spring-cloud-alicloud-oss + com.alibaba.cloud + alicloud-oss-spring-cloud com.aliyun.oss diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml b/alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml similarity index 62% rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml rename to alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml index 1946da3ca..89f160a06 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-schedulerx/pom.xml +++ b/alicloud-spring-cloud-starter/alicloud-schedulerx-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alicloud + com.alibaba.cloud + alicloud-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud-schedulerx + alicloud-schedulerx-spring-cloud-starter Spring Cloud Starter Alibaba Cloud SchedulerX - org.springframework.cloud - spring-cloud-alicloud-schedulerx + com.alibaba.cloud + alicloud-schedulerx-spring-cloud diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml b/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml similarity index 61% rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml rename to alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml index 5e32b2872..fdd00dfad 100644 --- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml +++ b/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml @@ -3,17 +3,17 @@ 4.0.0 - org.springframework.cloud - spring-cloud-starter-alicloud + com.alibaba.cloud + alicloud-spring-cloud-starter 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud-sms + alicloud-sms-spring-cloud-starter Spring Cloud Starter Alibaba Cloud SMS - org.springframework.cloud - spring-cloud-alicloud-sms + com.alibaba.cloud + alicloud-sms-spring-cloud diff --git a/spring-cloud-starter-alicloud/pom.xml b/alicloud-spring-cloud-starter/pom.xml similarity index 57% rename from spring-cloud-starter-alicloud/pom.xml rename to alicloud-spring-cloud-starter/pom.xml index 7c37b5806..9c31d3402 100644 --- a/spring-cloud-starter-alicloud/pom.xml +++ b/alicloud-spring-cloud-starter/pom.xml @@ -2,19 +2,19 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT - spring-cloud-starter-alicloud + alicloud-spring-cloud-starter pom Spring Cloud Alibaba Cloud Starters Spring Cloud Alibaba Cloud Starters - spring-cloud-starter-alicloud-oss - spring-cloud-starter-alicloud-acm - spring-cloud-starter-alicloud-ans - spring-cloud-starter-alicloud-schedulerx - spring-cloud-starter-alicloud-sms + alicloud-oss-spring-cloud-starter + alicloud-acm-spring-cloud-starter + alicloud-ans-spring-cloud-starter + alicloud-schedulerx-spring-cloud-starter + alicloud-sms-spring-cloud-starter \ No newline at end of file diff --git a/pom.xml b/pom.xml index 18171ac54..8e2110f94 100644 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,7 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT pom @@ -90,28 +90,28 @@ - spring-cloud-alibaba-dependencies - spring-cloud-alibaba-sentinel - spring-cloud-alibaba-sentinel-datasource - spring-cloud-alibaba-sentinel-gateway - spring-cloud-alibaba-nacos-config - spring-cloud-alibaba-nacos-discovery - spring-cloud-alibaba-seata - spring-cloud-stream-binder-rocketmq - spring-cloud-alibaba-nacos-config-server - spring-cloud-alibaba-dubbo - spring-cloud-alicloud-context + alibaba-spring-cloud-dependencies + alibaba-sentinel-spring-cloud + alibaba-sentinel-datasource-spring-cloud + alibaba-sentinel-gateway-spring-cloud + alibaba-nacos-config-spring-cloud + alibaba-nacos-discovery-spring-cloud + alibaba-seata-spring-cloud + rocketmq-spring-cloud-stream-binder + alibaba-nacos-config-server-spring-cloud + alibaba-dubbo-spring-cloud + alicloud-context-spring-cloud spring-cloud-alibaba-examples - spring-cloud-alibaba-test - spring-cloud-alibaba-docs - spring-cloud-starter-alibaba - spring-cloud-starter-alicloud - spring-cloud-alicloud-oss - spring-cloud-alicloud-acm - spring-cloud-alicloud-ans - spring-cloud-alicloud-schedulerx - spring-cloud-alicloud-sms - spring-cloud-alibaba-coverage + alibaba-test-spring-cloud + alibaba-docs-spring-cloud + alibaba-spring-cloud-starter + alicloud-spring-cloud-starter + alicloud-oss-spring-cloud + alicloud-acm-spring-cloud + alicloud-ans-spring-cloud + alicloud-schedulerx-spring-cloud + alicloud-sms-spring-cloud + alibaba-coverage-spring-cloud @@ -127,8 +127,8 @@ - org.springframework.cloud - spring-cloud-alibaba-dependencies + com.alibaba.cloud + alibaba-spring-cloud-dependencies ${project.version} pom import diff --git a/spring-cloud-stream-binder-rocketmq/pom.xml b/rocketmq-spring-cloud-stream-binder/pom.xml similarity index 94% rename from spring-cloud-stream-binder-rocketmq/pom.xml rename to rocketmq-spring-cloud-stream-binder/pom.xml index cbdc62f0a..8d1afed63 100644 --- a/spring-cloud-stream-binder-rocketmq/pom.xml +++ b/rocketmq-spring-cloud-stream-binder/pom.xml @@ -3,15 +3,15 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud - spring-cloud-stream-binder-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-stream-binder Spring Cloud Alibaba RocketMQ Binder diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/Instrumentation.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/Instrumentation.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/Instrumentation.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/Instrumentation.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java b/rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/java/org/springframework/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java rename to rocketmq-spring-cloud-stream-binder/src/main/java/org/springframework/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java diff --git a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders rename to rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders diff --git a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories rename to rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-stream-binder-rocketmq/src/test/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java b/rocketmq-spring-cloud-stream-binder/src/test/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java similarity index 100% rename from spring-cloud-stream-binder-rocketmq/src/test/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java rename to rocketmq-spring-cloud-stream-binder/src/test/java/org/springframework/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml index 9d6fd2155..2d656938d 100644 --- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml +++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alicloud-acm + com.alibaba.cloud + alicloud-acm-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml index 196dfabaa..71ddd1754 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud-starter org.springframework.cloud diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml index a979ca4ba..ee90de175 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml index 2cc604f1b..d4ba010d9 100644 --- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alicloud-ans + com.alibaba.cloud + alicloud-ans-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml index ca72deb5a..4a7f96efc 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -22,8 +22,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-config + com.alibaba.cloud + alibaba-nacos-config-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml index d340f6fff..769342d0e 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud nacos-discovery-example 0.9.1.BUILD-SNAPSHOT @@ -21,8 +21,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter @@ -41,8 +41,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml index 18304be86..2fd7861b1 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud nacos-discovery-example 0.9.1.BUILD-SNAPSHOT @@ -21,8 +21,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml index d51c58fb5..d7834ef63 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud nacos-discovery-example 0.9.1.BUILD-SNAPSHOT @@ -21,8 +21,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml index 6f27e67a1..dce71884c 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml index 18e54636a..c460e966a 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud nacos-gateway-example 0.9.1.BUILD-SNAPSHOT @@ -22,8 +22,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml index 2a675eea2..03701a4db 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud nacos-gateway-example 0.9.1.BUILD-SNAPSHOT @@ -21,8 +21,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml index 1e7a1d6eb..0a4eae609 100644 --- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml diff --git a/spring-cloud-alibaba-examples/oss-example/pom.xml b/spring-cloud-alibaba-examples/oss-example/pom.xml index ef9c417ce..bb10248b6 100644 --- a/spring-cloud-alibaba-examples/oss-example/pom.xml +++ b/spring-cloud-alibaba-examples/oss-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT @@ -21,8 +21,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alicloud-oss + com.alibaba.cloud + alicloud-oss-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml index addee644b..0add94539 100644 --- a/spring-cloud-alibaba-examples/pom.xml +++ b/spring-cloud-alibaba-examples/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba 0.9.1.BUILD-SNAPSHOT ../pom.xml diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml index afcd0911f..e11c21999 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -18,8 +18,8 @@ - org.springframework.cloud - spring-cloud-starter-stream-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-stream diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml index 9a9603c2b..547574149 100644 --- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml +++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -18,8 +18,8 @@ - org.springframework.cloud - spring-cloud-starter-stream-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-stream diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml index 12bf1277c..89d5f6f93 100644 --- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml +++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alicloud-schedulerx + com.alibaba.cloud + alicloud-schedulerx-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml index 10b621c93..3939427bb 100644 --- a/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/account-service/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml index 683ace061..165e8d9d3 100644 --- a/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/business-service/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud-starter org.springframework.cloud @@ -33,8 +33,8 @@ spring-boot-starter-actuator - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml index a42da6375..baee8a37a 100644 --- a/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/order-service/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml index 4e85a8265..0ae44a059 100644 --- a/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml +++ b/spring-cloud-alibaba-examples/seata-example/storage-service/pom.xml @@ -4,7 +4,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -13,8 +13,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-seata + com.alibaba.cloud + alibaba-seata-spring-cloud-starter org.springframework.boot diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml index 76afa6d90..cd802d1c9 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -18,8 +18,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml index 6c7465f01..fe786d28f 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../../pom.xml diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml index 0ce671276..9f63b8681 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../../pom.xml @@ -18,12 +18,12 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter - org.springframework.cloud + com.alibaba.cloud sentinel-dubbo-api diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml index fbba495e1..6e9792f9c 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../../pom.xml @@ -18,12 +18,12 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter - org.springframework.cloud + com.alibaba.cloud sentinel-dubbo-api diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml index e2979eb10..e7a264e75 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -19,8 +19,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter @@ -39,8 +39,8 @@ - org.springframework.cloud - spring-cloud-alibaba-sentinel-gateway + com.alibaba.cloud + alibaba-sentinel-gateway-spring-cloud diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml index c3b4f17c4..a69ba6cc8 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -19,8 +19,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml index 0f0b0c092..d1d62c855 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/pom.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-examples 0.9.1.BUILD-SNAPSHOT ../../pom.xml @@ -19,8 +19,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-sentinel + com.alibaba.cloud + alibaba-sentinel-spring-cloud-starter @@ -39,8 +39,8 @@ - org.springframework.cloud - spring-cloud-alibaba-sentinel-gateway + com.alibaba.cloud + alibaba-sentinel-gateway-spring-cloud diff --git a/spring-cloud-alibaba-examples/sms-example/pom.xml b/spring-cloud-alibaba-examples/sms-example/pom.xml index 9d5672146..bd32a7040 100644 --- a/spring-cloud-alibaba-examples/sms-example/pom.xml +++ b/spring-cloud-alibaba-examples/sms-example/pom.xml @@ -9,7 +9,7 @@ spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../pom.xml @@ -31,8 +31,8 @@ spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-alicloud-sms + com.alibaba.cloud + alicloud-sms-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index ee9f0d128..0882926d7 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -5,12 +5,12 @@ org.springframework.cloud spring-cloud-build - 2.1.3.RELEASE + 2.1.6.RELEASE 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT Spring Cloud Alibaba Dubbo Examples @@ -49,8 +49,8 @@ - org.springframework.cloud - spring-cloud-alibaba-dependencies + com.alibaba.cloud + alibaba-spring-cloud-dependencies ${project.version} pom import diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml index 1247cc082..c5f16cb74 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 2.1.3.RELEASE + 2.1.6.RELEASE 4.0.0 @@ -30,7 +30,7 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml index 49cc54410..693d6478d 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-consumer-sample Spring Cloud Dubbo Consumer Sample @@ -40,23 +40,23 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java index 0fb732983..d8394a07b 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java @@ -20,6 +20,7 @@ import org.apache.dubbo.config.annotation.Reference; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; +import org.springframework.boot.ApplicationArguments; import org.springframework.boot.ApplicationRunner; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.builder.SpringApplicationBuilder; @@ -124,44 +125,50 @@ public class DubboSpringCloudConsumerBootstrap { @Bean public ApplicationRunner userServiceRunner() { - return arguments -> { + return new ApplicationRunner() { + @Override + public void run(ApplicationArguments arguments) throws Exception { - User user = new User(); - user.setId(1L); - user.setName("小马哥"); - user.setAge(33); + User user = new User(); + user.setId(1L); + user.setName("小马哥"); + user.setAge(33); - // save User - System.out.printf("UserService.save(%s) : %s\n", user, userService.save(user)); + // save User + System.out.printf("UserService.save(%s) : %s\n", user, userService.save(user)); - // find all Users - System.out.printf("UserService.findAll() : %s\n", user, userService.findAll()); + // find all Users + System.out.printf("UserService.findAll() : %s\n", user, userService.findAll()); - // remove User - System.out.printf("UserService.remove(%d) : %s\n", user.getId(), userService.remove(user.getId())); + // remove User + System.out.printf("UserService.remove(%d) : %s\n", user.getId(), userService.remove(user.getId())); + } }; } @Bean public ApplicationRunner callRunner() { - return arguments -> { + return new ApplicationRunner() { + @Override + public void run(ApplicationArguments arguments) throws Exception { - // To call /path-variables - callPathVariables(); + // To call /path-variables + DubboSpringCloudConsumerBootstrap.this.callPathVariables(); - // To call /headers - callHeaders(); + // To call /headers + DubboSpringCloudConsumerBootstrap.this.callHeaders(); - // To call /param - callParam(); + // To call /param + DubboSpringCloudConsumerBootstrap.this.callParam(); - // To call /params - callParams(); + // To call /params + DubboSpringCloudConsumerBootstrap.this.callParams(); - // To call /request/body/map - callRequestBodyMap(); + // To call /request/body/map + DubboSpringCloudConsumerBootstrap.this.callRequestBodyMap(); + } }; } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml index 3672b591e..dec005027 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-provider-sample Spring Cloud Dubbo Provider Sample @@ -37,23 +37,23 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml index c4615e732..f922fe858 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml @@ -3,14 +3,14 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> - org.springframework.cloud + com.alibaba.cloud spring-cloud-alibaba-dubbo-examples 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-provider-web-sample Spring Cloud Dubbo Provider Web Sample @@ -29,15 +29,15 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter @@ -45,8 +45,8 @@ - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml index 146bb2621..032c96355 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-dubbo-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api Spring Cloud Dubbo Sample API diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml index 5ab588fd1..7146e3db8 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml @@ -5,7 +5,7 @@ org.springframework.cloud spring-cloud-build - 2.1.3.RELEASE + 2.1.6.RELEASE @@ -32,7 +32,7 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml index ac58a8140..d0284e9a2 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-dubbo-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-servlet-gateway-sample Spring Cloud Dubbo Servlet Gateway Sample @@ -23,21 +23,21 @@ - org.springframework.cloud + com.alibaba.cloud spring-cloud-dubbo-sample-api ${project.version} - org.springframework.cloud - spring-cloud-starter-dubbo + com.alibaba.cloud + dubbo-spring-cloud-starter - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery + com.alibaba.cloud + alibaba-nacos-discovery-spring-cloud-starter diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml index 6ecb7cf21..3605a0e73 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml @@ -4,13 +4,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> spring-cloud-alibaba-examples - org.springframework.cloud + com.alibaba.cloud 0.9.1.BUILD-SNAPSHOT ../pom.xml 4.0.0 - org.springframework.cloud + com.alibaba.cloud spring-cloud-bus-rocketmq-example Spring Cloud Bus RocketMQ Example @@ -18,8 +18,8 @@ - org.springframework.cloud - spring-cloud-starter-bus-rocketmq + com.alibaba.cloud + rocketmq-spring-cloud-starter-bus