From e0714591cf0d22f88c3d1389b95b2adc71dfbe35 Mon Sep 17 00:00:00 2001 From: flystar32 Date: Thu, 6 Sep 2018 15:55:24 +0800 Subject: [PATCH] refactor directory tree --- README.md | 6 ++--- pom.xml | 7 +++--- spring-cloud-alibaba-dependencies/pom.xml | 25 +++++++++++-------- .../sentinel-dubbo-consumer-example/pom.xml | 2 +- .../readme-zh.md | 2 +- .../sentinel-dubbo-consumer-example/readme.md | 4 +-- .../sentinel-dubbo-provider-example/pom.xml | 4 +-- .../readme-zh.md | 2 +- .../sentinel-dubbo-provider-example/readme.md | 4 +-- .../sentinel-example/pom.xml | 11 ++++---- .../sentinel-example/readme-zh.md | 2 +- .../sentinel-example/readme.md | 4 +-- .../storage-example/pom.xml | 2 +- .../storage-example/readme-zh.md | 4 +-- .../storage-example/readme.md | 4 +-- .../pom.xml | 4 +-- .../alibaba/sentinel/SentinelConstants.java | 0 .../alibaba/sentinel/SentinelProperties.java | 0 .../SentinelWebAutoConfiguration.java | 0 .../annotation/SentinelDataSource.java | 0 .../sentinel/annotation/SentinelProtect.java | 0 .../sentinel/custom/BlockClassRegistry.java | 0 .../custom/SentinelAutoConfiguration.java | 0 .../custom/SentinelBeanPostProcessor.java | 0 .../custom/SentinelProtectInterceptor.java | 0 .../sentinel/datasource/DataSourceLoader.java | 0 .../SentinelDataSourcePostProcessor.java | 0 .../SentinelDataSourceRegistry.java | 0 .../ApolloDataSourceFactoryBean.java | 0 .../FileRefreshableDataSourceFactoryBean.java | 0 .../NacosDataSourceFactoryBean.java | 0 .../ZookeeperDataSourceFactoryBean.java | 0 .../sentinel/endpoint/SentinelEndpoint.java | 0 .../SentinelEndpointAutoConfiguration.java | 0 .../sentinel/util/PropertySourcesUtils.java | 0 ...itional-spring-configuration-metadata.json | 0 .../META-INF/sentinel-datasource.properties | 0 .../main/resources/META-INF/spring.factories | 0 .../SentinelAutoConfigurationTests.java | 0 .../pom.xml | 2 +- .../storage/OSSApplicationListener.java | 0 .../alibaba/storage/OSSAutoConfiguration.java | 0 .../cloud/alibaba/storage/OSSConstants.java | 0 .../cloud/alibaba/storage/OSSProperties.java | 0 .../alibaba/storage/endpoint/OSSEndpoint.java | 0 .../OSSEndpointAutoConfiguration.java | 0 .../resource/OSSStorageProtocolResolver.java | 0 .../storage/resource/OSSStorageResource.java | 0 .../main/resources/META-INF/spring.factories | 0 .../test/OSSAutoConfigurationTests.java | 0 .../OSSMultiClientAutoConfigurationTests.java | 0 spring-cloud-starter-alibaba/pom.xml | 18 +++++++++++++ .../pom.xml | 4 +-- .../pom.xml | 6 ++--- 54 files changed, 68 insertions(+), 49 deletions(-) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/pom.xml (96%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelDataSource.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelProtect.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceRegistry.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/java/org/springframework/cloud/alibaba/sentinel/util/PropertySourcesUtils.java (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/resources/META-INF/additional-spring-configuration-metadata.json (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/resources/META-INF/sentinel-datasource.properties (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/main/resources/META-INF/spring.factories (100%) rename {spring-cloud-alibaba-sentinel-autoconfigure => spring-cloud-alibaba-sentinel}/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/pom.xml (96%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/main/resources/META-INF/spring.factories (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java (100%) rename {spring-cloud-alibaba-storage-autoconfigure => spring-cloud-alibaba-storage}/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java (100%) create mode 100644 spring-cloud-starter-alibaba/pom.xml rename {spring-cloud-starter-sentinel => spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel}/pom.xml (88%) rename {spring-cloud-starter-storage => spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage}/pom.xml (79%) diff --git a/README.md b/README.md index f37bbea40..050bc9444 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Spring Cloud Alibaba -See the [中文文档](https://github.com/spring-cloud-incubator/spring-cloud-alibabacloud/blob/master/README-zh.md) for Chinese readme. +See the [中文文档](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/README-zh.md) for Chinese readme. Spring Cloud Alibaba provides a one-stop solution for distributed application development. It contains all the components required to develop distributed applications, making it easy for you to develop your applications using Spring Cloud. @@ -11,13 +11,13 @@ With Spring Cloud Alibaba，you only need to add some annotations and a small am * **Flow control and service degradation**：Flow control for HTTP services is supported by default. You can also customize flow control and service degradation rules using annotations. The rules can be changed dynamically. -For more features, please refer to [Roadmap](https://github.com/spring-cloud-incubator/spring-cloud-alibabacloud/blob/master/Roadmap.md). +For more features, please refer to [Roadmap](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/Roadmap.md). ## Components **[Sentinel](https://github.com/alibaba/Sentinel)**: Sentinel takes "traffic flow" as the breakthrough point, and provides solutions in areas such as flow control, concurrency, circuit breaking, and load protection to protect service stability. -For more features please refer to [Roadmap](https://github.com/spring-cloud-incubator/spring-cloud-alibabacloud/blob/master/Roadmap.md). +For more features please refer to [Roadmap](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/Roadmap.md). ## How to build diff --git a/pom.xml b/pom.xml index a08b291e2..986518cbd 100644 --- a/pom.xml +++ b/pom.xml @@ -72,12 +72,11 @@ spring-cloud-alibaba-dependencies - spring-cloud-alibaba-sentinel-autoconfigure - spring-cloud-starter-sentinel - spring-cloud-alibaba-storage-autoconfigure - spring-cloud-starter-storage + spring-cloud-alibaba-sentinel + spring-cloud-alibaba-storage spring-cloud-alibaba-examples spring-cloud-alibaba-test + spring-cloud-starter-alibaba diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml index e7bcdbfdc..2b33e4fd8 100644 --- a/spring-cloud-alibaba-dependencies/pom.xml +++ b/spring-cloud-alibaba-dependencies/pom.xml @@ -22,6 +22,8 @@ + + com.alibaba.csp sentinel-core @@ -67,6 +69,14 @@ sentinel-dubbo-adapter ${sentinel.version} + + org.springframework.cloud + sentinel-dubbo-api + ${project.version} + + + + com.aliyun.oss aliyun-sdk-oss @@ -77,33 +87,28 @@ org.springframework.cloud - spring-cloud-alibaba-sentinel-autoconfigure + spring-cloud-alibaba-sentinel ${project.version} org.springframework.cloud - spring-cloud-alibaba-storage-autoconfigure + spring-cloud-alibaba-storage ${project.version} org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel ${project.version} org.springframework.cloud - spring-cloud-starter-storage + spring-cloud-starter-alibaba-storage ${project.version} - - - org.springframework.cloud - sentinel-dubbo-api - ${project.version} - + diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml index 2757c1237..ca3a2538c 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml @@ -18,7 +18,7 @@ org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme-zh.md index b2a27e83c..21ed3b14b 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme-zh.md @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme.md b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme.md index 42bd4561c..6ce6122af 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme.md @@ -17,11 +17,11 @@ This example focus on the integration of Sentinel and Dubbo. You can see more fe Before we start the demo, let's learn how to connect Sentinel with Dubbo to a Spring Cloud application. **Note: This section is to show you how to connect to Sentinel. The configurations have been completed in the following example, so you don't need modify the code any more.** -1. Add dependency spring-cloud-starter-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project. +1. Add dependency spring-cloud-starter-alibaba-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project. org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml index 1ffda73c3..f1a0a832c 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml @@ -18,9 +18,8 @@ org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel - org.springframework.cloud sentinel-dubbo-api @@ -31,7 +30,6 @@ dubbo-spring-boot-starter 0.2.0 - diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme-zh.md index 866885fd7..fa8cb389a 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme-zh.md @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme.md b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme.md index 885296f4c..66234b61b 100644 --- a/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme.md @@ -17,11 +17,11 @@ This example focus on the integration of Sentinel and Dubbo. You can see more fe Before we start the demo, let's learn how to connect Sentinel with Dubbo to a Spring Cloud application. **Note: This section is to show you how to connect to Sentinel. The configurations have been completed in the following example, so you don't need modify the code any more.** -1. Add dependency spring-cloud-starter-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project. +1. Add dependency spring-cloud-starter-alibaba-sentinel and dubbo-spring-boot-starter in the pom.xml file in your Spring Cloud project. org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel diff --git a/spring-cloud-alibaba-examples/sentinel-example/pom.xml b/spring-cloud-alibaba-examples/sentinel-example/pom.xml index 6da7873c5..97bed58b8 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/pom.xml +++ b/spring-cloud-alibaba-examples/sentinel-example/pom.xml @@ -16,20 +16,19 @@ - - org.springframework.boot - spring-boot-starter-web - org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel + + org.springframework.boot + spring-boot-starter-web + org.springframework.boot spring-boot-starter-actuator - diff --git a/spring-cloud-alibaba-examples/sentinel-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-example/readme-zh.md index 4ae6cfaad..c849d51fc 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/sentinel-example/readme-zh.md @@ -17,7 +17,7 @@ org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel 2. 接入限流埋点 diff --git a/spring-cloud-alibaba-examples/sentinel-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/readme.md index 85a44863e..6f3b4bd8b 100644 --- a/spring-cloud-alibaba-examples/sentinel-example/readme.md +++ b/spring-cloud-alibaba-examples/sentinel-example/readme.md @@ -12,11 +12,11 @@ This example illustrates how to use Sentinel starter to implement flow control f Before we start the demo, let's learn how to connect Sentinel to a Spring Cloud application. **Note: This section is to show you how to connect to Sentinel. The configurations have been completed in the following example, so you don't need modify the code any more.** -1. Add dependency spring-cloud-starter-sentinel in the pom.xml file in your Spring Cloud project. +1. Add dependency spring-cloud-starter-alibaba-sentinel in the pom.xml file in your Spring Cloud project. org.springframework.cloud - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel 2. Define Resources diff --git a/spring-cloud-alibaba-examples/storage-example/pom.xml b/spring-cloud-alibaba-examples/storage-example/pom.xml index aa80b7e07..98065cf4a 100644 --- a/spring-cloud-alibaba-examples/storage-example/pom.xml +++ b/spring-cloud-alibaba-examples/storage-example/pom.xml @@ -22,7 +22,7 @@ org.springframework.cloud - spring-cloud-starter-storage + spring-cloud-starter-alibaba-storage diff --git a/spring-cloud-alibaba-examples/storage-example/readme-zh.md b/spring-cloud-alibaba-examples/storage-example/readme-zh.md index ed6d7e20a..40652e795 100644 --- a/spring-cloud-alibaba-examples/storage-example/readme-zh.md +++ b/spring-cloud-alibaba-examples/storage-example/readme-zh.md @@ -13,11 +13,11 @@ **注意：本节只是为了便于您理解接入方式，本示例代码中已经完成接入工作，您只需修改 accessKeyId、secretAccessKey、region 即可。** -1. 修改 pom.xml 文件，引入 OSS starter。 +1. 修改 pom.xml 文件，引入 alibaba-storage starter。 org.springframework.cloud - spring-cloud-starter-oss + spring-cloud-starter-alibaba-storage 2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。 diff --git a/spring-cloud-alibaba-examples/storage-example/readme.md b/spring-cloud-alibaba-examples/storage-example/readme.md index 3beae3239..45fa51b97 100644 --- a/spring-cloud-alibaba-examples/storage-example/readme.md +++ b/spring-cloud-alibaba-examples/storage-example/readme.md @@ -13,11 +13,11 @@ If your applications are Spring Cloud applications and you need to use Alibaba C Before we start the demo, let's learn how to connect OSS to a Spring Cloud application. **Note: This section is to show you how to connect to oss. The actual configurations have been completed in the following example, and you only need to specify your accessKeyId, secretAccessKey and region.** -1. Add dependency spring-cloud-starter-oss in the pom.xml file in your Spring Cloud project. +1. Add dependency spring-cloud-starter-alibaba-storage in the pom.xml file in your Spring Cloud project. org.springframework.cloud - spring-cloud-starter-oss + spring-cloud-starter-alibaba-storage 2. Configure accessKeyId, secretAccessKey and region in application.properties. diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/pom.xml b/spring-cloud-alibaba-sentinel/pom.xml similarity index 96% rename from spring-cloud-alibaba-sentinel-autoconfigure/pom.xml rename to spring-cloud-alibaba-sentinel/pom.xml index 486d320e6..1ac5ef319 100644 --- a/spring-cloud-alibaba-sentinel-autoconfigure/pom.xml +++ b/spring-cloud-alibaba-sentinel/pom.xml @@ -10,8 +10,8 @@ 4.0.0 org.springframework.cloud - spring-cloud-alibaba-sentinel-autoconfigure - Spring Cloud Alibaba Sentinel Autoconfigure + spring-cloud-alibaba-sentinel + Spring Cloud Alibaba Sentinel diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelDataSource.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelDataSource.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelDataSource.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelDataSource.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelProtect.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelProtect.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelProtect.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelProtect.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/DataSourceLoader.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourcePostProcessor.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceRegistry.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceRegistry.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceRegistry.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceRegistry.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/util/PropertySourcesUtils.java b/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/util/PropertySourcesUtils.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/java/org/springframework/cloud/alibaba/sentinel/util/PropertySourcesUtils.java rename to spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/util/PropertySourcesUtils.java diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json rename to spring-cloud-alibaba-sentinel/src/main/resources/META-INF/additional-spring-configuration-metadata.json diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/sentinel-datasource.properties b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/sentinel-datasource.properties similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/sentinel-datasource.properties rename to spring-cloud-alibaba-sentinel/src/main/resources/META-INF/sentinel-datasource.properties diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-sentinel-autoconfigure/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java b/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-sentinel-autoconfigure/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java rename to spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/pom.xml b/spring-cloud-alibaba-storage/pom.xml similarity index 96% rename from spring-cloud-alibaba-storage-autoconfigure/pom.xml rename to spring-cloud-alibaba-storage/pom.xml index b40e4286d..29bb54ae5 100644 --- a/spring-cloud-alibaba-storage-autoconfigure/pom.xml +++ b/spring-cloud-alibaba-storage/pom.xml @@ -10,7 +10,7 @@ 4.0.0 org.springframework.cloud - spring-cloud-alibaba-storage-autoconfigure + spring-cloud-alibaba-storage Spring Cloud Alibaba Storage Autoconfigure diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSApplicationListener.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSAutoConfiguration.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSConstants.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/OSSProperties.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpoint.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/endpoint/OSSEndpointAutoConfiguration.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageProtocolResolver.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java b/spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java rename to spring-cloud-alibaba-storage/src/main/java/org/springframework/cloud/alibaba/storage/resource/OSSStorageResource.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-storage/src/main/resources/META-INF/spring.factories similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/main/resources/META-INF/spring.factories rename to spring-cloud-alibaba-storage/src/main/resources/META-INF/spring.factories diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java b/spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java rename to spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSAutoConfigurationTests.java diff --git a/spring-cloud-alibaba-storage-autoconfigure/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java b/spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java similarity index 100% rename from spring-cloud-alibaba-storage-autoconfigure/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java rename to spring-cloud-alibaba-storage/src/test/java/org/springframework/cloud/alibaba/storage/test/OSSMultiClientAutoConfigurationTests.java diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml new file mode 100644 index 000000000..8adbbb7e7 --- /dev/null +++ b/spring-cloud-starter-alibaba/pom.xml @@ -0,0 +1,18 @@ + + 4.0.0 + + org.springframework.cloud + spring-cloud-alibaba + 0.2.0.BUILD-SNAPSHOT + .. + + spring-cloud-starter-alibaba + pom + Spring Cloud Alibaba Starters + Spring Cloud Alibaba Starters + + spring-cloud-starter-alibaba-sentinel + spring-cloud-starter-alibaba-storage + + \ No newline at end of file diff --git a/spring-cloud-starter-sentinel/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml similarity index 88% rename from spring-cloud-starter-sentinel/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml index 5399ff130..e421c4efc 100644 --- a/spring-cloud-starter-sentinel/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml @@ -7,13 +7,13 @@ spring-cloud-alibaba 0.2.0.BUILD-SNAPSHOT - spring-cloud-starter-sentinel + spring-cloud-starter-alibaba-sentinel Spring Cloud Starter Sentinel org.springframework.cloud - spring-cloud-alibaba-sentinel-autoconfigure + spring-cloud-alibaba-sentinel com.alibaba.csp diff --git a/spring-cloud-starter-storage/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml similarity index 79% rename from spring-cloud-starter-storage/pom.xml rename to spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml index 5d17ae4c2..ae2569431 100644 --- a/spring-cloud-starter-storage/pom.xml +++ b/spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml @@ -7,13 +7,13 @@ spring-cloud-alibaba 0.2.0.BUILD-SNAPSHOT - spring-cloud-starter-storage - Spring Cloud Starter Storage + spring-cloud-starter-alibaba-storage + Spring Cloud Starter Alibaba Storage org.springframework.cloud - spring-cloud-alibaba-storage-autoconfigure + spring-cloud-alibaba-storage com.aliyun.oss