refactor directory tree

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
 

pom.xml

@@ -72,12 +72,11 @@
 
     <modules>
         <module>spring-cloud-alibaba-dependencies</module>
-        <module>spring-cloud-alibaba-sentinel-autoconfigure</module>
+        <module>spring-cloud-alibaba-sentinel</module>
-        <module>spring-cloud-starter-sentinel</module>
+        <module>spring-cloud-alibaba-storage</module>
-        <module>spring-cloud-alibaba-storage-autoconfigure</module>
-        <module>spring-cloud-starter-storage</module>
         <module>spring-cloud-alibaba-examples</module>
         <module>spring-cloud-alibaba-test</module>
+        <module>spring-cloud-starter-alibaba</module>
     </modules>
 
     <dependencyManagement>

spring-cloud-alibaba-dependencies/pom.xml

@@ -22,6 +22,8 @@
 
     <dependencyManagement>
         <dependencies>
+
+            <!-- Sentinel dependencies -->
             <dependency>
                 <groupId>com.alibaba.csp</groupId>
                 <artifactId>sentinel-core</artifactId>
@@ -67,6 +69,14 @@
                 <artifactId>sentinel-dubbo-adapter</artifactId>
                 <version>${sentinel.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.springframework.cloud</groupId>
+                <artifactId>sentinel-dubbo-api</artifactId>
+                <version>${project.version}</version>
+            </dependency>
+
+
+            <!-- Aliyun storage dependencies -->
             <dependency>
                 <groupId>com.aliyun.oss</groupId>
                 <artifactId>aliyun-sdk-oss</artifactId>
@@ -77,33 +87,28 @@
             <!-- Own dependencies autoconfigure -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-sentinel-autoconfigure</artifactId>
+                <artifactId>spring-cloud-alibaba-sentinel</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-alibaba-storage-autoconfigure</artifactId>
+                <artifactId>spring-cloud-alibaba-storage</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
             <!-- Own dependencies - Starters -->
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-sentinel</artifactId>
+                <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
                 <version>${project.version}</version>
             </dependency>
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
-                <artifactId>spring-cloud-starter-storage</artifactId>
+                <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
                 <version>${project.version}</version>
             </dependency>
 
-            <!-- Own dependencies - Sentinel-Dubbo-Api -->
+            
-            <dependency>
-                <groupId>org.springframework.cloud</groupId>
-                <artifactId>sentinel-dubbo-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
 
             <!-- Testing Dependencies -->
 

spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/pom.xml

@@ -18,7 +18,7 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
         <dependency>

spring-cloud-alibaba-examples/sentinel-dubbo-consumer-example/readme-zh.md

@@ -22,7 +22,7 @@
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
         
         <dependency>

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.
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
         
         <dependency>

spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/pom.xml

@@ -18,9 +18,8 @@
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>sentinel-dubbo-api</artifactId>
@@ -31,7 +30,6 @@
             <artifactId>dubbo-spring-boot-starter</artifactId>
             <version>0.2.0</version>
         </dependency>
-
     </dependencies>
 
     <build>

spring-cloud-alibaba-examples/sentinel-dubbo-provider-example/readme-zh.md

@@ -22,7 +22,7 @@
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
         
         <dependency>

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.
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
         
         <dependency>

spring-cloud-alibaba-examples/sentinel-example/pom.xml

@@ -16,20 +16,19 @@
 
 
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
         </dependency>
-
     </dependencies>
 
     <build>

spring-cloud-alibaba-examples/sentinel-example/readme-zh.md

@@ -17,7 +17,7 @@
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 	
 2. 接入限流埋点

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.
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-sentinel</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
         </dependency>
 	
 2. Define Resources

spring-cloud-alibaba-examples/storage-example/pom.xml

@@ -22,7 +22,7 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-storage</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
         </dependency>
 
         <dependency>

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。	
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oss</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
         </dependency>
 	
 2. 在配置文件中配置 OSS 服务对应的 accessKeyId、secretAccessKey 和 region。

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.
 
 	    <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-oss</artifactId>
+            <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
         </dependency>
 
 2. Configure accessKeyId, secretAccessKey and region in application.properties.

spring-cloud-alibaba-sentinel/pom.xml

@@ -10,8 +10,8 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-alibaba-sentinel-autoconfigure</artifactId>
+    <artifactId>spring-cloud-alibaba-sentinel</artifactId>
-    <name>Spring Cloud Alibaba Sentinel Autoconfigure</name>
+    <name>Spring Cloud Alibaba Sentinel</name>
 
     <dependencies>
 

spring-cloud-alibaba-storage/pom.xml

@@ -10,7 +10,7 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.springframework.cloud</groupId>
-    <artifactId>spring-cloud-alibaba-storage-autoconfigure</artifactId>
+    <artifactId>spring-cloud-alibaba-storage</artifactId>
     <name>Spring Cloud Alibaba Storage Autoconfigure</name>
 
     <dependencies>

spring-cloud-starter-alibaba/pom.xml

@@ -0,0 +1,18 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>org.springframework.cloud</groupId>
+        <artifactId>spring-cloud-alibaba</artifactId>
+        <version>0.2.0.BUILD-SNAPSHOT</version>
+        <relativePath>..</relativePath>
+    </parent>
+    <artifactId>spring-cloud-starter-alibaba</artifactId>
+    <packaging>pom</packaging>
+    <name>Spring Cloud Alibaba Starters</name>
+    <description>Spring Cloud Alibaba Starters</description>
+    <modules>
+        <module>spring-cloud-starter-alibaba-sentinel</module>
+        <module>spring-cloud-starter-alibaba-storage</module>
+    </modules>
+</project>

spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-sentinel/pom.xml

@@ -7,13 +7,13 @@
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.2.0.BUILD-SNAPSHOT</version>
     </parent>
-    <artifactId>spring-cloud-starter-sentinel</artifactId>
+    <artifactId>spring-cloud-starter-alibaba-sentinel</artifactId>
     <name>Spring Cloud Starter Sentinel</name>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-sentinel-autoconfigure</artifactId>
+            <artifactId>spring-cloud-alibaba-sentinel</artifactId>
         </dependency>
         <dependency>
             <groupId>com.alibaba.csp</groupId>

spring-cloud-starter-alibaba/spring-cloud-starter-alibaba-storage/pom.xml

@@ -7,13 +7,13 @@
         <artifactId>spring-cloud-alibaba</artifactId>
         <version>0.2.0.BUILD-SNAPSHOT</version>
     </parent>
-    <artifactId>spring-cloud-starter-storage</artifactId>
+    <artifactId>spring-cloud-starter-alibaba-storage</artifactId>
-    <name>Spring Cloud Starter Storage</name>
+    <name>Spring Cloud Starter Alibaba Storage</name>
 
     <dependencies>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-alibaba-storage-autoconfigure</artifactId>
+            <artifactId>spring-cloud-alibaba-storage</artifactId>
         </dependency>
         <dependency>
             <groupId>com.aliyun.oss</groupId>