diff --git a/README-zh.md b/README-zh.md
index a97e1bb2..b246aa18 100644
--- a/README-zh.md
+++ b/README-zh.md
@@ -109,7 +109,7 @@ Example 列表:
[RocketMQ Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/rocketmq-example/readme-zh.md)
-[Fescar Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/fescar-example/readme-zh.md)
+[Seata Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/seata-example/readme-zh.md)
[Alibaba Cloud OSS Example](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/blob/master/spring-cloud-alibaba-examples/oss-example/readme-zh.md)
diff --git a/Roadmap-zh.md b/Roadmap-zh.md
index b22e59ac..73559795 100644
--- a/Roadmap-zh.md
+++ b/Roadmap-zh.md
@@ -25,7 +25,7 @@ Apache RocketMQ™ 基于 Java 的高性能、高吞吐量的分布式消息和
Apache Dubbo™ 是一款高性能 Java RPC 框架。
-**Fescar**
+**Seata**
阿里巴巴开源产品,一个易于使用的高性能微服务分布式事务解决方案。
diff --git a/Roadmap.md b/Roadmap.md
index 490789e1..32722c70 100644
--- a/Roadmap.md
+++ b/Roadmap.md
@@ -28,7 +28,7 @@ Apache RocketMQ™ is an open source distributed messaging and streaming data pl
Apache Dubbo™ is a high-performance, Java based open source RPC framework.
-**Fescar**
+**Seata**
A distributed transaction solution with high performance and ease of use for microservices architecture.
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 96%
rename from spring-cloud-alibaba-dubbo/pom.xml
rename to alibaba-dubbo-spring-cloud/pom.xml
index c09b6fec..3335af70 100644
--- a/spring-cloud-alibaba-dubbo/pom.xml
+++ b/alibaba-dubbo-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
- spring-cloud-alibaba-dubbo
- Spring Cloud Alibaba Dubbo
+ alibaba-dubbo-spring-cloud
+ Alibaba Dubbo Spring Cloud
2.7.1
@@ -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/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
similarity index 92%
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/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
index d50a82a3..0cb46e70 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/actuate/DubboMetadataEndpointAutoConfiguration.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.actuate;
+package com.alibaba.cloud.dubbo.actuate;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.alibaba.dubbo.actuate.endpoint.DubboRestMetadataEndpoint;
+import com.alibaba.cloud.dubbo.actuate.endpoint.DubboRestMetadataEndpoint;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.PropertySource;
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/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java
similarity index 90%
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/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java
index aa9234b0..38794246 100644
--- 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/com/alibaba/cloud/dubbo/actuate/endpoint/DubboRestMetadataEndpoint.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.actuate.endpoint;
+package com.alibaba.cloud.dubbo.actuate.endpoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
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/com/alibaba/cloud/dubbo/annotation/DubboTransported.java
similarity index 98%
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/com/alibaba/cloud/dubbo/annotation/DubboTransported.java
index f5cfe644..d1236b3e 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/annotation/DubboTransported.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/annotation/DubboTransported.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.annotation;
+package com.alibaba.cloud.dubbo.annotation;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.config.annotation.Reference;
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/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
similarity index 91%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
index 23de850a..c2474aa5 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboLoadBalancedRestTemplateAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.SmartInitializingSingleton;
@@ -25,13 +25,13 @@ import org.springframework.beans.factory.config.ConfigurableListableBeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.client.loadbalancer.DubboMetadataInitializerInterceptor;
-import org.springframework.cloud.alibaba.dubbo.client.loadbalancer.DubboTransporterInterceptor;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboTransportedAttributesResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.loadbalancer.DubboMetadataInitializerInterceptor;
+import com.alibaba.cloud.dubbo.loadbalancer.DubboTransporterInterceptor;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboTransportedAttributesResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
import org.springframework.cloud.client.loadbalancer.RestTemplateCustomizer;
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/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
similarity index 81%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
index b41553d5..57a58176 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboMetadataAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.apache.dubbo.config.ProtocolConfig;
import org.apache.dubbo.config.spring.ServiceBean;
@@ -25,15 +25,15 @@ import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.event.ApplicationFailedEvent;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboProtocolConfigSupplier;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.MetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceExporter;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.service.IntrospectiveDubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.DubboProtocolConfigSupplier;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboServiceBeanMetadataResolver;
+import com.alibaba.cloud.dubbo.metadata.resolver.MetadataResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceExporter;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.service.IntrospectiveDubboMetadataService;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
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/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java
similarity index 79%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java
index 2931e3b4..2f740f7c 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboOpenFeignAutoConfiguration.java
@@ -14,20 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.openfeign.TargeterBeanPostProcessor;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.openfeign.TargeterBeanPostProcessor;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
-
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
/**
* Dubbo Feign Auto-{@link Configuration Configuration}
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
similarity index 77%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
index 52d964e5..b2db5dcc 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceAutoConfiguration.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.PathVariableServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestBodyServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestHeaderServiceParameterResolver;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.RequestParamServiceParameterResolver;
+import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.service.parameter.PathVariableServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestBodyServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestHeaderServiceParameterResolver;
+import com.alibaba.cloud.dubbo.service.parameter.RequestParamServiceParameterResolver;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java
similarity index 89%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java
index 556874f6..d21e841f 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.apache.dubbo.config.RegistryConfig;
import org.apache.dubbo.config.spring.ServiceBean;
@@ -32,10 +32,10 @@ import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.AutoConfigureOrder;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.dubbo.autoconfigure.condition.MissingSpringCloudRegistryConfigPropertyCondition;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.registry.DubboServiceRegistrationEventPublishingAspect;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.autoconfigure.condition.MissingSpringCloudRegistryConfigPropertyCondition;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.registry.DubboServiceRegistrationEventPublishingAspect;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.consul.serviceregistry.ConsulRegistration;
@@ -53,10 +53,10 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.ADDRESS;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.EUREKA_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.ADDRESS;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
import static org.springframework.util.ObjectUtils.isEmpty;
/**
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java
similarity index 91%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java
index 0f1f46d7..6247a520 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationNonWebApplicationAutoConfiguration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.spring.ServiceBean;
@@ -30,8 +30,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnNotWebApplication;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
@@ -43,8 +43,8 @@ import org.springframework.context.event.EventListener;
import java.util.List;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.ZOOKEEPER_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.CONSUL_AUTO_CONFIGURATION_CLASS_NAME;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration.ZOOKEEPER_AUTO_CONFIGURATION_CLASS_NAME;
/**
* Dubbo Service Registration Auto-{@link Configuration} for Non-Web application
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/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java
similarity index 92%
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/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java
index c1db9878..b4e3e33f 100644
--- 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/com/alibaba/cloud/dubbo/autoconfigure/condition/MissingSpringCloudRegistryConfigPropertyCondition.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure.condition;
+package com.alibaba.cloud.dubbo.autoconfigure.condition;
import org.springframework.boot.autoconfigure.condition.ConditionOutcome;
import org.springframework.boot.autoconfigure.condition.SpringBootCondition;
-import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistry;
+import com.alibaba.cloud.dubbo.registry.SpringCloudRegistry;
import org.springframework.context.annotation.Condition;
import org.springframework.context.annotation.ConditionContext;
import org.springframework.core.env.ConfigurableEnvironment;
@@ -27,8 +27,8 @@ import org.springframework.util.StringUtils;
import java.util.Map;
+import static com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
import static org.apache.dubbo.config.spring.util.PropertySourcesUtils.getSubProperties;
-import static org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory.PROTOCOL;
/**
* Missing {@link SpringCloudRegistry} Property {@link Condition}
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/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java
similarity index 92%
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/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java
index f1283e91..83dd9831 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/context/DubboServiceRegistrationApplicationContextInitializer.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.context;
+package com.alibaba.cloud.dubbo.context;
-import org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory;
+import com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory;
import org.springframework.context.ApplicationContextInitializer;
import org.springframework.context.ConfigurableApplicationContext;
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/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java
similarity index 98%
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/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java
index bb4d3864..dc349e58 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboCloudProperties.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboCloudProperties.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.env;
+package com.alibaba.cloud.dubbo.env;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java
similarity index 99%
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/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java
index 5d63860e..b7261e74 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/env/DubboNonWebApplicationEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.env;
+package com.alibaba.cloud.dubbo.env;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java
index ccd294d7..83d0b1e6 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/ByteArrayHttpInputMessage.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/ByteArrayHttpInputMessage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
import org.apache.dubbo.common.io.UnsafeByteArrayInputStream;
import org.springframework.http.HttpHeaders;
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/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java
index 60c21f00..228b8340 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/DefaultHttpRequest.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/DefaultHttpRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpMethod;
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/com/alibaba/cloud/dubbo/http/HttpServerRequest.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/HttpServerRequest.java
index f56a3f93..00bcbf40 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/HttpServerRequest.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/HttpServerRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
import org.springframework.http.HttpInputMessage;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java
index 1ff65e42..602c685a 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/http/MutableHttpServerRequest.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/http/MutableHttpServerRequest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http;
+package com.alibaba.cloud.dubbo.http;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpInputMessage;
@@ -27,7 +27,7 @@ import java.io.InputStream;
import java.net.URI;
import java.util.Map;
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.getParameters;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.getParameters;
/**
* Mutable {@link HttpServerRequest} implementation
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/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java
index e0d7d11f..2a242386 100644
--- 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/com/alibaba/cloud/dubbo/http/converter/HttpMessageConverterHolder.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.converter;
+package com.alibaba.cloud.dubbo.http.converter;
import org.springframework.http.MediaType;
import org.springframework.http.converter.HttpMessageConverter;
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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java
index 3e16664c..87b60108 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import java.util.Collection;
import java.util.Iterator;
@@ -50,7 +50,7 @@ public abstract class AbstractHttpRequestMatcher implements HttpRequestMatcher {
if (other == null || getClass() != other.getClass()) {
return false;
}
- return getContent().equals(((AbstractHttpRequestMatcher) other).getContent());
+ return getContent().equals(((AbstractHttpRequestMatcher)other).getContent());
}
@Override
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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java
index de5d9f84..5f47f1bc 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.MediaType;
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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java
index 695e6792..877a7aa0 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
import org.springframework.util.ObjectUtils;
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/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java
index 181edf2b..255a8829 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/CompositeHttpRequestMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java
index 3fe1f016..33f39a2a 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.MediaType;
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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java
index d831a3b9..12a85bc0 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java
index e4d8296a..7117c891 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestConsumersMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java
index beb05ccd..0865e500 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestHeadersMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java
index ddc395e7..85606f2a 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java
index dd130b87..88a32394 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpMethod;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java
index 22a1ce4a..83fb599f 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
import org.springframework.util.CollectionUtils;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java
index a9df2159..07108e9f 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestPathMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
import org.springframework.util.AntPathMatcher;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java
index b607f122..efc7300d 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestProducesMatcher.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java
index 8597b619..61244f0a 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/MediaTypeExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.MediaType;
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/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java
index 4f22cc9c..1da0b2fa 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/NameValueExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
/**
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/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java
similarity index 93%
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/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java
index 90bfccc5..8d14cd7b 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ParamExpression.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.HttpRequest;
import org.springframework.util.MultiValueMap;
import org.springframework.util.ObjectUtils;
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.getParameters;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.getParameters;
/**
* Parses and matches a single param expression to a request.
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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java
index 2e223bf9..d9830695 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpression.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.springframework.http.MediaType;
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/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java
similarity index 88%
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/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java
index 6e3e9519..1f1b5b8e 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/RequestMetadataMatcher.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.toNameAndValues;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.toNameAndValues;
/**
* {@link RequestMetadata} {@link HttpRequestMatcher} implementation
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/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java
index bf2fa95f..a5488f62 100644
--- 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/com/alibaba/cloud/dubbo/http/util/HttpMessageConverterResolver.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.MethodParameter;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/dubbo/http/util/HttpUtils.java
similarity index 99%
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/com/alibaba/cloud/dubbo/http/util/HttpUtils.java
index 9340e86f..202509dc 100644
--- 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/com/alibaba/cloud/dubbo/http/util/HttpUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
import org.springframework.http.HttpRequest;
import org.springframework.util.LinkedMultiValueMap;
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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java
similarity index 97%
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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java
index ca720625..36bd7622 100644
--- 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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponse.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.loadbalancer;
import org.apache.dubbo.rpc.service.GenericException;
import org.springframework.http.HttpHeaders;
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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java
similarity index 86%
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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java
index 3e92dd7e..77ed0c21 100644
--- 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/com/alibaba/cloud/dubbo/loadbalancer/DubboClientHttpResponseFactory.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.loadbalancer;
import org.apache.dubbo.rpc.service.GenericException;
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.http.util.HttpMessageConverterResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.http.util.HttpMessageConverterResolver;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.http.MediaType;
import org.springframework.http.client.ClientHttpResponse;
import org.springframework.http.converter.HttpMessageConverter;
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/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java
similarity index 95%
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/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java
index 1906aeb0..40f60333 100644
--- 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/com/alibaba/cloud/dubbo/loadbalancer/DubboHttpOutputMessage.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.loadbalancer;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpOutputMessage;
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/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java
similarity index 92%
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/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java
index de488e67..70f12d0f 100644
--- 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/com/alibaba/cloud/dubbo/loadbalancer/DubboMetadataInitializerInterceptor.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.loadbalancer;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
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/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java
similarity index 88%
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/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java
index 4860a3c3..e106e99f 100644
--- 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/com/alibaba/cloud/dubbo/loadbalancer/DubboTransporterInterceptor.java
@@ -14,19 +14,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.client.loadbalancer;
+package com.alibaba.cloud.dubbo.loadbalancer;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.http.MutableHttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.http.MutableHttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.client.loadbalancer.LoadBalancerInterceptor;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
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/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java
similarity index 97%
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/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java
index dd02429d..8d4023ac 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboProtocolConfigSupplier.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboProtocolConfigSupplier.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import org.apache.dubbo.config.ProtocolConfig;
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/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java
similarity index 97%
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/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java
index bb7b4aa1..f689a499 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboRestServiceMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboRestServiceMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import java.util.Objects;
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/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java
similarity index 95%
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/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java
index edb27b4c..22fdeb5e 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/DubboTransportedMethodMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/DubboTransportedMethodMetadata.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
import java.lang.reflect.Method;
import java.util.List;
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/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java
similarity index 98%
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/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java
index 3a6da5b8..34598677 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
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/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java
similarity index 97%
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/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java
index 1c3aaa26..39d4ac4a 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/MethodParameterMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/MethodParameterMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonInclude;
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/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java
similarity index 98%
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/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java
index caa5e8d1..05b6b60d 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RequestMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -37,7 +37,7 @@ import java.util.Objects;
import java.util.Set;
import java.util.SortedMap;
-import static org.springframework.cloud.alibaba.dubbo.http.util.HttpUtils.normalizePath;
+import static com.alibaba.cloud.dubbo.http.util.HttpUtils.normalizePath;
import static org.springframework.http.MediaType.parseMediaTypes;
/**
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/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java
similarity index 99%
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/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java
index b3055357..7840d448 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/RestMethodMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/RestMethodMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
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/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java
similarity index 97%
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/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java
index 18850588..3a871b21 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/metadata/ServiceRestMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/metadata/ServiceRestMetadata.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import com.fasterxml.jackson.annotation.JsonInclude;
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/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
similarity index 95%
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/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
index 43f1590f..7446265b 100644
--- 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/com/alibaba/cloud/dubbo/metadata/repository/DubboServiceMetadataRepository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.repository;
+package com.alibaba.cloud.dubbo.metadata.repository;
import org.apache.dubbo.common.URL;
@@ -24,15 +24,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties;
-import org.springframework.cloud.alibaba.dubbo.http.matcher.RequestMetadataMatcher;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceExporter;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.env.DubboCloudProperties;
+import com.alibaba.cloud.dubbo.http.matcher.RequestMetadataMatcher;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceExporter;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.commons.util.InetUtils;
@@ -54,6 +54,8 @@ import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+import static com.alibaba.cloud.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
import static java.lang.String.format;
import static java.lang.String.valueOf;
import static java.util.Collections.emptyList;
@@ -63,8 +65,6 @@ import static java.util.Collections.unmodifiableMap;
import static java.util.Collections.unmodifiableSet;
import static org.apache.dubbo.common.Constants.APPLICATION_KEY;
import static org.apache.dubbo.common.Constants.VERSION_KEY;
-import static org.springframework.cloud.alibaba.dubbo.env.DubboCloudProperties.ALL_DUBBO_SERVICES;
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
import static org.springframework.util.CollectionUtils.isEmpty;
import static org.springframework.util.StringUtils.hasText;
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java
similarity index 95%
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java
index 22b0b3d2..fa138295 100644
--- 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/com/alibaba/cloud/dubbo/metadata/resolver/DubboServiceBeanMetadataResolver.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
import feign.Contract;
import feign.Feign;
@@ -26,8 +26,8 @@ import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.SmartInitializingSingleton;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
import org.springframework.util.ClassUtils;
import java.lang.reflect.Method;
@@ -171,7 +171,7 @@ public class DubboServiceBeanMetadataResolver implements BeanClassLoaderAware, S
String configKey = methodMetadata.configKey();
Method feignContractMethod = getMatchedFeignContractMethod(targetType, feignContractMethods, configKey);
RestMethodMetadata metadata = new RestMethodMetadata(methodMetadata);
- metadata.setMethod(new org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata(feignContractMethod));
+ metadata.setMethod(new com.alibaba.cloud.dubbo.metadata.MethodMetadata (feignContractMethod));
return metadata;
}
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java
similarity index 93%
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java
index e403139e..21357661 100644
--- 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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedAttributesResolver.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
import org.springframework.core.env.PropertyResolver;
import java.util.LinkedHashMap;
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java
similarity index 92%
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java
index 3e232440..1c09c0bc 100644
--- 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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolver.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
import feign.Contract;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.annotation.AnnotationUtils;
import org.springframework.core.env.PropertyResolver;
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/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java
similarity index 87%
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/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java
index c4d0a1c7..52917c5d 100644
--- 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/com/alibaba/cloud/dubbo/metadata/resolver/MetadataResolver.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
import org.apache.dubbo.config.spring.ServiceBean;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
import java.util.Set;
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/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java
similarity index 91%
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/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java
index 01d038fb..6bd21d06 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/DubboInvocationHandler.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/DubboInvocationHandler.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
import org.springframework.util.ClassUtils;
import java.lang.reflect.InvocationHandler;
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/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java
similarity index 93%
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/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java
index 52ee10e5..3c11c914 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/FeignMethodMetadata.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/FeignMethodMetadata.java
@@ -14,10 +14,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import java.lang.reflect.Method;
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/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java
similarity index 88%
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/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java
index 0419a157..9d80dea1 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterBeanPostProcessor.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterBeanPostProcessor.java
@@ -14,18 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.config.BeanPostProcessor;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.core.env.Environment;
+import static com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
import static java.lang.reflect.Proxy.newProxyInstance;
-import static org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration.TARGETER_CLASS_NAME;
import static org.springframework.util.ClassUtils.getUserClass;
import static org.springframework.util.ClassUtils.isPresent;
import static org.springframework.util.ClassUtils.resolveClassName;
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/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java
similarity index 88%
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/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java
index 6e9ca7f4..6ef5cb86 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/openfeign/TargeterInvocationHandler.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/openfeign/TargeterInvocationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.openfeign;
+package com.alibaba.cloud.dubbo.openfeign;
import org.apache.dubbo.rpc.service.GenericService;
@@ -23,16 +23,16 @@ import feign.Contract;
import feign.Target;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.metadata.resolver.DubboTransportedMethodMetadataResolver;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.metadata.resolver.DubboTransportedMethodMetadataResolver;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.cloud.openfeign.FeignContext;
import org.springframework.core.env.Environment;
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/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java
similarity index 96%
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/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java
index 7155ab65..8fe3ee4a 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/AbstractSpringCloudRegistry.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/AbstractSpringCloudRegistry.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
import org.apache.dubbo.common.Constants;
import org.apache.dubbo.common.URL;
@@ -24,10 +24,10 @@ import org.apache.dubbo.registry.support.FailbackRegistry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataService;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataService;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
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/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java
similarity index 97%
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/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java
index e91831dd..94491b48 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DelegatingRegistration.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DelegatingRegistration.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.serviceregistry.Registration;
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/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java
similarity index 90%
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/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java
index 17826624..c6c8c210 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/DubboServiceRegistrationEventPublishingAspect.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
import org.aspectj.lang.annotation.After;
import org.aspectj.lang.annotation.Aspect;
import org.aspectj.lang.annotation.Before;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
-import org.springframework.cloud.alibaba.dubbo.registry.event.ServiceInstanceRegisteredEvent;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstancePreRegisteredEvent;
+import com.alibaba.cloud.dubbo.registry.event.ServiceInstanceRegisteredEvent;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import org.springframework.context.ApplicationEventPublisher;
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/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java
similarity index 87%
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/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java
index 4928d40e..ce09de4e 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistry.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistry.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.registry.RegistryFactory;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import java.util.concurrent.ScheduledExecutorService;
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/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java
similarity index 91%
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/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java
index da147555..9cdf099c 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/registry/SpringCloudRegistryFactory.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/registry/SpringCloudRegistryFactory.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry;
+package com.alibaba.cloud.dubbo.registry;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.NamedThreadFactory;
import org.apache.dubbo.registry.Registry;
import org.apache.dubbo.registry.RegistryFactory;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboMetadataServiceProxy;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboMetadataServiceProxy;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.context.ConfigurableApplicationContext;
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/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java
similarity index 95%
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/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java
index 6233e9a5..08389694 100644
--- 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/com/alibaba/cloud/dubbo/registry/event/ServiceInstancePreRegisteredEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry.event;
+package com.alibaba.cloud.dubbo.registry.event;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.serviceregistry.Registration;
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/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java
similarity index 95%
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/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java
index 8aab6aa7..0022cfac 100644
--- 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/com/alibaba/cloud/dubbo/registry/event/ServiceInstanceRegisteredEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.registry.event;
+package com.alibaba.cloud.dubbo.registry.event;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java
similarity index 96%
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java
index 640fc009..d8586933 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContext.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContext.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.rpc.service.GenericService;
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java
similarity index 92%
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java
index 625173d3..b40fe92c 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceExecutionContextFactory.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceExecutionContextFactory.java
@@ -14,14 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.service.parameter.DubboGenericServiceParameterResolver;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.MethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.service.parameter.DubboGenericServiceParameterResolver;
import org.springframework.core.annotation.AnnotationAwareOrderComparator;
import javax.annotation.PostConstruct;
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java
similarity index 96%
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/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java
index 2955df1b..7c9ca828 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboGenericServiceFactory.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboGenericServiceFactory.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.utils.CollectionUtils;
@@ -28,8 +28,8 @@ import org.springframework.beans.MutablePropertyValues;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.propertyeditors.StringTrimmerEditor;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
import org.springframework.util.StringUtils;
import org.springframework.validation.DataBinder;
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/com/alibaba/cloud/dubbo/service/DubboMetadataService.java
similarity index 95%
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/com/alibaba/cloud/dubbo/service/DubboMetadataService.java
index 131a0c1a..0c491952 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataService.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataService.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.annotation.Service;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
import java.util.List;
import java.util.Map;
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java
similarity index 98%
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java
index 598b1ac3..7c04abd7 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceExporter.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceExporter.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.config.ApplicationConfig;
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java
similarity index 97%
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java
index db95179f..9312581f 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceInvocationHandler.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceInvocationHandler.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.rpc.service.GenericService;
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java
similarity index 98%
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/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java
index 614207c2..da57fd55 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/DubboMetadataServiceProxy.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/DubboMetadataServiceProxy.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.DisposableBean;
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/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java
similarity index 91%
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/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java
index 048f4e2e..3e4e1a66 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/service/IntrospectiveDubboMetadataService.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/service/IntrospectiveDubboMetadataService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.common.URL;
@@ -22,9 +22,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.dubbo.metadata.ServiceRestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.util.JSONUtils;
+import com.alibaba.cloud.dubbo.metadata.ServiceRestMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.util.JSONUtils;
import java.util.Collections;
import java.util.HashMap;
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/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java
similarity index 94%
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/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java
index 8f4f1ad3..f6ccbd63 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/AbstractDubboGenericServiceParameterResolver.java
@@ -14,14 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
import org.springframework.beans.factory.BeanClassLoaderAware;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.core.convert.ConversionService;
import org.springframework.format.support.DefaultFormattingConversionService;
-import org.springframework.format.support.FormattingConversionService;
import static org.springframework.context.ConfigurableApplicationContext.CONVERSION_SERVICE_BEAN_NAME;
import static org.springframework.util.ClassUtils.resolveClassName;
@@ -32,7 +31,7 @@ import static org.springframework.util.ClassUtils.resolveClassName;
* @author Mercy
*/
public abstract class AbstractDubboGenericServiceParameterResolver implements DubboGenericServiceParameterResolver,
- BeanClassLoaderAware {
+ BeanClassLoaderAware {
private int order;
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/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java
similarity index 93%
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/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java
index 3654b1bd..721109f3 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/AbstractNamedValueServiceParameterResolver.java
@@ -14,11 +14,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.util.CollectionUtils;
import org.springframework.util.MultiValueMap;
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/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java
similarity index 84%
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/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java
index 93a28264..a2095551 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/DubboGenericServiceParameterResolver.java
@@ -14,12 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.core.Ordered;
/**
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/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java
similarity index 91%
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/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java
index 81a40f3c..e861fa60 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/PathVariableServiceParameterResolver.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
import org.springframework.util.MultiValueMap;
/**
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/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java
similarity index 89%
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/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java
index e4f35cae..f9c2020c 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/RequestBodyServiceParameterResolver.java
@@ -14,16 +14,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
import org.springframework.beans.factory.ObjectProvider;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.http.HttpMessageConverters;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.http.converter.HttpMessageConverterHolder;
-import org.springframework.cloud.alibaba.dubbo.http.util.HttpMessageConverterResolver;
-import org.springframework.cloud.alibaba.dubbo.metadata.MethodParameterMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.converter.HttpMessageConverterHolder;
+import com.alibaba.cloud.dubbo.http.util.HttpMessageConverterResolver;
+import com.alibaba.cloud.dubbo.metadata.MethodParameterMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
import org.springframework.http.converter.HttpMessageConverter;
import org.springframework.http.converter.HttpMessageNotReadableException;
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/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java
similarity index 91%
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/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java
index fc0e1c01..7581f466 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/RequestHeaderServiceParameterResolver.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
import org.springframework.util.MultiValueMap;
/**
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/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java
similarity index 91%
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/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java
index 4801d1ba..18cd92d2 100644
--- 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/com/alibaba/cloud/dubbo/service/parameter/RequestParamServiceParameterResolver.java
@@ -14,9 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service.parameter;
+package com.alibaba.cloud.dubbo.service.parameter;
-import org.springframework.cloud.alibaba.dubbo.http.HttpServerRequest;
+import com.alibaba.cloud.dubbo.http.HttpServerRequest;
import org.springframework.util.MultiValueMap;
/**
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/com/alibaba/cloud/dubbo/util/JSONUtils.java
similarity index 98%
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/com/alibaba/cloud/dubbo/util/JSONUtils.java
index 2ed9a7b5..a1290a18 100644
--- a/spring-cloud-alibaba-dubbo/src/main/java/org/springframework/cloud/alibaba/dubbo/util/JSONUtils.java
+++ b/alibaba-dubbo-spring-cloud/src/main/java/com/alibaba/cloud/dubbo/util/JSONUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.util;
+package com.alibaba.cloud.dubbo.util;
import org.apache.dubbo.common.URL;
diff --git a/alibaba-dubbo-spring-cloud/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
new file mode 100644
index 00000000..d8b83d57
--- /dev/null
+++ b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
@@ -0,0 +1 @@
+spring-cloud=com.alibaba.cloud.dubbo.registry.SpringCloudRegistryFactory
\ No newline at end of file
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/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..dbaa6c57
--- /dev/null
+++ b/alibaba-dubbo-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,16 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.dubbo.autoconfigure.DubboMetadataAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceRegistrationNonWebApplicationAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboLoadBalancedRestTemplateAutoConfiguration,\
+com.alibaba.cloud.dubbo.autoconfigure.DubboServiceAutoConfiguration
+
+org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
+com.alibaba.cloud.dubbo.actuate.DubboMetadataEndpointAutoConfiguration
+
+org.springframework.context.ApplicationContextInitializer=\
+com.alibaba.cloud.dubbo.context.DubboServiceRegistrationApplicationContextInitializer
+
+org.springframework.boot.env.EnvironmentPostProcessor=\
+com.alibaba.cloud.dubbo.env.DubboNonWebApplicationEnvironmentPostProcessor
\ No newline at end of file
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java
similarity index 94%
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/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java
index ce32e641..22dc2e02 100644
--- a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java
+++ b/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/autoconfigure/DubboServiceRegistrationAutoConfigurationTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.autoconfigure;
+package com.alibaba.cloud.dubbo.autoconfigure;
import org.springframework.boot.test.context.SpringBootTest;
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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java
index 6e792a53..3a0d31e2 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractHttpRequestMatcherTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java
similarity index 97%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java
index 48588c73..dcdc92ed 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractMediaTypeExpressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java
index 407b7127..336d8843 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/AbstractNameValueExpressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java
index 492a9f28..144332c8 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ConsumeMediaTypeExpressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java
similarity index 93%
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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java
index 1d2c7a76..69ff08ab 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HeaderExpressionTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.http.HttpRequest;
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
/**
* {@link HeaderExpression} Test
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java
index 4d28fc57..1da5db43 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestMethodsMatcherTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.springframework.http.HttpMethod;
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java
similarity index 98%
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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java
index 36476fae..939f6015 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/HttpRequestParamsMatcherTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java
similarity index 93%
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/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java
index 5cab37ab..f512bdd9 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ParamExpressionTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
import org.springframework.http.HttpRequest;
-import static org.springframework.cloud.alibaba.dubbo.http.DefaultHttpRequest.builder;
+import static com.alibaba.cloud.dubbo.http.DefaultHttpRequest.builder;
/**
* {@link ParamExpression} Test
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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java
similarity index 96%
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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java
index a749e274..1df8fdd8 100644
--- 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/com/alibaba/cloud/dubbo/http/matcher/ProduceMediaTypeExpressionTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.matcher;
+package com.alibaba.cloud.dubbo.http.matcher;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java
similarity index 95%
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/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java
index 789c18b8..322d6e1f 100644
--- 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/com/alibaba/cloud/dubbo/http/util/HttpUtilsTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.http.util;
+package com.alibaba.cloud.dubbo.http.util;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java
similarity index 98%
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/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java
index bbd2d25e..84992422 100644
--- a/spring-cloud-alibaba-dubbo/src/test/java/org/springframework/cloud/alibaba/dubbo/metadata/RequestMetadataTest.java
+++ b/alibaba-dubbo-spring-cloud/src/test/java/com/alibaba/cloud/dubbo/metadata/RequestMetadataTest.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata;
+package com.alibaba.cloud.dubbo.metadata;
import org.junit.Assert;
import org.junit.Test;
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java
similarity index 88%
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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java
index 6e263a06..b1cc3a74 100644
--- 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/com/alibaba/cloud/dubbo/metadata/resolver/DubboTransportedMethodMetadataResolverTest.java
@@ -14,13 +14,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.metadata.resolver;
+package com.alibaba.cloud.dubbo.metadata.resolver;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboTransportedMethodMetadata;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
+import com.alibaba.cloud.dubbo.metadata.DubboTransportedMethodMetadata;
import org.springframework.cloud.openfeign.support.SpringMvcContract;
import org.springframework.mock.env.MockEnvironment;
diff --git a/spring-cloud-alibaba-dubbo/src/test/resources/application.yaml b/alibaba-dubbo-spring-cloud/src/test/resources/application.yaml
similarity index 78%
rename from spring-cloud-alibaba-dubbo/src/test/resources/application.yaml
rename to alibaba-dubbo-spring-cloud/src/test/resources/application.yaml
index 2b3eb54e..455d0b31 100644
--- a/spring-cloud-alibaba-dubbo/src/test/resources/application.yaml
+++ b/alibaba-dubbo-spring-cloud/src/test/resources/application.yaml
@@ -1,6 +1,6 @@
dubbo:
scan:
- base-packages: org.springframework.cloud.alibaba.dubbo.service
+ base-packages: com.alibaba.cloud.dubbo.service
protocols:
dubbo:
name: dubbo
diff --git a/spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml b/alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml
similarity index 94%
rename from spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml
rename to alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml
index 9b1aad42..6038ad7b 100644
--- a/spring-cloud-alibaba-dubbo/src/test/resources/bootstrap.yaml
+++ b/alibaba-dubbo-spring-cloud/src/test/resources/bootstrap.yaml
@@ -1,6 +1,6 @@
spring:
application:
- name: spring-cloud-alibaba-dubbo
+ name: alibaba-dubbo-spring-cloud
cloud:
nacos:
discovery:
diff --git a/spring-cloud-alibaba-nacos-config-server/pom.xml b/alibaba-nacos-config-server-spring-cloud/pom.xml
similarity index 92%
rename from spring-cloud-alibaba-nacos-config-server/pom.xml
rename to alibaba-nacos-config-server-spring-cloud/pom.xml
index 475f96cd..f0eb806f 100644
--- a/spring-cloud-alibaba-nacos-config-server/pom.xml
+++ b/alibaba-nacos-config-server-spring-cloud/pom.xml
@@ -3,16 +3,16 @@
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
- Spring Cloud Alibaba Nacos Config Server
+ com.alibaba.cloud
+ alibaba-nacos-config-server-spring-cloud
+ Alibaba Nacos Config Server Spring Cloud
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/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java
similarity index 91%
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/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java
index 74a4903d..32a63872 100644
--- 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/com/alibaba/cloud/nacos/config/server/NacosConfigServerAutoConfiguration.java
@@ -14,11 +14,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.config.server;
+package com.alibaba.cloud.nacos.config.server;
+
+import com.alibaba.cloud.nacos.config.server.environment.NacosEnvironmentRepository;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.alibaba.nacos.config.server.environment.NacosEnvironmentRepository;
import org.springframework.cloud.config.server.EnableConfigServer;
import org.springframework.cloud.config.server.config.ConfigServerAutoConfiguration;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java
similarity index 97%
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/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java
index 50b054aa..8f36b9b7 100644
--- 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/com/alibaba/cloud/nacos/config/server/environment/NacosEnvironmentRepository.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.config.server.environment;
+package com.alibaba.cloud.nacos.config.server.environment;
import com.alibaba.nacos.config.server.model.ConfigInfo;
import com.alibaba.nacos.config.server.service.PersistService;
diff --git a/alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..aef71745
--- /dev/null
+++ b/alibaba-nacos-config-server-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+# Auto-Configuration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.nacos.config.server.NacosConfigServerAutoConfiguration
\ No newline at end of file
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/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java
similarity index 95%
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/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java
index 3e379457..8bab6235 100644
--- 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/com/alibaba/cloud/nacos/config/server/bootstrap/NacosConfigServerBootstrap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.config.server.bootstrap;
+package com.alibaba.cloud.nacos.config.server.bootstrap;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
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 95%
rename from spring-cloud-alibaba-nacos-config/pom.xml
rename to alibaba-nacos-config-spring-cloud/pom.xml
index e719cfcf..e9c7fb59 100644
--- a/spring-cloud-alibaba-nacos-config/pom.xml
+++ b/alibaba-nacos-config-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-nacos-config
- Spring Cloud Alibaba Nacos Config
+ com.alibaba.cloud
+ alibaba-nacos-config-spring-cloud
+ Alibaba Nacos Config Spring Cloud
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/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
similarity index 88%
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/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
index caacccd8..d5411ece 100644
--- 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/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
+
+import com.alibaba.cloud.nacos.refresh.NacosContextRefresher;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshProperties;
import org.springframework.beans.factory.BeanFactoryUtils;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosContextRefresher;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshProperties;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
similarity index 91%
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/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
index 5a6ad2bb..668e4b75 100644
--- 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/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
+
+import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/NacosConfigProperties.java
similarity index 99%
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/com/alibaba/cloud/nacos/NacosConfigProperties.java
index 01b95d5d..aff2daf6 100644
--- 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/com/alibaba/cloud/nacos/NacosConfigProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
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/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java
similarity index 92%
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/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java
index 6fa8e490..942e7e8c 100644
--- 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/com/alibaba/cloud/nacos/NacosPropertySourceRepository.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import com.alibaba.cloud.nacos.client.NacosPropertySource;
+
/**
* @author xiaojing
* @author pbting
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/com/alibaba/cloud/nacos/client/NacosPropertySource.java
similarity index 96%
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/com/alibaba/cloud/nacos/client/NacosPropertySource.java
index 0066d17e..5e95e325 100644
--- 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/com/alibaba/cloud/nacos/client/NacosPropertySource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.client;
+package com.alibaba.cloud.nacos.client;
import org.springframework.core.env.MapPropertySource;
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/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
similarity index 96%
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/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
index cf63f0db..e82fd05e 100644
--- 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/com/alibaba/cloud/nacos/client/NacosPropertySourceBuilder.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.client;
+package com.alibaba.cloud.nacos.client;
+import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
-import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
import org.springframework.core.io.ByteArrayResource;
import org.springframework.util.StringUtils;
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/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
similarity index 96%
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/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
index 306066eb..06fd8039 100644
--- 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/com/alibaba/cloud/nacos/client/NacosPropertySourceLocator.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.client;
+package com.alibaba.cloud.nacos.client;
+import com.alibaba.cloud.nacos.NacosConfigProperties;
+import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
+import com.alibaba.cloud.nacos.refresh.NacosContextRefresher;
import com.alibaba.nacos.api.config.ConfigService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
-import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosContextRefresher;
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
import org.springframework.core.annotation.Order;
import org.springframework.core.env.CompositePropertySource;
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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java
similarity index 94%
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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java
index 1bbbe940..10b1e20a 100644
--- 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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureAnalyzer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.diagnostics.analyzer;
+package com.alibaba.cloud.nacos.diagnostics.analyzer;
import org.springframework.boot.diagnostics.AbstractFailureAnalyzer;
import org.springframework.boot.diagnostics.FailureAnalysis;
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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java
similarity index 94%
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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java
index 2ca75d05..7fc3c185 100644
--- 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/com/alibaba/cloud/nacos/diagnostics/analyzer/NacosConnectionFailureException.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.diagnostics.analyzer;
+package com.alibaba.cloud.nacos.diagnostics.analyzer;
/**
* A {@code NacosConnectionFailureException} is thrown when the application fails to connect
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java
similarity index 86%
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java
index 34ddd2a0..14fda698 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpoint.java
@@ -14,14 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
-import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
@@ -30,6 +26,11 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.alibaba.cloud.nacos.NacosConfigProperties;
+import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
+import com.alibaba.cloud.nacos.client.NacosPropertySource;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
+
/**
* Endpoint for Nacos, contains config data and refresh history
* @author xiaojing
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
similarity index 90%
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
index 21d77f7f..fcc09964 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
@@ -14,7 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
+
+import com.alibaba.cloud.nacos.NacosConfigProperties;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -23,8 +26,6 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Bean;
/**
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/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java
similarity index 88%
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/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java
index 491b07bf..6408875d 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosConfigHealthIndicator.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
+import com.alibaba.cloud.nacos.NacosConfigProperties;
+import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
+import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.alibaba.nacos.api.config.ConfigService;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
-import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
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/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java
similarity index 95%
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/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java
index 40341d41..0cf6b34f 100644
--- 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/com/alibaba/cloud/nacos/refresh/NacosContextRefresher.java
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.refresh;
+package com.alibaba.cloud.nacos.refresh;
+import com.alibaba.cloud.nacos.NacosPropertySourceRepository;
+import com.alibaba.cloud.nacos.client.NacosPropertySource;
import com.alibaba.nacos.api.config.ConfigService;
import com.alibaba.nacos.api.config.listener.Listener;
import com.alibaba.nacos.api.exception.NacosException;
@@ -23,8 +25,6 @@ import com.alibaba.nacos.api.exception.NacosException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.cloud.alibaba.nacos.NacosPropertySourceRepository;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySource;
import org.springframework.cloud.endpoint.event.RefreshEvent;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
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/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java
similarity index 96%
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/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java
index 149453b6..0778fb34 100644
--- 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/com/alibaba/cloud/nacos/refresh/NacosRefreshHistory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.refresh;
+package com.alibaba.cloud.nacos.refresh;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
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/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java
similarity index 94%
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/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java
index acf34ed1..6d07e794 100644
--- 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/com/alibaba/cloud/nacos/refresh/NacosRefreshProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.refresh;
+package com.alibaba.cloud.nacos.refresh;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
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/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..9977a854
--- /dev/null
+++ b/alibaba-nacos-config-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,7 @@
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.nacos.NacosConfigAutoConfiguration,\
+com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration
+org.springframework.boot.diagnostics.FailureAnalyzer=\
+com.alibaba.cloud.nacos.diagnostics.analyzer.NacosConnectionFailureAnalyzer
\ No newline at end of file
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/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java
similarity index 95%
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/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java
index e0f6d012..0aa133ff 100644
--- 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/com/alibaba/cloud/nacos/NacosConfigurationExtConfigTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -22,6 +22,8 @@ import static org.springframework.boot.test.context.SpringBootTest.WebEnvironmen
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.nacos.client.config.NacosConfigService;
import org.junit.Assert;
@@ -37,8 +39,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
-import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/nacos/NacosConfigurationTests.java
similarity index 95%
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/com/alibaba/cloud/nacos/NacosConfigurationTests.java
index 67e98f05..e0f4e132 100644
--- 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/com/alibaba/cloud/nacos/NacosConfigurationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -37,14 +37,14 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.client.NacosPropertySourceLocator;
-import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpoint;
-import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
+import com.alibaba.cloud.nacos.client.NacosPropertySourceLocator;
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpoint;
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import com.alibaba.nacos.client.config.NacosConfigService;
/**
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/com/alibaba/cloud/nacos/NacosFileExtensionTest.java
similarity index 95%
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/com/alibaba/cloud/nacos/NacosFileExtensionTest.java
index 979cac3f..53691e13 100644
--- 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/com/alibaba/cloud/nacos/NacosFileExtensionTest.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
+import com.alibaba.cloud.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import com.alibaba.nacos.client.config.NacosConfigService;
import org.junit.Assert;
@@ -36,7 +37,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java
similarity index 76%
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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java
index ef823960..37204654 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosConfigEndpointTests.java
@@ -14,20 +14,21 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
import static org.junit.Assert.assertEquals;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
+import com.alibaba.cloud.nacos.NacosConfigAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosConfigBootstrapConfiguration;
+import com.alibaba.cloud.nacos.NacosConfigProperties;
+import com.alibaba.cloud.nacos.refresh.NacosRefreshHistory;
import com.alibaba.nacos.client.config.NacosConfigService;
-import org.junit.Assert;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.mockito.PowerMockito;
@@ -37,14 +38,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.powermock.modules.junit4.PowerMockRunnerDelegate;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosConfigBootstrapConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
-import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -98,31 +94,31 @@ public class NacosConfigEndpointTests {
public void contextLoads() throws Exception {
checkoutEndpoint();
- checkoutAcmHealthIndicator();
+ //checkoutAcmHealthIndicator();
}
- private void checkoutAcmHealthIndicator() {
- try {
- Builder builder = new Builder();
-
- NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator(
- properties, properties.configServiceInstance());
- healthIndicator.doHealthCheck(builder);
-
- Builder builder1 = new Builder();
- List dataIds = new ArrayList<>();
- dataIds.add("test-name.properties");
- builder1.up().withDetail("dataIds", dataIds);
-
- Assert.assertTrue(builder.build().equals(builder1.build()));
-
- }
- catch (Exception ignoreE) {
-
- }
-
- }
+ //private void checkoutAcmHealthIndicator() {
+ // try {
+ // Builder builder = new Builder();
+ //
+ // NacosConfigHealthIndicator healthIndicator = new NacosConfigHealthIndicator(
+ // properties, properties.configServiceInstance());
+ // healthIndicator.doHealthCheck(builder);
+ //
+ // Builder builder1 = new Builder();
+ // List dataIds = new ArrayList<>();
+ // dataIds.add("test-name.properties");
+ // builder1.up().withDetail("dataIds", dataIds);
+ //
+ // Assert.assertTrue(builder.build().equals(builder1.build()));
+ //
+ // }
+ // catch (Exception ignoreE) {
+ //
+ // }
+ //
+ //}
private void checkoutEndpoint() throws Exception {
NacosConfigEndpoint endpoint = new NacosConfigEndpoint(properties,
diff --git a/spring-cloud-alibaba-nacos-discovery/pom.xml b/alibaba-nacos-discovery-spring-cloud/pom.xml
similarity index 94%
rename from spring-cloud-alibaba-nacos-discovery/pom.xml
rename to alibaba-nacos-discovery-spring-cloud/pom.xml
index 4b3b5287..ea38b7c3 100644
--- a/spring-cloud-alibaba-nacos-discovery/pom.xml
+++ b/alibaba-nacos-discovery-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-nacos-discovery
- Spring Cloud Alibaba Nacos Discovery
+ com.alibaba.cloud
+ alibaba-nacos-discovery-spring-cloud
+ Alibaba Nacos Discovery Spring Cloud
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/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java
similarity index 95%
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/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java
index 71b9656c..c83dcb24 100644
--- 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/com/alibaba/cloud/nacos/ConditionalOnNacosDiscoveryEnabled.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
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/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
similarity index 90%
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/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
index 9e348a1a..4158db50 100644
--- 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/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
+
+import com.alibaba.cloud.nacos.registry.NacosAutoServiceRegistration;
+import com.alibaba.cloud.nacos.registry.NacosRegistration;
+import com.alibaba.cloud.nacos.registry.NacosServiceRegistry;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.nacos.registry.NacosAutoServiceRegistration;
-import org.springframework.cloud.alibaba.nacos.registry.NacosRegistration;
-import org.springframework.cloud.alibaba.nacos.registry.NacosServiceRegistry;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
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/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
similarity index 99%
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/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
index c9f20a7c..f9d516f6 100644
--- 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/com/alibaba/cloud/nacos/NacosDiscoveryProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.naming.NamingMaintainFactory;
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/com/alibaba/cloud/nacos/NacosServiceInstance.java
similarity index 97%
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/com/alibaba/cloud/nacos/NacosServiceInstance.java
index 4059ba2e..3870ac1c 100644
--- 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/com/alibaba/cloud/nacos/NacosServiceInstance.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
similarity index 94%
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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
index bcfa66f3..42b964f9 100644
--- 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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClient.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.discovery;
+package com.alibaba.cloud.nacos.discovery;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.NacosServiceInstance;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
-import org.springframework.cloud.alibaba.nacos.NacosServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.DiscoveryClient;
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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
similarity index 87%
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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
index 2c1433ae..abcd947e 100644
--- 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/com/alibaba/cloud/nacos/discovery/NacosDiscoveryClientAutoConfiguration.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.discovery;
+package com.alibaba.cloud.nacos.discovery;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.CommonsClientAutoConfiguration;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.cloud.client.discovery.simple.SimpleDiscoveryClientAutoConfiguration;
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/com/alibaba/cloud/nacos/discovery/NacosWatch.java
similarity index 92%
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/com/alibaba/cloud/nacos/discovery/NacosWatch.java
index 861dc400..c0731f5e 100644
--- 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/com/alibaba/cloud/nacos/discovery/NacosWatch.java
@@ -14,23 +14,20 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.discovery;
+package com.alibaba.cloud.nacos.discovery;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.List;
import java.util.Set;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicLong;
-import com.alibaba.nacos.api.naming.NamingService;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.listener.EventListener;
-import com.alibaba.nacos.api.naming.pojo.ListView;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.discovery.event.HeartbeatEvent;
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.ApplicationEventPublisherAware;
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/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java
similarity index 90%
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/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java
index f1cf3f3f..3cc04ab7 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/com/alibaba/cloud/nacos/discovery/configclient/NacosConfigServerAutoConfiguration.java
@@ -1,57 +1,58 @@
-/*
- * 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 com.alibaba.cloud.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.config.server.config.ConfigServerProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.util.StringUtils;
+
+import javax.annotation.PostConstruct;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+
+/**
+ * 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/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java
similarity index 84%
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/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java
index aaf35632..070ad93a 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/com/alibaba/cloud/nacos/discovery/configclient/NacosDiscoveryClientConfigServiceBootstrapConfiguration.java
@@ -1,41 +1,42 @@
-/*
- * 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 com.alibaba.cloud.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.config.client.ConfigServicePropertySourceLocator;
+import org.springframework.context.annotation.Configuration;
+
+import javax.annotation.PostConstruct;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
+/**
+ * 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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
similarity index 94%
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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
index 6ceec414..2422855e 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpoint.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.ServiceInfo;
@@ -28,7 +29,6 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
/**
* Endpoint for nacos discovery, get nacos properties and subscribed services
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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java
similarity index 87%
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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java
index 0bbee4c2..144bfe8b 100644
--- 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/com/alibaba/cloud/nacos/endpoint/NacosDiscoveryEndpointAutoConfiguration.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.endpoint;
+package com.alibaba.cloud.nacos.endpoint;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java
similarity index 98%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java
index 54c22a19..3dbf37c2 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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/com/alibaba/cloud/nacos/registry/NacosRegistration.java
similarity index 96%
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/com/alibaba/cloud/nacos/registry/NacosRegistration.java
index 68d8c995..e29848d9 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosRegistration.java
@@ -14,9 +14,8 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
@@ -30,6 +29,7 @@ import java.util.Map;
import javax.annotation.PostConstruct;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
/**
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/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
similarity index 97%
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/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
index e23aa9da..9f6d51c5 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosServiceRegistry.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
import java.util.List;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.Registration;
import org.springframework.cloud.client.serviceregistry.ServiceRegistry;
import org.springframework.util.StringUtils;
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/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java
similarity index 95%
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/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java
index 1e223ab0..dcdc35e0 100644
--- 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/com/alibaba/cloud/nacos/ribbon/ConditionalOnRibbonNacos.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
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/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java
similarity index 89%
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/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java
index 3f21a9ad..942ed31a 100644
--- 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/com/alibaba/cloud/nacos/ribbon/ExtendBalancer.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.client.naming.core.Balancer;
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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java
similarity index 92%
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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java
index 77231a89..086f1667 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfiguration.java
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/ribbon/NacosRule.java
similarity index 94%
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/com/alibaba/cloud/nacos/ribbon/NacosRule.java
index e86a0879..95bd7e6a 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosRule.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import java.util.List;
import java.util.Objects;
@@ -8,9 +8,9 @@ import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.util.CollectionUtils;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
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/com/alibaba/cloud/nacos/ribbon/NacosServer.java
similarity index 96%
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/com/alibaba/cloud/nacos/ribbon/NacosServer.java
index 70f33f97..6456fd4d 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosServer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.loadbalancer.Server;
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/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java
similarity index 95%
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/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java
index 4e9d22cc..481c2d4a 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosServerIntrospector.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import java.util.Map;
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/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
similarity index 94%
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/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
index 9bfcefaa..2b4582c5 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosServerList.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.AbstractServerList;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import java.util.ArrayList;
import java.util.List;
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/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java
similarity index 91%
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/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java
index 7021fa7c..7a6a1225 100644
--- 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/com/alibaba/cloud/nacos/ribbon/RibbonNacosAutoConfiguration.java
@@ -14,12 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
+
+import com.alibaba.cloud.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.nacos.ConditionalOnNacosDiscoveryEnabled;
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
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/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..409c2720
--- /dev/null
+++ b/alibaba-nacos-discovery-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,8 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration,\
+ com.alibaba.cloud.nacos.ribbon.RibbonNacosAutoConfiguration,\
+ com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
+ com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration,\
+ com.alibaba.cloud.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+ com.alibaba.cloud.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration
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/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java
similarity index 94%
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/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java
index 12257f0a..3b3e18cb 100644
--- 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/com/alibaba/cloud/nacos/NacosDiscoveryClientTests.java
@@ -14,26 +14,26 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClient;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.alibaba.nacos.api.naming.pojo.ListView;
import org.junit.Test;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClient;
import org.springframework.cloud.client.ServiceInstance;
+import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
/**
* @author xiaojing
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java
similarity index 94%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java
index 8ec4c7b1..04a1d4aa 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpNetworkInterfaceTests.java
@@ -14,13 +14,17 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
import java.net.Inet4Address;
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
@@ -31,9 +35,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java
similarity index 90%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java
index 88c656e1..e7878822 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationIpTests.java
@@ -14,7 +14,11 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,9 +26,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java
similarity index 85%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java
index 5a2ce084..02d4b9e5 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationManagementPortTests.java
@@ -14,13 +14,17 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+
+import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH;
+import static com.alibaba.cloud.nacos.registry.NacosRegistration.MANAGEMENT_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_PORT;
-import static org.springframework.cloud.alibaba.nacos.registry.NacosRegistration.MANAGEMENT_CONTEXT_PATH;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,9 +32,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java
similarity index 90%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java
index ab76dc97..cb7ea4e1 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationPortTests.java
@@ -14,7 +14,11 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
+
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -27,9 +31,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java
similarity index 94%
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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java
index acd2cbb3..4f0b4b25 100644
--- 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/com/alibaba/cloud/nacos/registry/NacosAutoServiceRegistrationTests.java
@@ -14,10 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.registry;
+package com.alibaba.cloud.nacos.registry;
import java.util.Map;
+import com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
+import com.alibaba.cloud.nacos.endpoint.NacosDiscoveryEndpoint;
+
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,10 +30,6 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
-import org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpoint;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java
similarity index 92%
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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java
index 5117ce53..0506e0ad 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosRibbonClientConfigurationTests.java
@@ -1,4 +1,6 @@
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
+
+import com.alibaba.cloud.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import com.netflix.client.config.DefaultClientConfigImpl;
import com.netflix.client.config.IClientConfig;
@@ -6,7 +8,6 @@ import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.test.context.runner.WebApplicationContextRunner;
-import org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java
similarity index 96%
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/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java
index 2ce5f479..1c8baeda 100644
--- 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/com/alibaba/cloud/nacos/ribbon/NacosServerListTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.ribbon;
+package com.alibaba.cloud.nacos.ribbon;
import java.util.ArrayList;
import java.util.Collections;
@@ -22,19 +22,19 @@ import java.util.HashMap;
import java.util.List;
import java.util.stream.Collectors;
+import com.alibaba.cloud.nacos.NacosDiscoveryProperties;
import com.alibaba.nacos.api.naming.NamingService;
import com.alibaba.nacos.api.naming.pojo.Instance;
import com.netflix.client.config.IClientConfig;
import org.junit.Test;
-import org.springframework.cloud.alibaba.nacos.NacosDiscoveryProperties;
+import static com.alibaba.cloud.nacos.test.NacosMockTest.serviceInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alibaba.nacos.test.NacosMockTest.serviceInstance;
/**
* @author xiaojing
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/com/alibaba/cloud/nacos/test/CommonTestConfig.java
similarity index 95%
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/com/alibaba/cloud/nacos/test/CommonTestConfig.java
index 3f9d2860..7e7b51ab 100644
--- 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/com/alibaba/cloud/nacos/test/CommonTestConfig.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.test;
+package com.alibaba.cloud.nacos.test;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/nacos/test/NacosMockTest.java
similarity index 96%
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/com/alibaba/cloud/nacos/test/NacosMockTest.java
index 33efb8eb..f97870de 100644
--- 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/com/alibaba/cloud/nacos/test/NacosMockTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos.test;
+package com.alibaba.cloud.nacos.test;
import java.util.Map;
import java.util.UUID;
diff --git a/spring-cloud-alibaba-seata/pom.xml b/alibaba-seata-spring-cloud/pom.xml
similarity index 92%
rename from spring-cloud-alibaba-seata/pom.xml
rename to alibaba-seata-spring-cloud/pom.xml
index 947b0e26..75dfb063 100644
--- a/spring-cloud-alibaba-seata/pom.xml
+++ b/alibaba-seata-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-seata
- Spring Cloud Alibaba Seata
+ com.alibaba.cloud
+ alibaba-seata-spring-cloud
+ Alibaba Seata Spring Cloud
@@ -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/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
similarity index 97%
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/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
index c02f2d2d..4c28c58b 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/GlobalTransactionAutoConfiguration.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/GlobalTransactionAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata;
+package com.alibaba.cloud.seata;
import io.seata.spring.annotation.GlobalTransactionScanner;
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/com/alibaba/cloud/seata/SeataProperties.java
similarity index 95%
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/com/alibaba/cloud/seata/SeataProperties.java
index 2aea2745..492d054d 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/SeataProperties.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/SeataProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata;
+package com.alibaba.cloud.seata;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java
similarity index 96%
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/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java
index 17bafb7f..4218c767 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataBeanPostProcessor.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataBeanPostProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanPostProcessor;
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/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java
index b1eb00ef..e214bddd 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataContextBeanPostProcessor.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataContextBeanPostProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.BeanFactory;
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/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java
similarity index 94%
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/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java
index 4e312011..0855e358 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignBuilder.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.factory.BeanFactory;
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/com/alibaba/cloud/seata/feign/SeataFeignClient.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/SeataFeignClient.java
index cf71842d..5dcd1320 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClient.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import java.io.IOException;
import java.util.ArrayList;
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/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
similarity index 98%
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/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
index 030b6b94..3602e23d 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignClientAutoConfiguration.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignClientAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
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/com/alibaba/cloud/seata/feign/SeataFeignContext.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/SeataFeignContext.java
index c90ac4d4..705bff8c 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignContext.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignContext.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import java.util.HashMap;
import java.util.Map;
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/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java
index 4c416e24..39e99852 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataFeignObjectWrapper.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataFeignObjectWrapper.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
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/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java
similarity index 94%
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/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java
index 61a27b84..08c9d5a8 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataHystrixFeignBuilder.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataHystrixFeignBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import feign.Retryer;
import feign.hystrix.HystrixFeign;
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/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
index 598d1a28..373bad1a 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataLoadBalancerFeignClient.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataLoadBalancerFeignClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import java.io.IOException;
import java.util.ArrayList;
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/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java
similarity index 88%
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/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java
index 166b2788..51d226eb 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/feign/SeataSentinelFeignBuilder.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/feign/SeataSentinelFeignBuilder.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign;
+package com.alibaba.cloud.seata.feign;
import org.springframework.beans.factory.BeanFactory;
import feign.Feign;
import feign.Retryer;
-import org.springframework.cloud.alibaba.sentinel.feign.SentinelFeign;
+import com.alibaba.cloud.sentinel.feign.SentinelFeign;
/**
* @author xiaojing
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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
similarity index 94%
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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
index 686acb05..465ca3e6 100644
--- 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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixAutoConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign.hystrix;
+package com.alibaba.cloud.seata.feign.hystrix;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
similarity index 97%
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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
index 349447b8..b2494fba 100644
--- 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/com/alibaba/cloud/seata/feign/hystrix/SeataHystrixConcurrencyStrategy.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.feign.hystrix;
+package com.alibaba.cloud.seata.feign.hystrix;
import java.util.concurrent.Callable;
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/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java
similarity index 97%
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/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java
index c08a55ad..ec5f7e2c 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateAutoConfiguration.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateAutoConfiguration.java
@@ -29,7 +29,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.rest;
+package com.alibaba.cloud.seata.rest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
similarity index 96%
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/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
index b353235c..97680aa0 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/rest/SeataRestTemplateInterceptor.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/rest/SeataRestTemplateInterceptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.rest;
+package com.alibaba.cloud.seata.rest;
import java.io.IOException;
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/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
similarity index 98%
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/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
index ed1db9a1..6dab36cf 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptor.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.web;
+package com.alibaba.cloud.seata.web;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
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/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
similarity index 95%
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/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
index bc0ce563..51757bf4 100644
--- a/spring-cloud-alibaba-seata/src/main/java/org/springframework/cloud/alibaba/seata/web/SeataHandlerInterceptorConfiguration.java
+++ b/alibaba-seata-spring-cloud/src/main/java/com/alibaba/cloud/seata/web/SeataHandlerInterceptorConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.seata.web;
+package com.alibaba.cloud.seata.web;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
diff --git a/alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..ae993684
--- /dev/null
+++ b/alibaba-seata-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,7 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.seata.rest.SeataRestTemplateAutoConfiguration,\
+com.alibaba.cloud.seata.web.SeataHandlerInterceptorConfiguration,\
+com.alibaba.cloud.seata.GlobalTransactionAutoConfiguration,\
+com.alibaba.cloud.seata.feign.SeataFeignClientAutoConfiguration,\
+com.alibaba.cloud.seata.feign.hystrix.SeataHystrixAutoConfiguration
+
diff --git a/spring-cloud-alibaba-sentinel-datasource/pom.xml b/alibaba-sentinel-datasource-spring-cloud/pom.xml
similarity index 94%
rename from spring-cloud-alibaba-sentinel-datasource/pom.xml
rename to alibaba-sentinel-datasource-spring-cloud/pom.xml
index 6dfee847..afacb9da 100644
--- a/spring-cloud-alibaba-sentinel-datasource/pom.xml
+++ b/alibaba-sentinel-datasource-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-sentinel-datasource
- Spring Cloud Alibaba Sentinel DataSource
+ com.alibaba.cloud
+ alibaba-sentinel-datasource-spring-cloud
+ Alibaba Sentinel DataSource Spring Cloud
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/com/alibaba/cloud/sentinel/datasource/RuleType.java
similarity index 71%
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/com/alibaba/cloud/sentinel/datasource/RuleType.java
index b1afad56..202f91d3 100644
--- 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/com/alibaba/cloud/sentinel/datasource/RuleType.java
@@ -1,9 +1,26 @@
-package org.springframework.cloud.alibaba.sentinel.datasource;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource;
import java.util.Arrays;
import java.util.Optional;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties;
import org.springframework.util.StringUtils;
import com.alibaba.csp.sentinel.slots.block.AbstractRule;
diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java
new file mode 100644
index 00000000..b762f23b
--- /dev/null
+++ b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/SentinelDataSourceConstants.java
@@ -0,0 +1,27 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource;
+
+/**
+ * @author Jim
+ */
+public interface SentinelDataSourceConstants {
+
+ String PROPERTY_PREFIX = "spring.cloud.sentinel";
+
+}
diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java
new file mode 100644
index 00000000..e60e2323
--- /dev/null
+++ b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/config/AbstractDataSourceProperties.java
@@ -0,0 +1,125 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
+
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.NotNull;
+
+import org.springframework.core.env.Environment;
+
+import com.alibaba.cloud.sentinel.datasource.RuleType;
+import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager;
+import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager;
+import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
+import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
+import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * Abstract class Using by {@link DataSourcePropertiesConfiguration}
+ *
+ * @author Jim
+ */
+public class AbstractDataSourceProperties {
+
+ @NotEmpty
+ private String dataType = "json";
+ @NotNull
+ private RuleType ruleType;
+ private String converterClass;
+ @JsonIgnore
+ private final String factoryBeanName;
+ @JsonIgnore
+ private Environment env;
+
+ public AbstractDataSourceProperties(String factoryBeanName) {
+ this.factoryBeanName = factoryBeanName;
+ }
+
+ public String getDataType() {
+ return dataType;
+ }
+
+ public void setDataType(String dataType) {
+ this.dataType = dataType;
+ }
+
+ public RuleType getRuleType() {
+ return ruleType;
+ }
+
+ public void setRuleType(RuleType ruleType) {
+ this.ruleType = ruleType;
+ }
+
+ public String getConverterClass() {
+ return converterClass;
+ }
+
+ public void setConverterClass(String converterClass) {
+ this.converterClass = converterClass;
+ }
+
+ public String getFactoryBeanName() {
+ return factoryBeanName;
+ }
+
+ protected Environment getEnv() {
+ return env;
+ }
+
+ public void setEnv(Environment env) {
+ this.env = env;
+ }
+
+ public void preCheck(String dataSourceName) {
+
+ }
+
+ public void postRegister(AbstractDataSource dataSource) {
+ switch (this.getRuleType()) {
+ case FLOW:
+ FlowRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case DEGRADE:
+ DegradeRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case PARAM_FLOW:
+ ParamFlowRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case SYSTEM:
+ SystemRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case AUTHORITY:
+ AuthorityRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case GW_FLOW:
+ GatewayRuleManager.register2Property(dataSource.getProperty());
+ break;
+ case GW_API_GROUP:
+ GatewayApiDefinitionManager.register2Property(dataSource.getProperty());
+ break;
+ default:
+ break;
+ }
+ }
+}
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/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java
similarity index 52%
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/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java
index 5ee8f420..6a66e713 100644
--- 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/com/alibaba/cloud/sentinel/datasource/config/ApolloDataSourceProperties.java
@@ -1,8 +1,25 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
import javax.validation.constraints.NotEmpty;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
/**
* Apollo Properties class Using by {@link DataSourcePropertiesConfiguration} and
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/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java
similarity index 75%
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/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java
index a3220863..f922ebe3 100644
--- 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/com/alibaba/cloud/sentinel/datasource/config/DataSourcePropertiesConfiguration.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
import java.util.Arrays;
import java.util.List;
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/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java
similarity index 63%
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/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java
index 8f3c32d0..f5a6e99c 100644
--- 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/com/alibaba/cloud/sentinel/datasource/config/FileDataSourceProperties.java
@@ -1,10 +1,28 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
import java.io.IOException;
import javax.validation.constraints.NotEmpty;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+
import org.springframework.util.ResourceUtils;
import org.springframework.util.StringUtils;
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/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java
similarity index 67%
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/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java
index 12c6e7f7..0cced95a 100644
--- 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/com/alibaba/cloud/sentinel/datasource/config/NacosDataSourceProperties.java
@@ -1,8 +1,26 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
import javax.validation.constraints.NotEmpty;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+
import org.springframework.util.StringUtils;
/**
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/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java
similarity index 59%
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/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java
index 7bbece26..03b1c024 100644
--- 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/com/alibaba/cloud/sentinel/datasource/config/ZookeeperDataSourceProperties.java
@@ -1,6 +1,24 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.config;
+
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
import org.springframework.util.StringUtils;
/**
diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java
new file mode 100644
index 00000000..4951af54
--- /dev/null
+++ b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/JsonConverter.java
@@ -0,0 +1,45 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.converter;
+
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
+import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
+import com.alibaba.csp.sentinel.slots.system.SystemRule;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+/**
+ * Convert sentinel rules for json array Using strict mode to parse json
+ *
+ * @author Jim
+ * @see FlowRule
+ * @see DegradeRule
+ * @see SystemRule
+ * @see AuthorityRule
+ * @see ParamFlowRule
+ * @see ObjectMapper
+ */
+public class JsonConverter extends SentinelConverter {
+
+ public JsonConverter(ObjectMapper objectMapper, Class ruleClass) {
+ super(objectMapper, ruleClass);
+ }
+
+}
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/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java
similarity index 79%
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/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java
index 3037b8c1..095297d8 100644
--- 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/com/alibaba/cloud/sentinel/datasource/converter/SentinelConverter.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.converter;
import java.util.ArrayList;
import java.util.Collection;
@@ -9,9 +26,9 @@ import java.util.Optional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
import org.springframework.util.StringUtils;
+import com.alibaba.cloud.sentinel.datasource.RuleType;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
diff --git a/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java
new file mode 100644
index 00000000..ec22d77e
--- /dev/null
+++ b/alibaba-sentinel-datasource-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/datasource/converter/XmlConverter.java
@@ -0,0 +1,46 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.converter;
+
+import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
+import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
+import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
+import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
+import com.alibaba.csp.sentinel.slots.system.SystemRule;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.dataformat.xml.XmlMapper;
+
+/**
+ * Convert sentinel rules for xml array Using strict mode to parse xml
+ *
+ * @author Jim
+ * @see FlowRule
+ * @see DegradeRule
+ * @see SystemRule
+ * @see AuthorityRule
+ * @see ParamFlowRule
+ * @see ObjectMapper
+ */
+public class XmlConverter extends SentinelConverter {
+
+ public XmlConverter(XmlMapper xmlMapper, Class ruleClass) {
+ super(xmlMapper, ruleClass);
+ }
+
+}
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/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java
similarity index 63%
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/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java
index ef616096..b83d48e7 100644
--- 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/com/alibaba/cloud/sentinel/datasource/factorybean/ApolloDataSourceFactoryBean.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.factorybean;
import org.springframework.beans.factory.FactoryBean;
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/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java
similarity index 67%
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/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java
index 13c3830b..a0b3ff65 100644
--- 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/com/alibaba/cloud/sentinel/datasource/factorybean/FileRefreshableDataSourceFactoryBean.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.factorybean;
import java.io.File;
import java.nio.charset.Charset;
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/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java
similarity index 74%
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/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java
index 7d4e65b4..40596c54 100644
--- 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/com/alibaba/cloud/sentinel/datasource/factorybean/NacosDataSourceFactoryBean.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.factorybean;
import java.util.Properties;
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/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java
similarity index 66%
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/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java
index ae7142c0..c84473f7 100644
--- 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/com/alibaba/cloud/sentinel/datasource/factorybean/ZookeeperDataSourceFactoryBean.java
@@ -1,4 +1,21 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.factorybean;
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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 com.alibaba.cloud.sentinel.datasource.factorybean;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.FactoryBean;
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/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java
similarity index 90%
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/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java
index bc210f2f..730d3855 100644
--- 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/com/alibaba/cloud/sentinel/datasource/ApolloDataSourceFactoryBeanTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.datasource.apollo.ApolloDataSource;
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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java
similarity index 94%
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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java
index 542622ec..d2939d25 100644
--- 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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesConfigurationTests.java
@@ -14,18 +14,19 @@
// * limitations under the License.
// */
//
-//package org.springframework.cloud.alibaba.sentinel.datasource;
+//package com.alibaba.cloud.sentinel.datasource;
+//
+//import com.alibaba.cloud.sentinel.datasource.config.ApolloDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration;
+//import com.alibaba.cloud.sentinel.datasource.config.FileDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;
+//import com.alibaba.cloud.sentinel.datasource.config.ZookeeperDataSourceProperties;
//
//import static org.junit.Assert.assertEquals;
//import static org.junit.Assert.assertNotNull;
//import static org.junit.Assert.assertNull;
//
//import org.junit.Test;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
-//import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties;
//
///**
// * @author Jim
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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java
similarity index 91%
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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java
index d1e6960d..8292b57f 100644
--- 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/com/alibaba/cloud/sentinel/datasource/DataSourcePropertiesTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
@@ -25,15 +25,15 @@ import java.util.List;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.ApolloDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.FileDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.ZookeeperDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
import org.springframework.util.ResourceUtils;
import org.springframework.util.StringUtils;
+import com.alibaba.cloud.sentinel.datasource.config.ApolloDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.FileDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.config.ZookeeperDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ApolloDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.datasource.FileRefreshableDataSource;
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
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/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java
similarity index 95%
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/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java
index 3e95d240..10f91dc5 100644
--- 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/com/alibaba/cloud/sentinel/datasource/FileRefreshableDataSourceFactoryBeanTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,7 +26,7 @@ import java.util.List;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.factorybean.FileRefreshableDataSourceFactoryBean;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java
similarity index 94%
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/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java
index e724278c..3fbf1060 100644
--- 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/com/alibaba/cloud/sentinel/datasource/NacosDataSourceFactoryBeanTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.SentinelConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.converter.SentinelConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.datasource.nacos.NacosDataSource;
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/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java
similarity index 91%
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/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java
index fd2a157c..2064ce81 100644
--- 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/com/alibaba/cloud/sentinel/datasource/NacosDataSourcePropertiesTests.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
+
+import com.alibaba.cloud.sentinel.datasource.config.NacosDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.NacosDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.NacosDataSourceFactoryBean;
/**
* @author Jim
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/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java
similarity index 98%
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/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java
index a540ab86..4eea620a 100644
--- 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/com/alibaba/cloud/sentinel/datasource/RuleTypeTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
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/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java
similarity index 95%
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/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java
index c4ffdc3b..e909b751 100644
--- 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/com/alibaba/cloud/sentinel/datasource/SentinelConverterTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
@@ -23,11 +23,11 @@ import java.util.List;
import org.apache.commons.io.FileUtils;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
import org.springframework.util.ResourceUtils;
import org.springframework.util.StringUtils;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
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/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java
similarity index 93%
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/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java
index df7158ce..813b4053 100644
--- 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/com/alibaba/cloud/sentinel/datasource/ZookeeperDataSourceFactoryBeanTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.sentinel.datasource;
import static org.junit.Assert.assertEquals;
import static org.mockito.Mockito.doReturn;
@@ -23,9 +23,9 @@ import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import org.junit.Test;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
+import com.alibaba.cloud.sentinel.datasource.factorybean.ZookeeperDataSourceFactoryBean;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.datasource.zookeeper.ZookeeperDataSource;
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 87%
rename from spring-cloud-alibaba-sentinel-gateway/pom.xml
rename to alibaba-sentinel-gateway-spring-cloud/pom.xml
index 498e370b..185c6258 100644
--- a/spring-cloud-alibaba-sentinel-gateway/pom.xml
+++ b/alibaba-sentinel-gateway-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">
+ 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
- Spring Cloud Alibaba Sentinel Gateway
+ com.alibaba.cloud
+ alibaba-sentinel-gateway-spring-cloud
+ Alibaba Sentinel Gateway Spring Cloud
@@ -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/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java
similarity index 94%
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/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java
index e3766d88..edbb6df4 100644
--- 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/com/alibaba/cloud/sentinel/gateway/ConfigConstants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway;
+package com.alibaba.cloud.sentinel.gateway;
/**
* @author Jim
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/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java
similarity index 97%
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/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java
index 5899c1e9..9d910a0a 100644
--- 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/com/alibaba/cloud/sentinel/gateway/FallbackProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway;
+package com.alibaba.cloud.sentinel.gateway;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
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/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java
index 223ff526..aed4fa2b 100644
--- 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/com/alibaba/cloud/sentinel/gateway/SentinelGatewayAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway;
+package com.alibaba.cloud.sentinel.gateway;
import java.io.IOException;
import java.util.HashMap;
@@ -24,8 +24,8 @@ import java.util.Map.Entry;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java
similarity index 84%
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/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java
index cfbdf9ab..46b5bb07 100644
--- 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/com/alibaba/cloud/sentinel/gateway/scg/SentinelGatewayProperties.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway.scg;
+package com.alibaba.cloud.sentinel.gateway.scg;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import org.springframework.cloud.alibaba.sentinel.gateway.ConfigConstants;
-import org.springframework.cloud.alibaba.sentinel.gateway.FallbackProperties;
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
/**
* @author Jim
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/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
index 393e63cc..9b5c4115 100644
--- 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/com/alibaba/cloud/sentinel/gateway/scg/SentinelSCGAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway.scg;
+package com.alibaba.cloud.sentinel.gateway.scg;
import static org.springframework.web.reactive.function.BodyInserters.fromObject;
@@ -32,8 +32,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.gateway.ConfigConstants;
-import org.springframework.cloud.alibaba.sentinel.gateway.FallbackProperties;
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.FallbackProperties;
import org.springframework.cloud.gateway.filter.GlobalFilter;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java
similarity index 95%
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/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java
index be27b988..9f9074e6 100644
--- 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/com/alibaba/cloud/sentinel/gateway/zuul/FallBackProviderHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.gateway.zuul;
+package com.alibaba.cloud.sentinel.gateway.zuul;
import java.util.Map;
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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java
index 0867df6a..0e6ca95b 100644
--- 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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway.zuul;
+package com.alibaba.cloud.sentinel.gateway.zuul;
import java.util.Optional;
@@ -28,7 +28,7 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java
similarity index 93%
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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java
index 102baae8..709612a8 100644
--- 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/com/alibaba/cloud/sentinel/gateway/zuul/SentinelZuulProperties.java
@@ -14,11 +14,11 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.gateway.zuul;
+package com.alibaba.cloud.sentinel.gateway.zuul;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.boot.context.properties.NestedConfigurationProperty;
-import org.springframework.cloud.alibaba.sentinel.gateway.ConfigConstants;
+import com.alibaba.cloud.sentinel.gateway.ConfigConstants;
import com.alibaba.csp.sentinel.adapter.gateway.zuul.constants.ZuulConstant;
import com.alibaba.csp.sentinel.adapter.gateway.zuul.filters.SentinelZuulErrorFilter;
diff --git a/alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..d4c02887
--- /dev/null
+++ b/alibaba-sentinel-gateway-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,4 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.sentinel.gateway.zuul.SentinelZuulAutoConfiguration,\
+com.alibaba.cloud.sentinel.gateway.scg.SentinelSCGAutoConfiguration,\
+com.alibaba.cloud.sentinel.gateway.SentinelGatewayAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel/pom.xml b/alibaba-sentinel-spring-cloud/pom.xml
similarity index 94%
rename from spring-cloud-alibaba-sentinel/pom.xml
rename to alibaba-sentinel-spring-cloud/pom.xml
index 77c69e6a..b84b4124 100644
--- a/spring-cloud-alibaba-sentinel/pom.xml
+++ b/alibaba-sentinel-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-sentinel
- Spring Cloud Alibaba Sentinel
+ com.alibaba.cloud
+ alibaba-sentinel-spring-cloud
+ Alibaba Sentinel Spring Cloud
@@ -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/com/alibaba/cloud/sentinel/SentinelConstants.java
similarity index 94%
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/com/alibaba/cloud/sentinel/SentinelConstants.java
index 0c2a9d09..921458e3 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelConstants.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelConstants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
/**
* @author fangjian
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/com/alibaba/cloud/sentinel/SentinelProperties.java
similarity index 97%
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/com/alibaba/cloud/sentinel/SentinelProperties.java
index 68cedb64..7390c508 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelProperties.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelProperties.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import java.util.List;
import java.util.Map;
import java.util.TreeMap;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.DataSourcePropertiesConfiguration;
+import com.alibaba.cloud.sentinel.datasource.config.DataSourcePropertiesConfiguration;
import org.springframework.core.Ordered;
import org.springframework.validation.annotation.Validated;
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/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java
similarity index 98%
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/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java
index 37d77137..dadb235f 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebAutoConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import java.util.ArrayList;
import java.util.List;
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/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java
similarity index 98%
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/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java
index f36f326e..86a6bcbc 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/SentinelWebFluxAutoConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/SentinelWebFluxAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import java.util.Collections;
import java.util.List;
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/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java
similarity index 94%
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/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java
index da1a3c26..2638ee33 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/annotation/SentinelRestTemplate.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/annotation/SentinelRestTemplate.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.annotation;
+package com.alibaba.cloud.sentinel.annotation;
import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
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/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java
similarity index 96%
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/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java
index 42eeca3c..1e5d6c8b 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/BlockClassRegistry.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/BlockClassRegistry.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import java.lang.reflect.Method;
import java.util.Map;
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/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
index 55bddf6c..25fc3665 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelAutoConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import javax.annotation.PostConstruct;
@@ -25,9 +25,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java
similarity index 97%
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/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java
index 26641002..edd33c40 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelBeanPostProcessor.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelBeanPostProcessor.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import java.lang.reflect.Method;
import java.util.Arrays;
@@ -28,8 +28,8 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.beans.factory.support.MergedBeanDefinitionPostProcessor;
import org.springframework.beans.factory.support.RootBeanDefinition;
-import org.springframework.cloud.alibaba.sentinel.SentinelConstants;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.SentinelConstants;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
import org.springframework.context.ApplicationContext;
import org.springframework.core.type.StandardMethodMetadata;
import org.springframework.core.type.classreading.MethodMetadataReadingVisitor;
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/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java
similarity index 78%
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/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java
index f8d61034..526719bc 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelCircuitBreakerConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelCircuitBreakerConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java
similarity index 94%
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/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java
index f1dd0cfc..47dbb6b1 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelDataSourceHandler.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelDataSourceHandler.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import java.lang.reflect.Field;
import java.util.Arrays;
@@ -12,10 +12,10 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.SmartInitializingSingleton;
import org.springframework.beans.factory.support.BeanDefinitionBuilder;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.config.AbstractDataSourceProperties;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.JsonConverter;
-import org.springframework.cloud.alibaba.sentinel.datasource.converter.XmlConverter;
+import com.alibaba.cloud.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.datasource.config.AbstractDataSourceProperties;
+import com.alibaba.cloud.sentinel.datasource.converter.JsonConverter;
+import com.alibaba.cloud.sentinel.datasource.converter.XmlConverter;
import org.springframework.core.env.Environment;
import org.springframework.util.ReflectionUtils;
import org.springframework.util.StringUtils;
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/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java
similarity index 96%
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/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java
index dc69efbb..d79d223c 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/custom/SentinelProtectInterceptor.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/custom/SentinelProtectInterceptor.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.custom;
+package com.alibaba.cloud.sentinel.custom;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.net.URI;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
import org.springframework.http.client.ClientHttpRequestInterceptor;
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/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java
similarity index 96%
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/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java
index 9562fdc0..8710b836 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpoint.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpoint.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
import java.util.HashMap;
import java.util.Map;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.SentinelProperties;
import com.alibaba.csp.sentinel.adapter.servlet.config.WebServletConfig;
import com.alibaba.csp.sentinel.config.SentinelConfig;
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/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
similarity index 93%
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/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
index 9af7be97..9ac50f67 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelEndpointAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
@@ -23,7 +23,7 @@ import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.SentinelProperties;
import org.springframework.context.annotation.Bean;
/**
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/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java
similarity index 97%
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/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java
index 8ca863ab..a50a7d11 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicator.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicator.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
import com.alibaba.csp.sentinel.heartbeat.HeartbeatSenderProvider;
@@ -25,7 +25,7 @@ import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.HealthIndicator;
import org.springframework.boot.actuate.health.Status;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.SentinelProperties;
import org.springframework.util.StringUtils;
import java.util.HashMap;
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/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
similarity index 96%
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/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
index e1a43d2e..b83fbfd9 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelContractHolder.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelContractHolder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
import java.util.HashMap;
import java.util.List;
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/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
similarity index 98%
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/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
index 863c0d4a..b869f844 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeign.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeign.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationHandler;
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/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java
index 1ed20e1b..9989c996 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelFeignAutoConfiguration.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelFeignAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
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/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
similarity index 98%
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/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
index 7e7614e8..df68afb2 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/feign/SentinelInvocationHandler.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/feign/SentinelInvocationHandler.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.feign;
+package com.alibaba.cloud.sentinel.feign;
import static feign.Util.checkNotNull;
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/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java
similarity index 90%
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/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java
index 0d4d42c7..05cb98a9 100644
--- a/spring-cloud-alibaba-sentinel/src/main/java/org/springframework/cloud/alibaba/sentinel/rest/SentinelClientHttpResponse.java
+++ b/alibaba-sentinel-spring-cloud/src/main/java/com/alibaba/cloud/sentinel/rest/SentinelClientHttpResponse.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.rest;
+package com.alibaba.cloud.sentinel.rest;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelProtectInterceptor;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelProtectInterceptor;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
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/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories b/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..9ce988d8
--- /dev/null
+++ b/alibaba-sentinel-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,9 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.sentinel.SentinelWebAutoConfiguration,\
+com.alibaba.cloud.sentinel.SentinelWebFluxAutoConfiguration,\
+com.alibaba.cloud.sentinel.endpoint.SentinelEndpointAutoConfiguration,\
+com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration,\
+com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration
+
+org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
+com.alibaba.cloud.sentinel.custom.SentinelCircuitBreakerConfiguration
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/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java
similarity index 97%
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/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java
index 555097a6..15383f41 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelAutoConfigurationTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelAutoConfigurationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import static org.assertj.core.api.Assertions.assertThatExceptionOfType;
import static org.junit.Assert.assertEquals;
@@ -34,11 +34,11 @@ import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelBeanPostProcessor;
-import org.springframework.cloud.alibaba.sentinel.endpoint.SentinelEndpoint;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor;
+import com.alibaba.cloud.sentinel.endpoint.SentinelEndpoint;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpRequest;
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/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java
similarity index 96%
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/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java
index ed24c33f..09c886fa 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelBeanAutowiredTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelBeanAutowiredTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import com.alibaba.csp.sentinel.adapter.servlet.callback.RequestOriginParser;
import com.alibaba.csp.sentinel.adapter.servlet.callback.UrlBlockHandler;
@@ -28,7 +28,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java
similarity index 92%
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/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java
index 1c3be389..b8331ba7 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelDataSourceTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelDataSourceTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration;
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
+import com.alibaba.cloud.sentinel.custom.SentinelAutoConfiguration;
+import com.alibaba.cloud.sentinel.datasource.RuleType;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
@@ -52,7 +52,7 @@ import static org.junit.Assert.assertNull;
"spring.cloud.sentinel.datasource.ds5.file.file=classpath: param-flow.json",
"spring.cloud.sentinel.datasource.ds5.file.data-type=custom",
- "spring.cloud.sentinel.datasource.ds5.file.converter-class=org.springframework.cloud.alibaba.sentinel.TestConverter",
+ "spring.cloud.sentinel.datasource.ds5.file.converter-class=com.alibaba.cloud.sentinel.TestConverter",
"spring.cloud.sentinel.datasource.ds5.file.rule-type=param-flow" })
public class SentinelDataSourceTests {
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/com/alibaba/cloud/sentinel/SentinelFeignTests.java
similarity index 97%
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/com/alibaba/cloud/sentinel/SentinelFeignTests.java
index accd536f..290c1c4e 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelFeignTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelFeignTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import com.alibaba.csp.sentinel.slots.block.RuleConstant;
import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
@@ -26,7 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alibaba.sentinel.feign.SentinelFeignAutoConfiguration;
+import com.alibaba.cloud.sentinel.feign.SentinelFeignAutoConfiguration;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java
similarity index 97%
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/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java
index 43b0b43d..3b13d4d9 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/SentinelRestTemplateTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/SentinelRestTemplateTests.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import com.alibaba.csp.sentinel.slots.block.BlockException;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
-import org.springframework.cloud.alibaba.sentinel.custom.SentinelBeanPostProcessor;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.custom.SentinelBeanPostProcessor;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
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/com/alibaba/cloud/sentinel/TestConverter.java
similarity index 96%
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/com/alibaba/cloud/sentinel/TestConverter.java
index 43012442..771b3dc5 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/TestConverter.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/TestConverter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel;
+package com.alibaba.cloud.sentinel;
import com.alibaba.csp.sentinel.datasource.Converter;
import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
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/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java
similarity index 98%
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/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java
index 6245c4a1..21854467 100644
--- a/spring-cloud-alibaba-sentinel/src/test/java/org/springframework/cloud/alibaba/sentinel/endpoint/SentinelHealthIndicatorTests.java
+++ b/alibaba-sentinel-spring-cloud/src/test/java/com/alibaba/cloud/sentinel/endpoint/SentinelHealthIndicatorTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.endpoint;
+package com.alibaba.cloud.sentinel.endpoint;
import com.alibaba.csp.sentinel.config.SentinelConfig;
import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
@@ -27,7 +27,7 @@ import org.junit.Test;
import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.boot.actuate.health.Health;
import org.springframework.boot.actuate.health.Status;
-import org.springframework.cloud.alibaba.sentinel.SentinelProperties;
+import com.alibaba.cloud.sentinel.SentinelProperties;
import org.springframework.util.ReflectionUtils;
import java.lang.reflect.Field;
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 1fc4be42..1bd5c9c8 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/alibaba-spring-cloud-dependencies/pom.xml
@@ -10,17 +10,18 @@
- 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
+ Alibaba Spring Cloud Dependencies
+ BOM for Spring Cloud Alibaba Dependencies
1.6.2
3.1.0
0.5.2
- 1.0.1
+ 1.1.1
0.8.0
1.0.9
1.0.1
@@ -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 55%
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 85cb1ca4..48f432e7 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
- Spring Cloud Starter Alibaba Nacos Config Server
+ alibaba-nacos-config-server-spring-cloud-starter
+ Alibaba Nacos Config Server Spring Cloud Starter
- 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 55%
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 7dc1bb0d..1ca97dab 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
- Spring Cloud Starter Alibaba Nacos Config
+ alibaba-nacos-config-spring-cloud-starter
+ Alibaba Nacos Config Spring Cloud Starter
- 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 55%
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 9bccd45c..048145b2 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
- Spring Cloud Starter Alibaba Nacos Discovery
+ alibaba-nacos-discovery-spring-cloud-starter
+ Alibaba Nacos Discovery Spring Cloud Starter
- 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 54%
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 bc4eb0b6..e405165b 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
- Spring Cloud Starter Alibaba Seata
+ alibaba-seata-spring-cloud-starter
+ Alibaba Seata Spring Cloud Starter
- 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 54%
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 24c53c67..5d5159c7 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
- Spring Cloud Starter Alibaba Sentinel
+ alibaba-sentinel-spring-cloud-starter
+ Alibaba Sentinel Spring Cloud Starter
- 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 60%
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 5afd8801..e3a77c50 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
- Spring Cloud Starter Dubbo
+ com.alibaba.cloud
+ dubbo-spring-cloud-starter
+ Dubbo Spring Cloud Starter
${project.groupId}
- spring-cloud-alibaba-dubbo
+ alibaba-dubbo-spring-cloud
${project.version}
diff --git a/alibaba-spring-cloud-starter/pom.xml b/alibaba-spring-cloud-starter/pom.xml
new file mode 100644
index 00000000..4da374c5
--- /dev/null
+++ b/alibaba-spring-cloud-starter/pom.xml
@@ -0,0 +1,24 @@
+
+ 4.0.0
+
+ com.alibaba.cloud
+ spring-cloud-alibaba
+ 0.9.1.BUILD-SNAPSHOT
+ ../pom.xml
+
+ alibaba-spring-cloud-starter
+ pom
+ Alibaba Spring Cloud Starters
+ Alibaba Spring Cloud Starters
+
+ 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 61%
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 8d6b9c23..106a0aee 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
- Spring Cloud Alibaba Bus RocketMQ
+ com.alibaba.cloud
+ rocketmq-spring-cloud-starter-bus
+ RocketMQ Spring Cloud Starter Bus
- 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/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java
similarity index 98%
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/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java
index 093dce41..4895741c 100644
--- 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/com/alibaba/cloud/bus/rocketmq/env/RocketMQBusEnvironmentPostProcessor.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.bus.rocketmq.env;
+package com.alibaba.cloud.bus.rocketmq.env;
import static org.springframework.cloud.bus.SpringCloudBusClient.INPUT;
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 51%
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
index c5a9fb95..9f26c6c5 100644
--- 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
@@ -1,3 +1,3 @@
# EnvironmentPostProcessor
org.springframework.boot.env.EnvironmentPostProcessor=\
-org.springframework.cloud.bus.rocketmq.env.RocketMQBusEnvironmentPostProcessor
\ No newline at end of file
+com.alibaba.cloud.bus.rocketmq.env.RocketMQBusEnvironmentPostProcessor
\ No newline at end of file
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml
similarity index 54%
rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml
rename to alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml
index ce6c184d..7abf2dfb 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-acm/pom.xml
+++ b/alibaba-spring-cloud-starter/rocketmq-spring-cloud-starter-stream/pom.xml
@@ -3,17 +3,17 @@
4.0.0
- org.springframework.cloud
- spring-cloud-starter-alicloud
+ com.alibaba.cloud
+ alibaba-spring-cloud-starter
0.9.1.BUILD-SNAPSHOT
- spring-cloud-starter-alicloud-acm
- Spring Cloud Starter Alibaba Cloud ACM
+ rocketmq-spring-cloud-starter-stream
+ RocketMQ Spring Cloud Starter Stream
- org.springframework.cloud
- spring-cloud-alicloud-acm
+ com.alibaba.cloud
+ rocketmq-spring-cloud-stream-binder
diff --git a/spring-cloud-alicloud-acm/pom.xml b/alicloud-acm-spring-cloud/pom.xml
similarity index 92%
rename from spring-cloud-alicloud-acm/pom.xml
rename to alicloud-acm-spring-cloud/pom.xml
index d5092b4b..468a2e80 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
- Spring Cloud Alibaba Cloud ACM
+ alicloud-acm-spring-cloud
+ Alibaba Cloud ACM Spring Cloud
- 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/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
similarity index 88%
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/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
index 9599decb..7541570a 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
import org.springframework.beans.BeansException;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.alicloud.acm.refresh.AcmContextRefresher;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.acm.refresh.AcmContextRefresher;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
import org.springframework.cloud.context.refresh.ContextRefresher;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
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/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java
similarity index 94%
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/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java
index 42b84c89..c6cd6ed9 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/AcmPropertySourceRepository.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/AcmPropertySourceRepository.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
import org.springframework.context.ApplicationContext;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.env.CompositePropertySource;
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java
similarity index 95%
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java
index fb7b58ad..461d1a85 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySource.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.bootstrap;
+package com.alibaba.alicloud.acm.bootstrap;
import org.springframework.core.env.MapPropertySource;
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
similarity index 98%
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
index b4a96a3e..2805d15c 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceBuilder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.bootstrap;
+package com.alibaba.alicloud.acm.bootstrap;
import com.alibaba.edas.acm.ConfigService;
import com.alibaba.edas.acm.exception.ConfigException;
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
similarity index 94%
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/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
index 62ded421..d9295480 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/bootstrap/AcmPropertySourceLocator.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.bootstrap;
+package com.alibaba.alicloud.acm.bootstrap;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
import org.springframework.cloud.bootstrap.config.PropertySourceLocator;
import org.springframework.core.env.CompositePropertySource;
import org.springframework.core.env.Environment;
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/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java
similarity index 87%
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/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java
index 6952fa89..79b9a0ee 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpoint.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpoint.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmProperties;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
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/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
similarity index 87%
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/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
index a2f7d312..3eb87912 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointAutoConfiguration.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmProperties;
import org.springframework.context.annotation.Bean;
/**
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/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java
similarity index 88%
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/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java
index c6052ae1..3101ca6b 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/endpoint/AcmHealthIndicator.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/endpoint/AcmHealthIndicator.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
import com.alibaba.edas.acm.ConfigService;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySource;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySource;
+import com.alibaba.alicloud.context.acm.AcmProperties;
import org.springframework.util.StringUtils;
import java.util.ArrayList;
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/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java
similarity index 95%
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/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java
index 59883bb8..dfcec950 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmContextRefresher.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmContextRefresher.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.refresh;
+package com.alibaba.alicloud.acm.refresh;
import com.alibaba.edas.acm.ConfigService;
import com.alibaba.edas.acm.listener.ConfigChangeListener;
@@ -23,8 +23,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
import org.springframework.cloud.context.refresh.ContextRefresher;
import org.springframework.cloud.endpoint.event.RefreshEvent;
import org.springframework.context.ApplicationContext;
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/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java
similarity index 96%
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/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java
index 19197b89..f974dd65 100644
--- a/spring-cloud-alicloud-acm/src/main/java/org/springframework/cloud/alicloud/acm/refresh/AcmRefreshHistory.java
+++ b/alicloud-acm-spring-cloud/src/main/java/com/alibaba/alicloud/acm/refresh/AcmRefreshHistory.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.refresh;
+package com.alibaba.alicloud.acm.refresh;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
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/alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..0ed3fa01
--- /dev/null
+++ b/alicloud-acm-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,6 @@
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator
+
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.alicloud.acm.AcmAutoConfiguration,\
+com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration
\ No newline at end of file
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/com/alibaba/alicloud/acm/AcmConfigurationTests.java
similarity index 92%
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/com/alibaba/alicloud/acm/AcmConfigurationTests.java
index 9d09fd7a..320aceef 100644
--- a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmConfigurationTests.java
+++ b/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmConfigurationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -38,11 +38,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySourceLocator;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmIntegrationProperties;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.acm.bootstrap.AcmPropertySourceLocator;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmIntegrationProperties;
+import com.alibaba.alicloud.context.acm.AcmProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/acm/AcmFileExtensionTest.java
similarity index 93%
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/com/alibaba/alicloud/acm/AcmFileExtensionTest.java
index b463cf8f..2ab13e59 100644
--- a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmFileExtensionTest.java
+++ b/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmFileExtensionTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java
similarity index 94%
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/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java
index 030b26d0..cdc448b2 100644
--- a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/AcmGroupConfigurationTest.java
+++ b/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmGroupConfigurationTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method;
@@ -33,8 +33,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.acm.endpoint.AcmEndpointAutoConfiguration;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java
similarity index 90%
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/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java
index d05ddb5f..1a58dfbc 100644
--- a/spring-cloud-alicloud-acm/src/test/java/org/springframework/cloud/alicloud/acm/endpoint/AcmEndpointTests.java
+++ b/alicloud-acm-spring-cloud/src/test/java/com/alibaba/alicloud/acm/endpoint/AcmEndpointTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm.endpoint;
+package com.alibaba.alicloud.acm.endpoint;
import static org.junit.Assert.assertEquals;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.NONE;
@@ -38,11 +38,11 @@ import org.springframework.boot.actuate.health.Health.Builder;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.acm.AcmAutoConfiguration;
-import org.springframework.cloud.alicloud.acm.AcmPropertySourceRepository;
-import org.springframework.cloud.alicloud.acm.refresh.AcmRefreshHistory;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.acm.AcmAutoConfiguration;
+import com.alibaba.alicloud.acm.AcmPropertySourceRepository;
+import com.alibaba.alicloud.acm.refresh.AcmRefreshHistory;
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmProperties;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
diff --git a/spring-cloud-alicloud-ans/pom.xml b/alicloud-ans-spring-cloud/pom.xml
similarity index 93%
rename from spring-cloud-alicloud-ans/pom.xml
rename to alicloud-ans-spring-cloud/pom.xml
index 4b36ec07..f4fba922 100644
--- a/spring-cloud-alicloud-ans/pom.xml
+++ b/alicloud-ans-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">
+ com.alibaba.cloud
spring-cloud-alibaba
- org.springframework.cloud
0.9.1.BUILD-SNAPSHOT
4.0.0
- org.springframework.cloud
- spring-cloud-alicloud-ans
- Spring Cloud Alibaba Cloud ANS
+ com.alibaba.cloud
+ alicloud-ans-spring-cloud
+ Alibaba Cloud ANS Spring Cloud
@@ -31,8 +31,8 @@
- org.springframework.cloud
- spring-cloud-alicloud-context
+ com.alibaba.cloud
+ alicloud-context-spring-cloud
@@ -142,4 +142,4 @@
-
\ No newline at end of file
+
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/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
similarity index 89%
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/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
index a2958484..31831130 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
@@ -14,17 +14,17 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.ans.registry.AnsAutoServiceRegistration;
-import org.springframework.cloud.alicloud.ans.registry.AnsRegistration;
-import org.springframework.cloud.alicloud.ans.registry.AnsServiceRegistry;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.registry.AnsAutoServiceRegistration;
+import com.alibaba.alicloud.ans.registry.AnsRegistration;
+import com.alibaba.alicloud.ans.registry.AnsServiceRegistry;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationAutoConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationProperties;
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/com/alibaba/alicloud/ans/AnsDiscoveryClient.java
similarity index 98%
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/com/alibaba/alicloud/ans/AnsDiscoveryClient.java
index 493dfdcd..4233ef74 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClient.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClient.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
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/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java
similarity index 96%
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/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java
index e035b2a3..6cb09207 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsDiscoveryClientAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
import org.springframework.boot.autoconfigure.AutoConfigureBefore;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
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/com/alibaba/alicloud/ans/AnsServiceInstance.java
similarity index 97%
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/com/alibaba/alicloud/ans/AnsServiceInstance.java
index 52f7858c..2c7bc37c 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/AnsServiceInstance.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/AnsServiceInstance.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
import java.net.URI;
import java.util.Map;
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/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java
similarity index 95%
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/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java
index dc12044e..98926d59 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ConditionalOnAnsEnabled.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ConditionalOnAnsEnabled.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
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/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java
similarity index 94%
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/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java
index 7688074e..f2d19fe6 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpoint.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpoint.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.endpoint;
+package com.alibaba.alicloud.ans.endpoint;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.core.Host;
@@ -23,7 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import java.util.HashMap;
import java.util.List;
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/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java
similarity index 90%
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/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java
index 65f5803c..6766af26 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/endpoint/AnsEndpointAutoConfiguration.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.endpoint;
+package com.alibaba.alicloud.ans.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.context.annotation.Bean;
/**
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java
similarity index 98%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java
index 56a37ade..c7612698 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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/com/alibaba/alicloud/ans/registry/AnsRegistration.java
similarity index 96%
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/com/alibaba/alicloud/ans/registry/AnsRegistration.java
index f04abadf..7da2bf79 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsRegistration.java
@@ -14,9 +14,9 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.DefaultServiceInstance;
import org.springframework.cloud.client.ServiceInstance;
import org.springframework.cloud.client.discovery.ManagementServerPortUtils;
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/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java
similarity index 98%
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/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java
index 05b43639..cf10d2cc 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsServiceRegistry.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/registry/AnsServiceRegistry.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import com.alibaba.ans.core.NamingService;
import com.alibaba.ans.shaded.com.taobao.vipserver.client.ipms.NodeReactor;
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/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java
similarity index 95%
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/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java
index d189a4da..6131bba0 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import com.netflix.client.config.IClientConfig;
import com.netflix.loadbalancer.ServerList;
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/com/alibaba/alicloud/ans/ribbon/AnsServer.java
similarity index 97%
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/com/alibaba/alicloud/ans/ribbon/AnsServer.java
index 55684a64..c764426f 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServer.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServer.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import java.util.Collections;
import java.util.Map;
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/com/alibaba/alicloud/ans/ribbon/AnsServerList.java
similarity index 97%
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/com/alibaba/alicloud/ans/ribbon/AnsServerList.java
index f34f19ff..219beab6 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerList.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/AnsServerList.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import java.util.ArrayList;
import java.util.List;
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/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java
similarity index 95%
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/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java
index 078e6fdd..7094d43b 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/ConditionalOnRibbonAns.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/ConditionalOnRibbonAns.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
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/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java
similarity index 92%
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/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java
index 4333cb53..c37e88b6 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java
+++ b/alicloud-ans-spring-cloud/src/main/java/com/alibaba/alicloud/ans/ribbon/RibbonAnsAutoConfiguration.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.ans.ConditionalOnAnsEnabled;
+import com.alibaba.alicloud.ans.ConditionalOnAnsEnabled;
import org.springframework.cloud.netflix.ribbon.RibbonAutoConfiguration;
import org.springframework.cloud.netflix.ribbon.RibbonClients;
import org.springframework.cloud.netflix.ribbon.SpringClientFactory;
diff --git a/alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..c297fef7
--- /dev/null
+++ b/alicloud-ans-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.alibaba.alicloud.ans.endpoint.AnsEndpointAutoConfiguration,\
+ com.alibaba.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
+ com.alibaba.alicloud.ans.AnsAutoConfiguration,\
+ com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration
\ No newline at end of file
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/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java
similarity index 96%
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/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java
index 3e02bc3d..2e8433c4 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/AnsDiscoveryClientTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsDiscoveryClientTests.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
+import static com.alibaba.alicloud.ans.test.AnsMockTest.hostInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alicloud.ans.test.AnsMockTest.hostInstance;
import java.util.ArrayList;
import java.util.HashMap;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java
similarity index 90%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java
index 28c465f7..ca961e6c 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationEnabledTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java
similarity index 93%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java
index 7a31f30d..efb4dce1 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpNetworkInterfaceTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertEquals;
@@ -25,16 +25,15 @@ import java.net.InetAddress;
import java.net.NetworkInterface;
import java.util.Enumeration;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java
similarity index 91%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java
index 7bf76b25..4a965ba8 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationIpTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java
similarity index 86%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java
index a73f25c2..07c6da5f 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationManagementPortTests.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
+import static com.alibaba.alicloud.ans.registry.AnsRegistration.MANAGEMENT_CONTEXT_PATH;
+import static com.alibaba.alicloud.ans.registry.AnsRegistration.MANAGEMENT_PORT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;
-import static org.springframework.cloud.alicloud.ans.registry.AnsRegistration.MANAGEMENT_CONTEXT_PATH;
-import static org.springframework.cloud.alicloud.ans.registry.AnsRegistration.MANAGEMENT_PORT;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -28,9 +28,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java
similarity index 90%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java
index 20e03eb4..9e56be04 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationPortTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -26,9 +26,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Configuration;
import org.springframework.test.context.junit4.SpringRunner;
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java
similarity index 93%
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/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java
index 9d6904b8..0a6327a4 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/registry/AnsAutoServiceRegistrationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.registry;
+package com.alibaba.alicloud.ans.registry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -36,10 +36,10 @@ import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.web.server.LocalServerPort;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.endpoint.AnsEndpoint;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.ans.endpoint.AnsEndpoint;
+import com.alibaba.alicloud.context.ans.AnsProperties;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.cloud.commons.util.InetUtils;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java
similarity index 93%
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/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java
index beb825c7..d10f540c 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsRibbonClientConfigurationTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -22,8 +22,8 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.cloud.alicloud.ans.AnsAutoConfiguration;
-import org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsAutoConfiguration;
+import com.alibaba.alicloud.ans.AnsDiscoveryClientAutoConfiguration;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.client.serviceregistry.AutoServiceRegistrationConfiguration;
import org.springframework.context.annotation.Bean;
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/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java
similarity index 97%
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/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java
index b7cf34e3..4e1f690d 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServerListTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServerListTests.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
+import static com.alibaba.alicloud.ans.test.AnsMockTest.hostInstance;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
-import static org.springframework.cloud.alicloud.ans.test.AnsMockTest.hostInstance;
import java.util.ArrayList;
import java.util.Collections;
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/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java
similarity index 97%
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/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java
index 3e3d59e4..40c5eaec 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/ribbon/AnsServiceListTests.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/ribbon/AnsServiceListTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.ribbon;
+package com.alibaba.alicloud.ans.ribbon;
import static org.junit.Assert.*;
import static org.mockito.BDDMockito.given;
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/com/alibaba/alicloud/ans/test/AnsMockTest.java
similarity index 95%
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/com/alibaba/alicloud/ans/test/AnsMockTest.java
index 795f2b49..8eaeb0e7 100644
--- a/spring-cloud-alicloud-ans/src/test/java/org/springframework/cloud/alicloud/ans/test/AnsMockTest.java
+++ b/alicloud-ans-spring-cloud/src/test/java/com/alibaba/alicloud/ans/test/AnsMockTest.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans.test;
+package com.alibaba.alicloud.ans.test;
import java.util.Map;
diff --git a/spring-cloud-alicloud-context/pom.xml b/alicloud-context-spring-cloud/pom.xml
similarity index 95%
rename from spring-cloud-alicloud-context/pom.xml
rename to alicloud-context-spring-cloud/pom.xml
index ab98c6f3..15a90883 100644
--- a/spring-cloud-alicloud-context/pom.xml
+++ b/alicloud-context-spring-cloud/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
4.0.0
- org.springframework.cloud
- spring-cloud-alicloud-context
- Spring Cloud AliCloud Context
+ com.alibaba.cloud
+ alicloud-context-spring-cloud
+ AliCloud Context Spring Cloud
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/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java
similarity index 96%
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/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java
index e7c84a53..32c93b78 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudContextAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
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/com/alibaba/alicloud/context/AliCloudProperties.java
similarity index 96%
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/com/alibaba/alicloud/context/AliCloudProperties.java
index 09517329..a43c695d 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/AliCloudProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/AliCloudProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/Constants.java
similarity index 95%
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/com/alibaba/alicloud/context/Constants.java
index b44773d4..8e3fe893 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/Constants.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/Constants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
/**
* @author Jim
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/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java
similarity index 87%
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/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java
index 13f038aa..a8044ca4 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmContextBootstrapConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmContextBootstrapConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
import javax.annotation.PostConstruct;
@@ -22,9 +22,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.AliCloudProperties;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
@@ -38,7 +40,7 @@ import com.alibaba.cloud.context.acm.AliCloudAcmInitializer;
*/
@Configuration
@EnableConfigurationProperties(AcmProperties.class)
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.acm.AcmAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.acm.AcmAutoConfiguration")
@ImportAutoConfiguration(EdasContextAutoConfiguration.class)
public class AcmContextBootstrapConfiguration {
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/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java
similarity index 98%
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/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java
index 55c073b9..da5abac5 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmIntegrationProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmIntegrationProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
import java.util.ArrayList;
import java.util.List;
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/com/alibaba/alicloud/context/acm/AcmProperties.java
similarity index 98%
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/com/alibaba/alicloud/context/acm/AcmProperties.java
index 2a1993e9..f66ba230 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/acm/AcmProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/acm/AcmProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java
similarity index 82%
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/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java
index 6d9e9ca2..84b3e395 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListener.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListener.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
+
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
+import com.alibaba.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
import org.springframework.context.ApplicationContext;
import org.springframework.context.event.ContextRefreshedEvent;
@@ -35,7 +36,7 @@ public class AnsContextApplicationListener
@Override
protected String conditionalOnClass() {
- return "org.springframework.cloud.alicloud.ans.AnsAutoConfiguration";
+ return "com.alibaba.alicloud.ans.AnsAutoConfiguration";
}
@Override
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/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java
similarity index 82%
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/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java
index b1a7d64d..b4c4290c 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsContextAutoConfiguration.java
@@ -14,19 +14,21 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
+
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+
import org.springframework.context.annotation.Configuration;
/**
* @author xiaolongzuo
*/
@Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.ans.AnsAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.ans.AnsAutoConfiguration")
@EnableConfigurationProperties(AnsProperties.class)
@ImportAutoConfiguration(EdasContextAutoConfiguration.class)
public class AnsContextAutoConfiguration {
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/com/alibaba/alicloud/context/ans/AnsProperties.java
similarity index 99%
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/com/alibaba/alicloud/context/ans/AnsProperties.java
index 1952a524..99aa4a69 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/ans/AnsProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/ans/AnsProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
import java.net.Inet4Address;
import java.net.InetAddress;
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/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java
similarity index 89%
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/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java
index 12945c23..884d9771 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasContextAutoConfiguration.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.AliCloudProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/context/edas/EdasProperties.java
similarity index 97%
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/com/alibaba/alicloud/context/edas/EdasProperties.java
index 43c9a7cb..c34979c9 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/edas/EdasProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/edas/EdasProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java
similarity index 97%
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/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java
index dbe554d9..ffc09c7b 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/listener/AbstractOnceApplicationListener.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/listener/AbstractOnceApplicationListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.listener;
+package com.alibaba.alicloud.context.listener;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicBoolean;
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/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java
similarity index 88%
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/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java
index 2a7920f3..61a1f42a 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListener.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListener.java
@@ -1,12 +1,12 @@
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
/**
* @author pbting
@@ -18,7 +18,7 @@ public class NacosConfigParameterInitListener
@Override
protected String conditionalOnClass() {
- return "org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration";
+ return "com.alibaba.cloud.nacos.NacosConfigAutoConfiguration";
}
@Override
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/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
similarity index 92%
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/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
index 1e7b8d8e..c4cddfff 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListener.java
@@ -13,14 +13,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
import java.util.Properties;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
+
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
@@ -36,7 +37,7 @@ public class NacosDiscoveryParameterInitListener
@Override
protected String conditionalOnClass() {
- return "org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration";
+ return "com.alibaba.cloud.nacos.NacosDiscoveryAutoConfiguration";
}
@Override
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/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java
similarity index 91%
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/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java
index f197a0f0..bb1e1147 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssContextAutoConfiguration.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.oss;
+package com.alibaba.alicloud.context.oss;
import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.AliCloudProperties;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.util.Assert;
@@ -39,7 +39,7 @@ import com.aliyun.oss.OSSClientBuilder;
* @author xiaolongzuo
*/
@Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.oss.OssAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.oss.OssAutoConfiguration")
@ConditionalOnProperty(name = "spring.cloud.alicloud.oss.enabled", matchIfMissing = true)
@EnableConfigurationProperties(OssProperties.class)
@ImportAutoConfiguration(AliCloudContextAutoConfiguration.class)
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/com/alibaba/alicloud/context/oss/OssProperties.java
similarity index 98%
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/com/alibaba/alicloud/context/oss/OssProperties.java
index 4897bf5f..06156682 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/oss/OssProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/oss/OssProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.oss;
+package com.alibaba.alicloud.context.oss;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java
similarity index 79%
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/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java
index d4640c73..e26a5e67 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxContextAutoConfiguration.java
@@ -14,8 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasProperties;
import com.alibaba.cloud.context.edas.AliCloudEdasSdk;
import com.alibaba.cloud.context.scx.AliCloudScxInitializer;
import com.alibaba.edas.schedulerx.SchedulerXClient;
@@ -24,9 +26,8 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.AliCloudProperties;
+
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@@ -34,7 +35,7 @@ import org.springframework.context.annotation.Configuration;
* @author xiaolongzuo
*/
@Configuration
-@ConditionalOnClass(name = "org.springframework.cloud.alicloud.scx.ScxAutoConfiguration")
+@ConditionalOnClass(name = "com.alibaba.alicloud.scx.ScxAutoConfiguration")
@ConditionalOnProperty(name = "spring.cloud.alicloud.scx.enabled", matchIfMissing = true)
@EnableConfigurationProperties(ScxProperties.class)
@ImportAutoConfiguration(EdasContextAutoConfiguration.class)
@@ -43,8 +44,8 @@ public class ScxContextAutoConfiguration {
@Bean(initMethod = "init")
@ConditionalOnMissingBean
public SchedulerXClient schedulerXClient(AliCloudProperties aliCloudProperties,
- EdasProperties edasProperties, ScxProperties scxProperties,
- AliCloudEdasSdk aliCloudEdasSdk) {
+ EdasProperties edasProperties, ScxProperties scxProperties,
+ AliCloudEdasSdk aliCloudEdasSdk) {
return AliCloudScxInitializer.initialize(aliCloudProperties, edasProperties,
scxProperties, aliCloudEdasSdk);
}
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/com/alibaba/alicloud/context/scx/ScxProperties.java
similarity index 96%
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/com/alibaba/alicloud/context/scx/ScxProperties.java
index 5ddfb0ab..e0671705 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/scx/ScxProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/scx/ScxProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java
similarity index 91%
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/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java
index 9e64b835..a9ec1db4 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListener.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListener.java
@@ -14,13 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.sentinel;
+package com.alibaba.alicloud.context.sentinel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.event.ApplicationEnvironmentPreparedEvent;
-import org.springframework.cloud.alicloud.context.Constants;
-import org.springframework.cloud.alicloud.context.listener.AbstractOnceApplicationListener;
+
+import com.alibaba.alicloud.context.Constants;
+import com.alibaba.alicloud.context.listener.AbstractOnceApplicationListener;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfiguration;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
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/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java
similarity index 91%
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/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java
index 664647dd..4b23c3fc 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsContextAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsContextAutoConfiguration.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
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/com/alibaba/alicloud/context/sms/SmsProperties.java
similarity index 95%
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/com/alibaba/alicloud/context/sms/SmsProperties.java
index 11ba8cb7..8ada0a80 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/sms/SmsProperties.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/sms/SmsProperties.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
import org.springframework.boot.context.properties.ConfigurationProperties;
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/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java
similarity index 83%
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/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java
index e820d4a9..07b038c8 100644
--- a/spring-cloud-alicloud-context/src/main/java/org/springframework/cloud/alicloud/context/statistics/StatisticsTaskStarter.java
+++ b/alicloud-context-spring-cloud/src/main/java/com/alibaba/alicloud/context/statistics/StatisticsTaskStarter.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.statistics;
+package com.alibaba.alicloud.context.statistics;
import java.util.ArrayList;
import java.util.List;
@@ -22,15 +22,17 @@ import java.util.List;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
-import org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration;
-import org.springframework.cloud.alicloud.context.acm.AcmProperties;
-import org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.ans.AnsProperties;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.oss.OssProperties;
-import org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.scx.ScxProperties;
+
+import com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration;
+import com.alibaba.alicloud.context.acm.AcmProperties;
+import com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration;
+import com.alibaba.alicloud.context.ans.AnsProperties;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.oss.OssContextAutoConfiguration;
+import com.alibaba.alicloud.context.oss.OssProperties;
+import com.alibaba.alicloud.context.scx.ScxContextAutoConfiguration;
+import com.alibaba.alicloud.context.scx.ScxProperties;
+
import org.springframework.context.annotation.Configuration;
import com.alibaba.cloud.context.AliCloudServerMode;
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/alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..8c6c9957
--- /dev/null
+++ b/alicloud-context-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,15 @@
+org.springframework.cloud.bootstrap.BootstrapConfiguration=\
+ com.alibaba.alicloud.context.acm.AcmContextBootstrapConfiguration
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.alibaba.alicloud.context.AliCloudContextAutoConfiguration,\
+ com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration,\
+ com.alibaba.alicloud.context.ans.AnsContextAutoConfiguration,\
+ com.alibaba.alicloud.context.oss.OssContextAutoConfiguration,\
+ com.alibaba.alicloud.context.scx.ScxContextAutoConfiguration,\
+ com.alibaba.alicloud.context.statistics.StatisticsTaskStarter,\
+ com.alibaba.alicloud.context.sms.SmsContextAutoConfiguration
+org.springframework.context.ApplicationListener=\
+ com.alibaba.alicloud.context.ans.AnsContextApplicationListener,\
+ com.alibaba.alicloud.context.nacos.NacosConfigParameterInitListener,\
+ com.alibaba.alicloud.context.nacos.NacosDiscoveryParameterInitListener,\
+ com.alibaba.alicloud.context.sentinel.SentinelAliCloudListener
\ No newline at end of file
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/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
similarity index 93%
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/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
index 1ecff17f..9fbb2ed8 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/acm/AcmAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/acm/AcmAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.acm;
+package com.alibaba.alicloud.acm;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
similarity index 93%
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/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
index 1f15f882..94946f00 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/ans/AnsAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/ans/AnsAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.ans;
+package com.alibaba.alicloud.ans;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/context/AliCloudPropertiesTests.java
similarity index 97%
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/com/alibaba/alicloud/context/AliCloudPropertiesTests.java
index 1094b928..34afd223 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/AliCloudPropertiesTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/AliCloudPropertiesTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
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/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java
similarity index 97%
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/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java
index 6cc999ff..72fe9d28 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/BaseAliCloudSpringApplication.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/BaseAliCloudSpringApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context;
+package com.alibaba.alicloud.context;
import org.junit.runner.RunWith;
import org.powermock.core.classloader.annotations.PowerMockIgnore;
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/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java
similarity index 95%
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/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java
index d129d64e..29f790ec 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/acm/AcmPropertiesTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/acm/AcmPropertiesTests.java
@@ -14,15 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.acm;
+package com.alibaba.alicloud.context.acm;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
+
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
import com.alibaba.cloud.context.AliCloudServerMode;
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/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java
similarity index 89%
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/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java
index 153e234d..1c80e09f 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsContextApplicationListenerTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsContextApplicationListenerTests.java
@@ -14,12 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
import org.junit.Test;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java
similarity index 96%
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/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java
index 023c5ad8..da9db1c1 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/ans/AnsPropertiesTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/ans/AnsPropertiesTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.ans;
+package com.alibaba.alicloud.context.ans;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
@@ -31,8 +31,9 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
+
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
import com.alibaba.cloud.context.AliCloudServerMode;
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/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java
similarity index 94%
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/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java
index ed59a46c..f16d9f6c 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/edas/EdasPropertiesTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/edas/EdasPropertiesTests.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.edas;
+package com.alibaba.alicloud.context.edas;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
+
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java
similarity index 90%
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/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java
index 355bc08b..729d27f5 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosConfigParameterInitListenerTests.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
@@ -22,8 +22,8 @@ import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
import org.junit.BeforeClass;
import org.junit.Test;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
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/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
similarity index 91%
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/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
index 73754cf8..3be573d3 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/nacos/NacosDiscoveryParameterInitListenerTests.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.nacos;
+package com.alibaba.alicloud.context.nacos;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import org.junit.BeforeClass;
import org.junit.Test;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
import com.alibaba.cloud.context.ans.AliCloudAnsInitializer;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
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/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java
similarity index 97%
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/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java
index 44297f59..b3317a29 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/oss/OssAutoConfigurationTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/oss/OssAutoConfigurationTests.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.oss;
+package com.alibaba.alicloud.context.oss;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
+
+import com.alibaba.alicloud.context.AliCloudProperties;
import com.aliyun.oss.OSS;
import com.aliyun.oss.OSSClient;
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/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java
similarity index 93%
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/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java
index ca390ea9..c9803f81 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/scx/ScxAutoConfigurationTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/scx/ScxAutoConfigurationTests.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.scx;
+package com.alibaba.alicloud.context.scx;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
+
+import com.alibaba.alicloud.context.edas.EdasProperties;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
similarity index 86%
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/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
index 6a812daf..59aeacb8 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sentinel/SentinelAliCloudListenerTests.java
@@ -14,16 +14,17 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.sentinel;
+package com.alibaba.alicloud.context.sentinel;
import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
import org.junit.BeforeClass;
import org.junit.Test;
import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.springframework.cloud.alicloud.context.BaseAliCloudSpringApplication;
-import org.springframework.cloud.alicloud.context.Constants;
-import org.springframework.cloud.alicloud.utils.ChangeOrderUtils;
+
+import com.alibaba.alicloud.context.Constants;
+import com.alibaba.alicloud.context.BaseAliCloudSpringApplication;
+import com.alibaba.alicloud.utils.ChangeOrderUtils;
import com.alibaba.cloud.context.edas.EdasChangeOrderConfigurationFactory;
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/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java
similarity index 79%
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/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java
index 4a2f74ea..1fd1aab2 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/context/sms/SmsPropertiesTests.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/context/sms/SmsPropertiesTests.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.context.sms;
+package com.alibaba.alicloud.context.sms;
import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
-import org.assertj.core.api.AssertionsForClassTypes;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration;
-import org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration;
+
+import com.alibaba.alicloud.context.AliCloudContextAutoConfiguration;
+import com.alibaba.alicloud.context.edas.EdasContextAutoConfiguration;
/**
* @author xiaolongzuo
@@ -55,13 +55,13 @@ public class SmsPropertiesTests {
"spring.cloud.alicloud.sms.read-timeout=30")
.run(context -> {
SmsProperties config = context.getBean(SmsProperties.class);
- AssertionsForClassTypes.assertThat(config.getReportQueueName())
+ assertThat(config.getReportQueueName())
.isEqualTo("q1");
- AssertionsForClassTypes.assertThat(config.getUpQueueName())
+ assertThat(config.getUpQueueName())
.isEqualTo("q2");
- AssertionsForClassTypes.assertThat(config.getConnectTimeout())
+ assertThat(config.getConnectTimeout())
.isEqualTo("20");
- AssertionsForClassTypes.assertThat(config.getReadTimeout())
+ assertThat(config.getReadTimeout())
.isEqualTo("30");
});
}
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/com/alibaba/alicloud/oss/OssAutoConfiguration.java
similarity index 93%
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/com/alibaba/alicloud/oss/OssAutoConfiguration.java
index 2f6961c6..159d28ee 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss;
+package com.alibaba.alicloud.oss;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
similarity index 93%
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/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
index a1128b92..cae4aade 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.scx;
+package com.alibaba.alicloud.scx;
/**
* @author xiaolongzuo
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/com/alibaba/alicloud/utils/ChangeOrderUtils.java
similarity index 97%
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/com/alibaba/alicloud/utils/ChangeOrderUtils.java
index adfd750f..316f1758 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alicloud/utils/ChangeOrderUtils.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/alicloud/utils/ChangeOrderUtils.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.utils;
+package com.alibaba.alicloud.utils;
import org.powermock.api.mockito.PowerMockito;
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/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
similarity index 93%
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/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
index 3ae897f4..bef13171 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
/**
* @author xiaolongzuo
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/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
similarity index 93%
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/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
index 74ac28bc..d9f47e11 100644
--- a/spring-cloud-alicloud-context/src/test/java/org/springframework/cloud/alibaba/nacos/NacosDiscoveryAutoConfiguration.java
+++ b/alicloud-context-spring-cloud/src/test/java/com/alibaba/cloud/nacos/NacosDiscoveryAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.nacos;
+package com.alibaba.cloud.nacos;
/**
* @author xiaolongzuo
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-oss/pom.xml b/alicloud-oss-spring-cloud/pom.xml
similarity index 88%
rename from spring-cloud-alicloud-oss/pom.xml
rename to alicloud-oss-spring-cloud/pom.xml
index 29acc945..94843ef7 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
- Spring Cloud Alibaba Cloud OSS
+ com.alibaba.cloud
+ alicloud-oss-spring-cloud
+ Alibaba Cloud OSS Spring Cloud
- 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/com/alibaba/alicloud/oss/OssApplicationListener.java
similarity index 97%
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/com/alibaba/alicloud/oss/OssApplicationListener.java
index fa0473d6..7024cfc2 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssApplicationListener.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssApplicationListener.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss;
+package com.alibaba.alicloud.oss;
import java.util.Map;
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/com/alibaba/alicloud/oss/OssAutoConfiguration.java
similarity index 91%
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/com/alibaba/alicloud/oss/OssAutoConfiguration.java
index 5d7b5731..e1e35c22 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssAutoConfiguration.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssAutoConfiguration.java
@@ -14,13 +14,13 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss;
+package com.alibaba.alicloud.oss;
import com.aliyun.oss.OSS;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.cloud.alicloud.oss.resource.OssStorageProtocolResolver;
+import com.alibaba.alicloud.oss.resource.OssStorageProtocolResolver;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/oss/OssConstants.java
similarity index 94%
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/com/alibaba/alicloud/oss/OssConstants.java
index e764ebac..5dddcfa8 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/OssConstants.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/OssConstants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss;
+package com.alibaba.alicloud.oss;
/**
* OSS constants
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/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java
similarity index 97%
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/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java
index a09e53fd..c1adf419 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpoint.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpoint.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss.endpoint;
+package com.alibaba.alicloud.oss.endpoint;
import com.aliyun.oss.OSSClient;
import org.springframework.beans.factory.annotation.Autowired;
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/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
similarity index 96%
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/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
index aec1cae9..e4e49f34 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/endpoint/OssEndpointAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss.endpoint;
+package com.alibaba.alicloud.oss.endpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
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/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java
similarity index 97%
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/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java
index b062e644..2d1f2d50 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageProtocolResolver.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageProtocolResolver.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss.resource;
+package com.alibaba.alicloud.oss.resource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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/com/alibaba/alicloud/oss/resource/OssStorageResource.java
similarity index 98%
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/com/alibaba/alicloud/oss/resource/OssStorageResource.java
index 82f38fe5..05379fc9 100644
--- a/spring-cloud-alicloud-oss/src/main/java/org/springframework/cloud/alicloud/oss/resource/OssStorageResource.java
+++ b/alicloud-oss-spring-cloud/src/main/java/com/alibaba/alicloud/oss/resource/OssStorageResource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.oss.resource;
+package com.alibaba.alicloud.oss.resource;
import java.io.File;
import java.io.FileNotFoundException;
diff --git a/alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..23156e69
--- /dev/null
+++ b/alicloud-oss-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,5 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.alicloud.oss.OssAutoConfiguration,\
+com.alibaba.alicloud.oss.endpoint.OssEndpointAutoConfiguration
+org.springframework.context.ApplicationListener=\
+com.alibaba.alicloud.oss.OssApplicationListener
\ No newline at end of file
diff --git a/spring-cloud-alicloud-schedulerx/pom.xml b/alicloud-schedulerx-spring-cloud/pom.xml
similarity index 89%
rename from spring-cloud-alicloud-schedulerx/pom.xml
rename to alicloud-schedulerx-spring-cloud/pom.xml
index 5424847e..a9a52afc 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
- Spring Cloud Alibaba Cloud SchedulerX
+ alicloud-schedulerx-spring-cloud
+ Alibaba Cloud SchedulerX Spring Cloud
- org.springframework.cloud
- spring-cloud-alicloud-context
+ com.alibaba.cloud
+ alicloud-context-spring-cloud
org.slf4j
@@ -74,4 +74,4 @@
-
\ No newline at end of file
+
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/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
similarity index 94%
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/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
index 77669f50..47beae5c 100644
--- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/ScxAutoConfiguration.java
+++ b/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/ScxAutoConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.scx;
+package com.alibaba.alicloud.scx;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java
similarity index 89%
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/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java
index d959cfb3..7a44a5a6 100644
--- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpoint.java
+++ b/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpoint.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.scx.endpoint;
+package com.alibaba.alicloud.scx.endpoint;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.scx.ScxProperties;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.scx.ScxProperties;
import java.util.HashMap;
import java.util.Map;
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/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
similarity index 88%
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/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
index 46d749d2..676bbd14 100644
--- a/spring-cloud-alicloud-schedulerx/src/main/java/org/springframework/cloud/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
+++ b/alicloud-schedulerx-spring-cloud/src/main/java/com/alibaba/alicloud/scx/endpoint/ScxEndpointAutoConfiguration.java
@@ -14,15 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.scx.endpoint;
+package com.alibaba.alicloud.scx.endpoint;
import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
-import org.springframework.cloud.alicloud.context.edas.EdasProperties;
-import org.springframework.cloud.alicloud.context.scx.ScxProperties;
+import com.alibaba.alicloud.context.edas.EdasProperties;
+import com.alibaba.alicloud.context.scx.ScxProperties;
import org.springframework.context.annotation.Bean;
/**
diff --git a/alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..3032200c
--- /dev/null
+++ b/alicloud-schedulerx-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.alibaba.alicloud.scx.endpoint.ScxEndpointAutoConfiguration,\
+ com.alibaba.alicloud.scx.ScxAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alicloud-sms/pom.xml b/alicloud-sms-spring-cloud/pom.xml
similarity index 90%
rename from spring-cloud-alicloud-sms/pom.xml
rename to alicloud-sms-spring-cloud/pom.xml
index 4a8e05dc..b44b0280 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
- Spring Cloud Alibaba Cloud SMS
+ com.alibaba.cloud
+ alicloud-sms-spring-cloud
+ Alibaba Cloud SMS Spring Cloud
- 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/com/alibaba/alicloud/sms/AbstractSmsService.java
similarity index 96%
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/com/alibaba/alicloud/sms/AbstractSmsService.java
index 5d25bcc0..b27c5dab 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/AbstractSmsService.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/AbstractSmsService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
import java.util.concurrent.ConcurrentHashMap;
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/com/alibaba/alicloud/sms/ISmsService.java
similarity index 98%
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/com/alibaba/alicloud/sms/ISmsService.java
index 54a8201c..bedf9679 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/ISmsService.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/ISmsService.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
import com.aliyuncs.IAcsClient;
import com.aliyuncs.dysmsapi.model.v20170525.*;
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/com/alibaba/alicloud/sms/SmsInitializerEventListener.java
similarity index 94%
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/com/alibaba/alicloud/sms/SmsInitializerEventListener.java
index 4133d498..81658f85 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsInitializerEventListener.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsInitializerEventListener.java
@@ -13,13 +13,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
import com.aliyuncs.exceptions.ClientException;
import com.aliyuncs.profile.DefaultProfile;
import org.springframework.boot.context.event.ApplicationStartedEvent;
-import org.springframework.cloud.alicloud.context.sms.SmsProperties;
-import org.springframework.cloud.alicloud.sms.base.MessageListener;
+import com.alibaba.alicloud.context.sms.SmsProperties;
+import com.alibaba.alicloud.sms.base.MessageListener;
import org.springframework.context.ApplicationListener;
import org.springframework.stereotype.Component;
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/com/alibaba/alicloud/sms/SmsMessageListener.java
similarity index 85%
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/com/alibaba/alicloud/sms/SmsMessageListener.java
index 5fc34dd5..5904f053 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsMessageListener.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsMessageListener.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
-import org.springframework.cloud.alicloud.sms.base.MessageListener;
+import com.alibaba.alicloud.sms.base.MessageListener;
/**
* @author pbting
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/com/alibaba/alicloud/sms/SmsReportMessageListener.java
similarity index 93%
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/com/alibaba/alicloud/sms/SmsReportMessageListener.java
index c214a628..39deafa6 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsReportMessageListener.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsReportMessageListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
/**
* @author pbting
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/com/alibaba/alicloud/sms/SmsServiceImpl.java
similarity index 93%
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/com/alibaba/alicloud/sms/SmsServiceImpl.java
index 91a0cccb..5a6165a4 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsServiceImpl.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsServiceImpl.java
@@ -13,17 +13,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
import java.text.ParseException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.sms.SmsProperties;
-import org.springframework.cloud.alicloud.sms.base.DefaultAlicomMessagePuller;
-import org.springframework.cloud.alicloud.sms.endpoint.EndpointManager;
-import org.springframework.cloud.alicloud.sms.endpoint.ReceiveMessageEntity;
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.sms.SmsProperties;
+import com.alibaba.alicloud.sms.base.DefaultAlicomMessagePuller;
+import com.alibaba.alicloud.sms.endpoint.EndpointManager;
+import com.alibaba.alicloud.sms.endpoint.ReceiveMessageEntity;
import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsRequest;
import com.aliyuncs.dysmsapi.model.v20170525.QuerySendDetailsResponse;
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/com/alibaba/alicloud/sms/SmsUpMessageListener.java
similarity index 93%
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/com/alibaba/alicloud/sms/SmsUpMessageListener.java
index 4da61438..9e4e8124 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/SmsUpMessageListener.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/SmsUpMessageListener.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms;
+package com.alibaba.alicloud.sms;
/**
* @author pbting
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/com/alibaba/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/com/alibaba/alicloud/sms/base/DefaultAlicomMessagePuller.java
index 4d23ccff..4cf87d7b 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/com/alibaba/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 com.alibaba.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/com/alibaba/alicloud/sms/base/MessageListener.java
similarity index 90%
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/com/alibaba/alicloud/sms/base/MessageListener.java
index 9921232a..9e857f2a 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/com/alibaba/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 com.alibaba.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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java
similarity index 97%
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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java
index 1de389ca..e8214812 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueRequest.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueRequest.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.base;
+package com.alibaba.alicloud.sms.base;
import com.aliyuncs.RpcAcsRequest;
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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java
similarity index 98%
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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java
index 5e296ed6..724804e8 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponse.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponse.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.base;
+package com.alibaba.alicloud.sms.base;
import com.aliyuncs.AcsResponse;
import com.aliyuncs.transform.UnmarshallerContext;
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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java
similarity index 97%
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/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java
index 627e8bb5..87c58c28 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/base/QueryTokenForMnsQueueResponseUnmarshaller.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.base;
+package com.alibaba.alicloud.sms.base;
import com.aliyuncs.transform.UnmarshallerContext;
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/com/alibaba/alicloud/sms/base/TokenForAlicom.java
similarity index 93%
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/com/alibaba/alicloud/sms/base/TokenForAlicom.java
index 8af1a63c..443e8517 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/com/alibaba/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 com.alibaba.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/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java
similarity index 96%
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/com/alibaba/alicloud/sms/base/TokenGetterForAlicom.java
index 3daf1c83..70def740 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/com/alibaba/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 com.alibaba.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/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java
similarity index 81%
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/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java
index 6fb5727d..03a76abe 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/config/SmsAutoConfiguration.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/config/SmsAutoConfiguration.java
@@ -13,16 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.config;
+package com.alibaba.alicloud.sms.config;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.alicloud.context.AliCloudProperties;
-import org.springframework.cloud.alicloud.context.sms.SmsProperties;
-import org.springframework.cloud.alicloud.sms.ISmsService;
-import org.springframework.cloud.alicloud.sms.SmsInitializerEventListener;
-import org.springframework.cloud.alicloud.sms.SmsServiceImpl;
+import com.alibaba.alicloud.context.AliCloudProperties;
+import com.alibaba.alicloud.context.sms.SmsProperties;
+import com.alibaba.alicloud.sms.ISmsService;
+import com.alibaba.alicloud.sms.SmsInitializerEventListener;
+import com.alibaba.alicloud.sms.SmsServiceImpl;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/alicloud/sms/endpoint/EndpointManager.java
similarity index 98%
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/com/alibaba/alicloud/sms/endpoint/EndpointManager.java
index 3b807d08..5047a8f1 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/EndpointManager.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/EndpointManager.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.endpoint;
+package com.alibaba.alicloud.sms.endpoint;
import com.aliyuncs.dysmsapi.model.v20170525.SendBatchSmsRequest;
import com.aliyuncs.dysmsapi.model.v20170525.SendSmsRequest;
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/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java
similarity index 92%
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/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java
index 3e941c3c..2825f3a5 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/ReceiveMessageEntity.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/ReceiveMessageEntity.java
@@ -13,9 +13,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.endpoint;
+package com.alibaba.alicloud.sms.endpoint;
-import org.springframework.cloud.alicloud.sms.base.MessageListener;
+import com.alibaba.alicloud.sms.base.MessageListener;
import java.io.Serializable;
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/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java
similarity index 94%
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/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java
index 77d8e39b..57da7bd5 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpoint.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpoint.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.endpoint;
+package com.alibaba.alicloud.sms.endpoint;
import java.util.Map;
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/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
similarity index 95%
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/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
index 1db0ec25..cf8a6bb7 100644
--- a/spring-cloud-alicloud-sms/src/main/java/org/springframework/cloud/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
+++ b/alicloud-sms-spring-cloud/src/main/java/com/alibaba/alicloud/sms/endpoint/SmsEndpointAutoConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alicloud.sms.endpoint;
+package com.alibaba.alicloud.sms.endpoint;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
diff --git a/alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories b/alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..a6c328d2
--- /dev/null
+++ b/alicloud-sms-spring-cloud/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,3 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+ com.alibaba.alicloud.sms.config.SmsAutoConfiguration,\
+ com.alibaba.alicloud.sms.endpoint.SmsEndpointAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml b/alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml
similarity index 54%
rename from spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/pom.xml
rename to alicloud-spring-cloud-starter/alicloud-acm-spring-cloud-starter/pom.xml
index 5e32b287..331b1abe 100644
--- a/spring-cloud-starter-alicloud/spring-cloud-starter-alicloud-sms/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-sms
- Spring Cloud Starter Alibaba Cloud SMS
+ alicloud-acm-spring-cloud-starter
+ Alibaba Cloud ACM Spring Cloud Starter
- org.springframework.cloud
- spring-cloud-alicloud-sms
+ 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 56%
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 4a1ef4a5..20916c49 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
- Spring Cloud Starter Alibaba Cloud ANS
+ alicloud-ans-spring-cloud-starter
+ Alibaba Cloud ANS Spring Cloud Starter
- 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 61%
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 bfafb63f..892c10f4 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
- Spring Cloud Starter Alibaba Cloud OSS
+ alicloud-oss-spring-cloud-starter
+ Alibaba Cloud OSS Spring Cloud Starter
- 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 54%
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 1946da3c..538ac06f 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
- Spring Cloud Starter Alibaba Cloud SchedulerX
+ alicloud-schedulerx-spring-cloud-starter
+ Alibaba Cloud SchedulerX Spring Cloud Starter
- org.springframework.cloud
- spring-cloud-alicloud-schedulerx
+ com.alibaba.cloud
+ alicloud-schedulerx-spring-cloud
diff --git a/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml b/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml
new file mode 100644
index 00000000..5a5b6d94
--- /dev/null
+++ b/alicloud-spring-cloud-starter/alicloud-sms-spring-cloud-starter/pom.xml
@@ -0,0 +1,20 @@
+
+ 4.0.0
+
+
+ com.alibaba.cloud
+ alicloud-spring-cloud-starter
+ 0.9.1.BUILD-SNAPSHOT
+
+ alicloud-sms-spring-cloud-starter
+ Alibaba Cloud SMS Spring Cloud Starter
+
+
+
+ com.alibaba.cloud
+ alicloud-sms-spring-cloud
+
+
+
+
diff --git a/alicloud-spring-cloud-starter/pom.xml b/alicloud-spring-cloud-starter/pom.xml
new file mode 100644
index 00000000..8dd295e1
--- /dev/null
+++ b/alicloud-spring-cloud-starter/pom.xml
@@ -0,0 +1,20 @@
+
+ 4.0.0
+
+ com.alibaba.cloud
+ spring-cloud-alibaba
+ 0.9.1.BUILD-SNAPSHOT
+
+ alicloud-spring-cloud-starter
+ pom
+ Alibaba Cloud Spring Cloud Starters
+ Alibaba Cloud Spring Cloud Starters
+
+ 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
+
+
diff --git a/pom.xml b/pom.xml
index 18171ac5..8465e9fb 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
@@ -44,8 +44,11 @@
flystar32@163.com
+ fangjian0423
fangjian
fangjian0423@gmail.com
+ Alibaba
+ https://github.com/fangjian0423
xiaolongzuo
@@ -90,27 +93,27 @@
- 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
+ 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
spring-cloud-alibaba-coverage
@@ -127,8 +130,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 92%
rename from spring-cloud-stream-binder-rocketmq/pom.xml
rename to rocketmq-spring-cloud-stream-binder/pom.xml
index cbdc62f0..e0b838f5 100644
--- a/spring-cloud-stream-binder-rocketmq/pom.xml
+++ b/rocketmq-spring-cloud-stream-binder/pom.xml
@@ -3,16 +3,16 @@
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
- Spring Cloud Alibaba RocketMQ Binder
+ com.alibaba.cloud
+ rocketmq-spring-cloud-stream-binder
+ RocketMQ Spring Cloud Stream 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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java
similarity index 94%
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java
index c57ce9b6..72c97420 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderConstants.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq;
+package com.alibaba.cloud.stream.binder.rocketmq;
/**
* @author Jim
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
similarity index 94%
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
index b50e799d..065cb4a5 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQBinderUtils.java
@@ -14,10 +14,10 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq;
+package com.alibaba.cloud.stream.binder.rocketmq;
import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
import org.springframework.util.StringUtils;
/**
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
similarity index 91%
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
index 6df97fca..4a20477c 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQMessageChannelBinder.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq;
+package com.alibaba.cloud.stream.binder.rocketmq;
import java.util.HashMap;
import java.util.Map;
@@ -32,16 +32,16 @@ import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
import org.springframework.cloud.stream.binder.ExtendedPropertiesBinder;
-import org.springframework.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer;
-import org.springframework.cloud.stream.binder.rocketmq.integration.RocketMQInboundChannelAdapter;
-import org.springframework.cloud.stream.binder.rocketmq.integration.RocketMQMessageHandler;
-import org.springframework.cloud.stream.binder.rocketmq.integration.RocketMQMessageSource;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner;
+import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer;
+import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQInboundChannelAdapter;
+import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageHandler;
+import com.alibaba.cloud.stream.binder.rocketmq.integration.RocketMQMessageSource;
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner;
import org.springframework.cloud.stream.provisioning.ConsumerDestination;
import org.springframework.cloud.stream.provisioning.ProducerDestination;
import org.springframework.integration.StaticMessageHeaderAccessor;
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/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java
similarity index 87%
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/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java
index b7e31036..46c67158 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/actuator/RocketMQBinderHealthIndicator.java
@@ -14,13 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.actuator;
+package com.alibaba.cloud.stream.binder.rocketmq.actuator;
+
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.actuate.health.AbstractHealthIndicator;
import org.springframework.boot.actuate.health.Health;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.Instrumentation;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
+
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
/**
* @author Timur Valiev
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java
similarity index 83%
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java
index aa7ca366..4d7f7934 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderAutoConfiguration.java
@@ -14,17 +14,18 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.config;
+package com.alibaba.cloud.stream.binder.rocketmq.config;
+
+import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder;
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner;
import org.apache.rocketmq.spring.autoconfigure.RocketMQAutoConfiguration;
import org.apache.rocketmq.spring.autoconfigure.RocketMQProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.context.properties.EnableConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
-import org.springframework.cloud.stream.binder.rocketmq.provisioning.RocketMQTopicProvisioner;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Import;
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java
similarity index 88%
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java
index bac4927e..c435b512 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQBinderHealthIndicatorAutoConfiguration.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.config;
+package com.alibaba.cloud.stream.binder.rocketmq.config;
+
+import com.alibaba.cloud.stream.binder.rocketmq.actuator.RocketMQBinderHealthIndicator;
import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
-import org.springframework.cloud.stream.binder.rocketmq.actuator.RocketMQBinderHealthIndicator;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java
similarity index 96%
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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java
index 401d5703..f318233f 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/config/RocketMQComponent4BinderAutoConfiguration.java
@@ -14,7 +14,9 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.config;
+package com.alibaba.cloud.stream.binder.rocketmq.config;
+
+import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials;
@@ -27,7 +29,6 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.springframework.boot.autoconfigure.AutoConfigureAfter;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
-import org.springframework.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
similarity index 97%
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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
index de19d262..babf95ba 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQListenerBindingContainer.java
@@ -14,11 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.consuming;
+package com.alibaba.cloud.stream.binder.rocketmq.consuming;
import java.util.List;
import java.util.Objects;
+import com.alibaba.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+
import org.apache.rocketmq.acl.common.AclClientRPCHook;
import org.apache.rocketmq.acl.common.SessionCredentials;
import org.apache.rocketmq.client.consumer.DefaultMQPushConsumer;
@@ -45,9 +48,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.RocketMQMessageChannelBinder;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
import org.springframework.context.SmartLifecycle;
import org.springframework.util.Assert;
import org.springframework.util.StringUtils;
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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java
index 03eacbe5..62724827 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/consuming/RocketMQMessageQueueChooser.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.consuming;
+package com.alibaba.cloud.stream.binder.rocketmq.consuming;
import java.util.ArrayList;
import java.util.List;
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java
similarity index 92%
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java
index 33b3fef1..3f3abb4f 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQInboundChannelAdapter.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.integration;
+package com.alibaba.cloud.stream.binder.rocketmq.integration;
import org.apache.rocketmq.spring.core.RocketMQListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.Instrumentation;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQListenerBindingContainer;
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation;
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
import org.springframework.integration.endpoint.MessageProducerSupport;
import org.springframework.integration.support.MessageBuilder;
import org.springframework.messaging.Message;
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
index 65dbb9e5..85212bf6 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageHandler.java
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.integration;
+package com.alibaba.cloud.stream.binder.rocketmq.integration;
import java.util.Optional;
+import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
+
import org.apache.rocketmq.client.exception.MQClientException;
import org.apache.rocketmq.client.producer.SendCallback;
import org.apache.rocketmq.client.producer.SendResult;
@@ -27,9 +29,9 @@ import org.apache.rocketmq.spring.core.RocketMQTemplate;
import org.apache.rocketmq.spring.support.RocketMQHeaders;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.Instrumentation;
-import org.springframework.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
+
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.Instrumentation;
+import com.alibaba.cloud.stream.binder.rocketmq.metrics.InstrumentationManager;
import org.springframework.context.Lifecycle;
import org.springframework.integration.handler.AbstractMessageHandler;
import org.springframework.integration.support.DefaultErrorMessageStrategy;
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java
similarity index 96%
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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java
index d7f13be6..0ea93a33 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/integration/RocketMQMessageSource.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.integration;
+package com.alibaba.cloud.stream.binder.rocketmq.integration;
import java.util.List;
import java.util.Set;
@@ -33,9 +33,9 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.consuming.RocketMQMessageQueueChooser;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.consuming.RocketMQMessageQueueChooser;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
import org.springframework.context.Lifecycle;
import org.springframework.integration.IntegrationMessageHeaderAccessor;
import org.springframework.integration.acks.AcknowledgmentCallback;
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/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java
index 885a183f..f62b018e 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/metrics/Instrumentation.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.metrics;
+package com.alibaba.cloud.stream.binder.rocketmq.metrics;
import java.util.concurrent.atomic.AtomicBoolean;
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/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java
index e07628bb..1152bf54 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/metrics/InstrumentationManager.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.metrics;
+package com.alibaba.cloud.stream.binder.rocketmq.metrics;
import java.util.HashMap;
import java.util.Map;
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
similarity index 93%
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
index af292e74..c23cf536 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBinderConfigurationProperties.java
@@ -14,11 +14,12 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.properties;
+package com.alibaba.cloud.stream.binder.rocketmq.properties;
+
+import com.alibaba.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
import org.apache.rocketmq.common.MixAll;
import org.springframework.boot.context.properties.ConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.RocketMQBinderConstants;
/**
* @author Timur Valiev
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java
index 6d1146e9..0829325d 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQBindingProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.properties;
+package com.alibaba.cloud.stream.binder.rocketmq.properties;
import org.springframework.cloud.stream.binder.BinderSpecificPropertiesProvider;
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java
similarity index 98%
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java
index 343c9056..9554e580 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQConsumerProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.properties;
+package com.alibaba.cloud.stream.binder.rocketmq.properties;
import org.apache.rocketmq.client.consumer.MQPushConsumer;
import org.apache.rocketmq.client.consumer.MessageSelector;
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java
similarity index 95%
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java
index 659a350e..3583873d 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQExtendedBindingProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.properties;
+package com.alibaba.cloud.stream.binder.rocketmq.properties;
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.cloud.stream.binder.AbstractExtendedBindingProperties;
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java
similarity index 98%
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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java
index a8d784e7..2d4d197e 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/properties/RocketMQProducerProperties.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.properties;
+package com.alibaba.cloud.stream.binder.rocketmq.properties;
import org.apache.rocketmq.client.producer.DefaultMQProducer;
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/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java
similarity index 91%
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/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java
index d8d08626..df2fa190 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/provisioning/RocketMQTopicProvisioner.java
@@ -14,14 +14,14 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq.provisioning;
+package com.alibaba.cloud.stream.binder.rocketmq.provisioning;
import org.apache.rocketmq.client.Validators;
import org.apache.rocketmq.client.exception.MQClientException;
import org.springframework.cloud.stream.binder.ExtendedConsumerProperties;
import org.springframework.cloud.stream.binder.ExtendedProducerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQConsumerProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQProducerProperties;
import org.springframework.cloud.stream.provisioning.ConsumerDestination;
import org.springframework.cloud.stream.provisioning.ProducerDestination;
import org.springframework.cloud.stream.provisioning.ProvisioningException;
diff --git a/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders
new file mode 100644
index 00000000..2e5b9953
--- /dev/null
+++ b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.binders
@@ -0,0 +1 @@
+rocketmq:com.alibaba.cloud.stream.binder.rocketmq.config.RocketMQBinderAutoConfiguration
\ No newline at end of file
diff --git a/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories
new file mode 100644
index 00000000..82d344e0
--- /dev/null
+++ b/rocketmq-spring-cloud-stream-binder/src/main/resources/META-INF/spring.factories
@@ -0,0 +1,2 @@
+org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
+com.alibaba.cloud.stream.binder.rocketmq.config.RocketMQComponent4BinderAutoConfiguration
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
similarity index 88%
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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
index 33bd1187..c456defd 100644
--- 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/com/alibaba/cloud/stream/binder/rocketmq/RocketMQAutoConfigurationTests.java
@@ -14,16 +14,16 @@
* limitations under the License.
*/
-package org.springframework.cloud.stream.binder.rocketmq;
+package com.alibaba.cloud.stream.binder.rocketmq;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
import org.springframework.boot.autoconfigure.AutoConfigurations;
import org.springframework.boot.test.context.runner.ApplicationContextRunner;
-import org.springframework.cloud.stream.binder.rocketmq.config.RocketMQBinderAutoConfiguration;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
-import org.springframework.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.config.RocketMQBinderAutoConfiguration;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQBinderConfigurationProperties;
+import com.alibaba.cloud.stream.binder.rocketmq.properties.RocketMQExtendedBindingProperties;
/**
* @author Jim
diff --git a/spring-cloud-alibaba-coverage/pom.xml b/spring-cloud-alibaba-coverage/pom.xml
index cad22a3c..0791ad71 100644
--- a/spring-cloud-alibaba-coverage/pom.xml
+++ b/spring-cloud-alibaba-coverage/pom.xml
@@ -3,8 +3,8 @@
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
@@ -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/spring-cloud-alibaba-docs/pom.xml
index eb1684ea..2e2925fa 100644
--- a/spring-cloud-alibaba-docs/pom.xml
+++ b/spring-cloud-alibaba-docs/pom.xml
@@ -3,13 +3,13 @@
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
+ com.alibaba.cloud
spring-cloud-alibaba-docs
Spring Cloud Alibaba Documentation
pom
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
index f3526317..12796181 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/schedulerx.adoc
@@ -75,7 +75,7 @@ public class SimpleTask implements ScxSimpleJobProcessor {
[source,text]
----
Job分组:测试——***-*-*-****
-Job处理接口:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+Job处理接口:com.alibaba.cloud.examples.SimpleTask
类型:简单Job单机版
定时表达式:默认选项——0 * * * * ?
Job描述:无
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
index 736a24b8..fa6e2bba 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc-zh/sentinel.adoc
@@ -193,7 +193,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
#spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
#spring.cloud.sentinel.datasource.ds1.file.data-type=custom
-#spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter
+#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter
#spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848
@@ -219,7 +219,7 @@ NOTE: d1, ds2, ds3, ds4 是 `ReadableDataSource` 的名字,可随意编写。
每种数据源都有两个共同的配置项: `data-type`、 `converter-class` 以及 `rule-type`。
-`data-type` 配置项表示 `Converter` 类型,Spring Cloud Alibaba Sentinel 默认提供两种内置的值,分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`,可以填写 `custom` 表示自定义 `Converter`,然后再配置 `converter-class` 配置项,该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter`)。
+`data-type` 配置项表示 `Converter` 类型,Spring Cloud Alibaba Sentinel 默认提供两种内置的值,分别是 `json` 和 `xml` (不填默认是json)。 如果不想使用内置的 `json` 或 `xml` 这两种 `Converter`,可以填写 `custom` 表示自定义 `Converter`,然后再配置 `converter-class` 配置项,该配置项需要写类的全路径名(比如 `spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter`)。
`rule-type` 配置表示该数据源中的规则属于哪种类型的规则(`flow`,`degrade`,`authority`,`system`, `param-flow`)。
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
index 2c95df6b..8b2f466c 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc/schedulerx.adoc
@@ -75,7 +75,7 @@ Go to the https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test[S
[source,text]
----
Job Group: Test——***-*-*-****
-Job process interface:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+Job process interface:com.alibaba.cloud.examples.SimpleTask
Type: Simple Single-Server Job
Quartz Cron Expression: Default Option——0 * * * * ?
Job Description: Empty
diff --git a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
index a2a828b2..bedae880 100644
--- a/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
+++ b/spring-cloud-alibaba-docs/src/main/asciidoc/sentinel.adoc
@@ -195,7 +195,7 @@ spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
#spring.cloud.sentinel.datasource.ds1.file.file=classpath: flowrule.json
#spring.cloud.sentinel.datasource.ds1.file.data-type=custom
-#spring.cloud.sentinel.datasource.ds1.file.converter-class=org.springframework.cloud.alibaba.cloud.examples.JsonFlowRuleListConverter
+#spring.cloud.sentinel.datasource.ds1.file.converter-class=com.alibaba.cloud.examples.JsonFlowRuleListConverter
#spring.cloud.sentinel.datasource.ds1.file.rule-type=flow
spring.cloud.sentinel.datasource.ds2.nacos.server-addr=localhost:8848
diff --git a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory b/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
deleted file mode 100644
index 77ac945a..00000000
--- a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/dubbo/com.alibaba.dubbo.registry.RegistryFactory
+++ /dev/null
@@ -1 +0,0 @@
-spring-cloud=org.springframework.cloud.alibaba.dubbo.registry.SpringCloudRegistryFactory
\ No newline at end of file
diff --git a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 3e60d4d2..00000000
--- a/spring-cloud-alibaba-dubbo/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,16 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboMetadataAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboOpenFeignAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceRegistrationNonWebApplicationAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboLoadBalancedRestTemplateAutoConfiguration,\
-org.springframework.cloud.alibaba.dubbo.autoconfigure.DubboServiceAutoConfiguration
-
-org.springframework.boot.actuate.autoconfigure.web.ManagementContextConfiguration=\
-org.springframework.cloud.alibaba.dubbo.actuate.DubboMetadataEndpointAutoConfiguration
-
-org.springframework.context.ApplicationContextInitializer=\
-org.springframework.cloud.alibaba.dubbo.context.DubboServiceRegistrationApplicationContextInitializer
-
-org.springframework.boot.env.EnvironmentPostProcessor=\
-org.springframework.cloud.alibaba.dubbo.env.DubboNonWebApplicationEnvironmentPostProcessor
\ No newline at end of file
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 9d6fd215..2d656938 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/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AcmApplication.java b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AcmApplication.java
rename to spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java
index 5d48c381..5fff5016 100644
--- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AcmApplication.java
+++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/AcmApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
similarity index 95%
rename from spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java
rename to spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
index b7c87461..ca39827c 100644
--- a/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java
+++ b/spring-cloud-alibaba-examples/acm-example/acm-local-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 196dfaba..71ddd175 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-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
similarity index 87%
rename from spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
rename to spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
index e95b2e9c..456e60e9 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -24,7 +24,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
* @author xiaolongzuo
*/
@SpringBootApplication
-@EnableFeignClients(basePackages = {"org.springframework.cloud.alibaba.cloud.examples"})
+@EnableFeignClients(basePackages = {"com.alibaba.cloud.examples"})
public class ConsumerApplication {
public static void main(String[] args) {
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoService.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java
similarity index 94%
rename from spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoService.java
rename to spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java
index 78b3c486..9b0e7e0f 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoService.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/EchoService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
similarity index 96%
rename from spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
rename to spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
index 8f2a3e8c..dd862b0a 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties
index 74babdc1..ac697b88 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-feign-example/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.application.name=feign-consumer
server.port=18083
# The following configuration can be omitted.
spring.cloud.alicloud.ans.server-list=127.0.0.1
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 a979ca4b..ee90de17 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-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
rename to spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
index 223a2d89..bb8b8d5b 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
similarity index 96%
rename from spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
rename to spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
index e3853fdd..ecae59ea 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/java/com/alibaba/cloud/examples/HomeController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties
index d9b7ed46..33a7e5aa 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/ans-example/ans-consumer-ribbon-example/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.application.name=ribbon-consumer
server.port=18082
# The following configuration can be omitted.
spring.cloud.alicloud.ans.server-list=127.0.0.1
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 2cc604f1..d4ba010d 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/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
similarity index 96%
rename from spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java
rename to spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
index a9c031ea..839f43be 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/EchoController.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/EchoController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
rename to spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
index 03436dcb..651828d0 100644
--- a/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
+++ b/spring-cloud-alibaba-examples/ans-example/ans-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
similarity index 91%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
index 70ddae33..2c2a7746 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/README_CN.md
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/README_CN.md
@@ -15,7 +15,7 @@ public interface EchoService {
```
为了确保契约的一致性,推荐的做法是将 Dubbo 服务接口打包在第二方或者第三方的 artifact(jar)中,如以上接口就存放在
- artifact [spring-cloud-dubbo-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api) 之中。
+ artifact [dubbo-spring-cloud-sample-api](https://github.com/spring-cloud-incubator/spring-cloud-alibaba/tree/master/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api) 之中。
对于服务提供方而言,不仅通过依赖 artifact 的形式引入 Dubbo 服务接口,而且需要将其实现。对应的服务消费端,同样地需要依赖该 artifact,
并以接口调用的方式执行远程方法。接下来进一步讨论怎样实现 Dubbo 服务提供方和消费方。
@@ -33,8 +33,8 @@ Dubbo Spring Cloud 必要的依赖:
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-sample-api
${project.version}
@@ -46,24 +46,24 @@ Dubbo Spring Cloud 必要的依赖:
- 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
```
以上依赖 artifact 说明如下:
-- `spring-cloud-dubbo-sample-api` : 提供 `EchoService` 接口的 artifact
+- `dubbo-spring-cloud-sample-api` : 提供 `EchoService` 接口的 artifact
- `spring-boot-actuator` : Spring Boot Production-Ready artifact,间接引入 `spring-boot` artifact
-- `spring-cloud-starter-dubbo` : Dubbo Spring Cloud Starter `artifact`,间接引入 `dubbo-spring-boot-starter` 等 artifact
-- `spring-cloud-starter-alibaba-nacos-discovery` : Nacos Spring Cloud 服务注册与发现 `artifact`
+- `dubbo-spring-cloud-starter` : Dubbo Spring Cloud Starter `artifact`,间接引入 `dubbo-spring-boot-starter` 等 artifact
+- `alibaba-nacos-discovery-spring-cloud-starter` : Nacos Spring Cloud 服务注册与发现 `artifact`
值得注意的是,以上 artifact 未指定版本(version),因此,还需显示地声明 `` :
@@ -119,7 +119,7 @@ class EchoServiceImpl implements EchoService {
dubbo:
scan:
# dubbo 服务扫描基准包
- base-packages: org.springframework.cloud.alibaba.dubbo.bootstrap
+ base-packages: com.alibaba.cloud.dubbo.bootstrap
protocol:
# dubbo 协议
name: dubbo
@@ -216,8 +216,8 @@ public class DubboSpringCloudServerBootstrap {
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-sample-api
${project.version}
@@ -234,14 +234,14 @@ public class DubboSpringCloudServerBootstrap {
- 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
```
@@ -341,7 +341,7 @@ HTTP 响应为:
## 模块说明
-- [spring-cloud-dubbo-sample-api](spring-cloud-dubbo-sample-api):API 模块,存放 Dubbo 服务接口和模型定义
+- [dubbo-spring-cloud-sample-api](dubbo-spring-cloud-sample-api):API 模块,存放 Dubbo 服务接口和模型定义
- [spring-cloud-dubbo-provider-web-sample](spring-cloud-dubbo-provider-web-sample):Dubbo Spring Cloud 服务提供方示例(Web 应用)
- [spring-cloud-dubbo-provider-sample](spring-cloud-dubbo-provider-sample):Dubbo Spring Cloud 服务提供方示例(非 Web 应用)
- [spring-cloud-dubbo-consumer-sample](spring-cloud-dubbo-consumer-sample):Dubbo Spring Cloud 服务消费方示例
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml
similarity index 87%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml
index 1247cc08..3f65c152 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/pom.xml
@@ -5,13 +5,14 @@
org.springframework.cloud
spring-cloud-build
- 2.1.3.RELEASE
+ 2.1.6.RELEASE
4.0.0
- spring-cloud-dubbo-client-sample
- Spring Cloud Dubbo Client Sample
+ com.alibaba.cloud
+ dubbo-spring-cloud-client-sample
+ Dubbo Spring Cloud Client Sample
0.9.1.BUILD-SNAPSHOT
@@ -30,8 +31,8 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-sample-api
${project.version}
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
similarity index 92%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
index 18a8fff2..b5733c70 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudClientBootstrap.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
+
+import com.alibaba.cloud.dubbo.service.EchoService;
import org.apache.dubbo.config.annotation.Reference;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.alibaba.dubbo.service.EchoService;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-client-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-client-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml
similarity index 83%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml
index 49cc5441..dd7f17ed 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/pom.xml
@@ -3,16 +3,16 @@
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-alibaba-dubbo-examples
+ com.alibaba.cloud
+ dubbo-spring-cloud-alibaba-examples
0.9.1.BUILD-SNAPSHOT
../pom.xml
4.0.0
- org.springframework.cloud
- spring-cloud-dubbo-consumer-sample
- Spring Cloud Dubbo Consumer Sample
+ com.alibaba.cloud
+ dubbo-spring-cloud-consumer-sample
+ Dubbo Spring Cloud Consumer Sample
@@ -40,23 +40,23 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-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/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
similarity index 82%
rename from 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
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
index 0fb73298..52879437 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/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java
@@ -14,19 +14,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
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;
-import org.springframework.cloud.alibaba.dubbo.annotation.DubboTransported;
-import org.springframework.cloud.alibaba.dubbo.service.RestService;
-import org.springframework.cloud.alibaba.dubbo.service.User;
-import org.springframework.cloud.alibaba.dubbo.service.UserService;
+import com.alibaba.cloud.dubbo.annotation.DubboTransported;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -44,6 +42,10 @@ import org.springframework.web.client.RestTemplate;
import java.util.HashMap;
import java.util.Map;
+import com.alibaba.cloud.dubbo.service.RestService;
+import com.alibaba.cloud.dubbo.service.User;
+import com.alibaba.cloud.dubbo.service.UserService;
+
import static org.springframework.http.MediaType.APPLICATION_JSON_UTF8_VALUE;
/**
@@ -124,44 +126,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-consumer-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-consumer-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml
similarity index 87%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml
index 3672b591..5800ae14 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/pom.xml
@@ -3,16 +3,16 @@
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-alibaba-dubbo-examples
+ com.alibaba.cloud
+ dubbo-spring-cloud-alibaba-examples
0.9.1.BUILD-SNAPSHOT
../pom.xml
4.0.0
- org.springframework.cloud
- spring-cloud-dubbo-provider-sample
- Spring Cloud Dubbo Provider Sample
+ com.alibaba.cloud
+ dubbo-spring-cloud-provider-sample
+ Dubbo Spring Cloud Provider Sample
@@ -37,23 +37,23 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-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-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
similarity index 96%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
index 8e6ed4e9..acf54d61 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
similarity index 91%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
index cd1aa8b3..44ba03ba 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.config.annotation.Service;
@@ -22,6 +22,9 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import com.alibaba.cloud.dubbo.service.User;
+import com.alibaba.cloud.dubbo.service.UserService;
+
/**
* In-Memory {@link UserService} implementation
*/
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/StandardRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/StandardRestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
index aeea2b16..806d7a52 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/StandardRestService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/java/com/alibaba/cloud/dubbo/service/StandardRestService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.config.annotation.Service;
import org.slf4j.Logger;
@@ -33,7 +33,10 @@ import javax.ws.rs.core.MediaType;
import java.util.HashMap;
import java.util.Map;
-import static org.springframework.cloud.alibaba.dubbo.util.LoggerUtils.log;
+import com.alibaba.cloud.dubbo.service.RestService;
+import com.alibaba.cloud.dubbo.service.User;
+
+import static com.alibaba.cloud.dubbo.util.LoggerUtils.log;
import static org.springframework.util.MimeTypeUtils.APPLICATION_JSON_VALUE;
/**
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
similarity index 83%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
index 056b4856..1a7ec7c5 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/application.yaml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/application.yaml
@@ -1,6 +1,6 @@
dubbo:
scan:
- base-packages: org.springframework.cloud.alibaba.dubbo.service
+ base-packages: com.alibaba.cloud.dubbo.service
protocols:
dubbo:
name: dubbo
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-sample/src/main/resources/bootstrap.yaml
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/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
similarity index 82%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
index c4615e73..9fef98f3 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/pom.xml
@@ -3,16 +3,16 @@
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-alibaba-dubbo-examples
+ com.alibaba.cloud
+ dubbo-spring-cloud-alibaba-examples
0.9.1.BUILD-SNAPSHOT
../pom.xml
4.0.0
- org.springframework.cloud
- spring-cloud-dubbo-provider-web-sample
- Spring Cloud Dubbo Provider Web Sample
+ com.alibaba.cloud
+ dubbo-spring-cloud-provider-web-sample
+ Dubbo Spring Cloud Provider Web Sample
@@ -29,15 +29,15 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-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-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
index 799a3a74..2f093be3 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudWebProviderBootstrap.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
similarity index 91%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
index cd1aa8b3..44ba03ba 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/InMemoryUserService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/InMemoryUserService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.config.annotation.Service;
@@ -22,6 +22,9 @@ import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
+import com.alibaba.cloud.dubbo.service.User;
+import com.alibaba.cloud.dubbo.service.UserService;
+
/**
* In-Memory {@link UserService} implementation
*/
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/SpringRestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/SpringRestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
index f39fd70e..aa5ff539 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/service/SpringRestService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/java/com/alibaba/cloud/dubbo/service/SpringRestService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import org.apache.dubbo.config.annotation.Service;
import org.slf4j.Logger;
@@ -31,7 +31,10 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.HashMap;
import java.util.Map;
-import static org.springframework.cloud.alibaba.dubbo.util.LoggerUtils.log;
+import com.alibaba.cloud.dubbo.service.RestService;
+import com.alibaba.cloud.dubbo.service.User;
+
+import static com.alibaba.cloud.dubbo.util.LoggerUtils.log;
/**
* Spring MVC {@link RestService}
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
similarity index 87%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
index de4a8666..b6858c74 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/application.yaml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/application.yaml
@@ -1,6 +1,6 @@
dubbo:
scan:
- base-packages: org.springframework.cloud.alibaba.dubbo.service
+ base-packages: com.alibaba.cloud.dubbo.service
protocols:
dubbo:
name: dubbo
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-web-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-provider-web-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml
similarity index 74%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/pom.xml
index 146bb262..2ec3e0e3 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/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">
- spring-cloud-alibaba-dubbo-examples
- org.springframework.cloud
+ dubbo-spring-cloud-alibaba-examples
+ com.alibaba.cloud
0.9.1.BUILD-SNAPSHOT
4.0.0
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
- Spring Cloud Dubbo Sample API
+ com.alibaba.cloud
+ dubbo-spring-cloud-sample-api
+ Dubbo Spring Cloud Sample API
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/EchoService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
similarity index 94%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/EchoService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
index ef2fa287..3d640327 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/EchoService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/EchoService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
/**
* Echo Service
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/RestService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/RestService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
index 442a0a9a..0c3126a4 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/RestService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/RestService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import java.util.Map;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/User.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
similarity index 96%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/User.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
index f91caba3..a6747953 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/User.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/User.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import java.io.Serializable;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/UserService.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
similarity index 94%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/UserService.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
index 471f07bf..4e969e53 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/service/UserService.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/service/UserService.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.service;
+package com.alibaba.cloud.dubbo.service;
import java.util.Collection;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/util/LoggerUtils.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
similarity index 96%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/util/LoggerUtils.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
index 1985c283..f3fb50f5 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-sample-api/src/main/java/org/springframework/cloud/alibaba/dubbo/util/LoggerUtils.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-sample-api/src/main/java/com/alibaba/cloud/dubbo/util/LoggerUtils.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.util;
+package com.alibaba.cloud.dubbo.util;
import org.apache.dubbo.rpc.RpcContext;
import org.slf4j.Logger;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml
similarity index 86%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml
index 5ab588fd..92b15bb9 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/pom.xml
@@ -5,14 +5,15 @@
org.springframework.cloud
spring-cloud-build
- 2.1.3.RELEASE
+ 2.1.6.RELEASE
4.0.0
-
- spring-cloud-dubbo-server-sample
- Spring Cloud Dubbo Server Sample
+
+ com.alibaba.cloud
+ dubbo-spring-cloud-server-sample
+ Dubbo Spring Cloud Server Sample
0.9.1.BUILD-SNAPSHOT
@@ -32,8 +33,8 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-sample-api
${project.version}
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
similarity index 92%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
index 5d943730..2a0ea1d7 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServerBootstrap.java
@@ -14,13 +14,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
+
+import com.alibaba.cloud.dubbo.service.EchoService;
import org.apache.dubbo.config.annotation.Service;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.cloud.alibaba.dubbo.service.EchoService;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
/**
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
similarity index 81%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
index cee5b8fe..394df7ec 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-server-sample/src/main/resources/bootstrap.yaml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-server-sample/src/main/resources/bootstrap.yaml
@@ -1,6 +1,6 @@
dubbo:
scan:
- base-packages: org.springframework.cloud.alibaba.dubbo.bootstrap
+ base-packages: com.alibaba.cloud.dubbo.bootstrap
protocol:
name: dubbo
port: -1
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/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
similarity index 60%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
index ac58a814..874fdfe0 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/pom.xml
@@ -3,16 +3,16 @@
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">
- spring-cloud-alibaba-dubbo-examples
- org.springframework.cloud
+ dubbo-spring-cloud-alibaba-examples
+ com.alibaba.cloud
0.9.1.BUILD-SNAPSHOT
../pom.xml
4.0.0
- org.springframework.cloud
- spring-cloud-dubbo-servlet-gateway-sample
- Spring Cloud Dubbo Servlet Gateway Sample
+ com.alibaba.cloud
+ dubbo-spring-cloud-servlet-gateway-sample
+ Dubbo Spring Cloud Servlet Gateway Sample
@@ -23,21 +23,26 @@
- org.springframework.cloud
- spring-cloud-dubbo-sample-api
+ com.alibaba.cloud
+ dubbo-spring-cloud-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
+
+
+
+ org.springframework.boot
+ spring-boot-actuator
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
similarity index 83%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
index 0ad4d68e..2d5e7ea7 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/bootstrap/DubboSpringCloudServletGatewayBootstrap.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.dubbo.bootstrap;
+package com.alibaba.cloud.dubbo.bootstrap;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
@@ -12,7 +12,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
@EnableDiscoveryClient
@EnableAutoConfiguration
@EnableFeignClients
-@ServletComponentScan(basePackages = "org.springframework.cloud.alibaba.dubbo.gateway")
+@ServletComponentScan(basePackages = "com.alibaba.cloud.dubbo.gateway")
public class DubboSpringCloudServletGatewayBootstrap {
public static void main(String[] args) {
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/gateway/DubboGatewayServlet.java b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
similarity index 89%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/gateway/DubboGatewayServlet.java
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
index 21eab7e3..b486e940 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/gateway/DubboGatewayServlet.java
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/java/com/alibaba/cloud/dubbo/gateway/DubboGatewayServlet.java
@@ -1,16 +1,16 @@
-package org.springframework.cloud.alibaba.dubbo.gateway;
+package com.alibaba.cloud.dubbo.gateway;
import org.apache.dubbo.rpc.service.GenericException;
import org.apache.dubbo.rpc.service.GenericService;
-import org.springframework.cloud.alibaba.dubbo.http.MutableHttpServerRequest;
-import org.springframework.cloud.alibaba.dubbo.metadata.DubboRestServiceMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RequestMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.RestMethodMetadata;
-import org.springframework.cloud.alibaba.dubbo.metadata.repository.DubboServiceMetadataRepository;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContext;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceExecutionContextFactory;
-import org.springframework.cloud.alibaba.dubbo.service.DubboGenericServiceFactory;
+import com.alibaba.cloud.dubbo.http.MutableHttpServerRequest;
+import com.alibaba.cloud.dubbo.metadata.DubboRestServiceMetadata;
+import com.alibaba.cloud.dubbo.metadata.RequestMetadata;
+import com.alibaba.cloud.dubbo.metadata.RestMethodMetadata;
+import com.alibaba.cloud.dubbo.metadata.repository.DubboServiceMetadataRepository;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContext;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceExecutionContextFactory;
+import com.alibaba.cloud.dubbo.service.DubboGenericServiceFactory;
import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpRequest;
import org.springframework.util.AntPathMatcher;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/application.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/application.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/application.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-servlet-gateway-sample/src/main/resources/bootstrap.yaml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/dubbo-spring-cloud-servlet-gateway-sample/src/main/resources/bootstrap.yaml
diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml
similarity index 80%
rename from spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
rename to spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml
index ee9f0d12..6360f51c 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml
+++ b/spring-cloud-alibaba-examples/dubbo-spring-cloud-alibaba-examples/pom.xml
@@ -5,25 +5,25 @@
org.springframework.cloud
spring-cloud-build
- 2.1.3.RELEASE
+ 2.1.6.RELEASE
4.0.0
- org.springframework.cloud
- spring-cloud-alibaba-dubbo-examples
+ com.alibaba.cloud
+ dubbo-spring-cloud-alibaba-examples
0.9.1.BUILD-SNAPSHOT
- Spring Cloud Alibaba Dubbo Examples
+ Dubbo Spring Cloud Alibaba Examples
pom
- spring-cloud-dubbo-sample-api
- spring-cloud-dubbo-server-sample
- spring-cloud-dubbo-client-sample
- spring-cloud-dubbo-provider-sample
- spring-cloud-dubbo-consumer-sample
- spring-cloud-dubbo-provider-web-sample
- spring-cloud-dubbo-servlet-gateway-sample
+ dubbo-spring-cloud-sample-api
+ dubbo-spring-cloud-server-sample
+ dubbo-spring-cloud-client-sample
+ dubbo-spring-cloud-provider-sample
+ dubbo-spring-cloud-consumer-sample
+ dubbo-spring-cloud-provider-web-sample
+ dubbo-spring-cloud-servlet-gateway-sample
@@ -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/nacos-example/nacos-config-example/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/pom.xml
index ca72deb5..4a7f96ef 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-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
similarity index 94%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
index 4ae6ed98..69851e5f 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Application.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.io.IOException;
import java.io.StringReader;
@@ -11,12 +11,12 @@ import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
import org.springframework.cloud.context.config.annotation.RefreshScope;
import org.springframework.stereotype.Component;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
+import com.alibaba.cloud.nacos.NacosConfigProperties;
import com.alibaba.nacos.api.config.listener.Listener;
/**
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 d340f6ff..769342d0 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-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
similarity index 88%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
index 97712312..29d44bee 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ConsumerApplication.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/ConsumerApplication.java
@@ -1,9 +1,12 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
+
+import com.alibaba.cloud.examples.ConsumerApplication.EchoService;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.ConsumerApplication.EchoService;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
+
+import org.springframework.cloud.client.SpringCloudApplication;
import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
import org.springframework.cloud.client.loadbalancer.LoadBalanced;
import org.springframework.cloud.openfeign.EnableFeignClients;
@@ -18,8 +21,7 @@ import org.springframework.web.client.RestTemplate;
/**
* @author xiaojing
*/
-@SpringBootApplication
-@EnableDiscoveryClient
+@SpringCloudApplication
@EnableFeignClients
public class ConsumerApplication {
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java
similarity index 94%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java
index 1b1970b8..75b5deed 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-consumer-example/src/main/java/com/alibaba/cloud/examples/TestController.java
@@ -1,7 +1,8 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
+
+import com.alibaba.cloud.examples.ConsumerApplication.EchoService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.cloud.examples.ConsumerApplication.EchoService;
import org.springframework.cloud.client.discovery.DiscoveryClient;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestMapping;
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 18304be8..2fd7861b 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-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
similarity index 96%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
index e9d6a743..c0bc7b01 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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-spring-cloud-config-client/pom.xml
similarity index 87%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/pom.xml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/pom.xml
index d51c58fb..13b92c40 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-spring-cloud-config-client/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
nacos-discovery-example
0.9.1.BUILD-SNAPSHOT
4.0.0
- nacos-discovery-with-spring-cloud-config-example
+ nacos-discovery-spring-cloud-config-client
jar
Example demonstrating how to use nacos discovery
@@ -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/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GetConfigController.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
similarity index 85%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GetConfigController.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
index 881d40ba..e8ab1383 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GetConfigController.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/GetConfigController.java
@@ -1,19 +1,19 @@
-package org.springframework.cloud.alibaba.cloud.examples;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-public class GetConfigController {
-
- @Value("${config}")
- private String config;
-
- @RequestMapping(value = "/config", method = RequestMethod.GET)
- public String getConfig() {
- return config;
- }
-
-}
+package com.alibaba.cloud.examples;
+
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class GetConfigController {
+
+ @Value("${config}")
+ private String config;
+
+ @RequestMapping(value = "/config", method = RequestMethod.GET)
+ public String getConfig() {
+ return config;
+ }
+
+}
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
similarity index 88%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
index f81a4158..99665a37 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/java/com/alibaba/cloud/examples/NacosDiscoverySpringConfigApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/application.yml
similarity index 100%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/application.yml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/application.yml
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
similarity index 74%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
index 66fab66f..f9bbcea9 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-with-spring-cloud-config-example/src/main/resources/bootstrap.yml
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-client/src/main/resources/bootstrap.yml
@@ -1,10 +1,12 @@
-spring:
- application:
- name: client
- cloud:
- nacos:
- discovery:
- server-addr: localhost:8848
- config:
- discovery:
- enabled: true
\ No newline at end of file
+spring:
+ application:
+ name: client
+ cloud:
+ nacos:
+ discovery:
+ server-addr: localhost:8848
+ config:
+ discovery:
+ enabled: true
+ profiles:
+ active: dev
\ No newline at end of file
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml
new file mode 100644
index 00000000..fe887a9d
--- /dev/null
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/pom.xml
@@ -0,0 +1,59 @@
+
+
+
+
+ com.alibaba.cloud
+ nacos-discovery-example
+ 0.9.1.BUILD-SNAPSHOT
+
+ 4.0.0
+
+
+ nacos-discovery-with-spring-cloud-config-example
+ jar
+ Example demonstrating how to use nacos discovery
+
+
+
+
+ org.springframework.boot
+ spring-boot-starter-web
+
+
+
+ org.springframework.cloud
+ spring-cloud-config-server
+
+
+
+ com.alibaba.cloud
+ alibaba-nacos-discovery-spring-cloud-starter
+
+
+
+ org.springframework.boot
+ spring-boot-starter-test
+ test
+
+
+
+
+
+
+
+ org.springframework.boot
+ spring-boot-maven-plugin
+
+
+ org.apache.maven.plugins
+ maven-deploy-plugin
+ ${maven-deploy-plugin.version}
+
+ true
+
+
+
+
+
+
diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java
similarity index 51%
rename from spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java
index 345b443d..0789b5e5 100644
--- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/SentinelDataSourceConstants.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/java/com/alibaba/cloud/examples/SpringCloudConfigServerApplication.java
@@ -5,7 +5,7 @@
* 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
+ * https://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,
@@ -14,13 +14,23 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.sentinel.datasource;
+package com.alibaba.cloud.examples;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.client.discovery.EnableDiscoveryClient;
+import org.springframework.cloud.config.server.EnableConfigServer;
/**
* @author Jim
*/
-public interface SentinelDataSourceConstants {
+@SpringBootApplication
+@EnableDiscoveryClient
+@EnableConfigServer
+public class SpringCloudConfigServerApplication {
- String PROPERTY_PREFIX = "spring.cloud.sentinel";
+ public static void main(String[] args) {
+ SpringApplication.run(SpringCloudConfigServerApplication.class, args);
+ }
}
diff --git a/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml
new file mode 100644
index 00000000..e7fe16a4
--- /dev/null
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-discovery-example/nacos-discovery-spring-cloud-config-server/src/main/resources/application.yml
@@ -0,0 +1,16 @@
+server:
+ port: 7070
+
+spring:
+ application:
+ name: configserver
+ cloud:
+ nacos:
+ discovery:
+ server-addr: localhost:8848
+ config:
+ server:
+ git:
+ uri: https://github.com/fangjian0423/blogimages
+ search-paths: /
+
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 6f27e67a..4f694a0b 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
@@ -19,6 +19,7 @@
nacos-discovery-consumer-example
nacos-discovery-provider-example
- nacos-discovery-with-spring-cloud-config-example
+ nacos-discovery-spring-cloud-config-client
+ nacos-discovery-spring-cloud-config-server
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 18e54636..c460e966 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-discovery-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GatewayApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/com/alibaba/cloud/examples/GatewayApplication.java
similarity index 87%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GatewayApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/com/alibaba/cloud/examples/GatewayApplication.java
index c581d1ff..a59a4168 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/GatewayApplication.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-discovery-example/src/main/java/com/alibaba/cloud/examples/GatewayApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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 2a675eea..03701a4d 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/nacos-gateway-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
rename to spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
index 843f5cbe..718d06f7 100644
--- a/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ProviderApplication.java
+++ b/spring-cloud-alibaba-examples/nacos-example/nacos-gateway-example/nacos-gateway-provider-example/src/main/java/com/alibaba/cloud/examples/ProviderApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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 1e7a1d6e..0a4eae60 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 ef9c417c..bb10248b 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/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssApplication.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssApplication.java
rename to spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java
index f9265800..4231a7f2 100644
--- a/spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssApplication.java
+++ b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssApplication.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import com.aliyun.oss.OSS;
import org.springframework.beans.factory.annotation.Autowired;
@@ -18,7 +18,7 @@ import java.net.URISyntaxException;
@SpringBootApplication
public class OssApplication {
- public static final String BUCKET_NAME = "spring-cloud-alibaba-test";
+ public static final String BUCKET_NAME = "spring-cloud-alibaba";
public static void main(String[] args) throws URISyntaxException {
SpringApplication.run(OssApplication.class, args);
diff --git a/spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssController.java b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java
similarity index 97%
rename from spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssController.java
rename to spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java
index 7c6e427a..8131d6b6 100644
--- a/spring-cloud-alibaba-examples/oss-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OssController.java
+++ b/spring-cloud-alibaba-examples/oss-example/src/main/java/com/alibaba/cloud/examples/OssController.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import com.aliyun.oss.OSS;
import com.aliyun.oss.common.utils.IOUtils;
diff --git a/spring-cloud-alibaba-examples/pom.xml b/spring-cloud-alibaba-examples/pom.xml
index addee644..ad1b98b6 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
@@ -39,9 +39,9 @@
rocketmq-example/rocketmq-consume-example
rocketmq-example/rocketmq-produce-example
sms-example
- spring-cloud-bus-rocketmq-example
+ rocketmq-spring-cloud-bus-example
schedulerx-example/schedulerx-simple-task-example
- spring-cloud-alibaba-dubbo-examples
+ dubbo-spring-cloud-alibaba-examples
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 afcd0911..e11c2199 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/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java
similarity index 90%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java
index e98b6a10..89e69a66 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/Foo.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
/**
* @author Jim
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ReceiveService.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/ReceiveService.java
similarity index 93%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ReceiveService.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/ReceiveService.java
index 35fc25a6..0544f6ae 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ReceiveService.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/ReceiveService.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.cloud.stream.annotation.StreamListener;
import org.springframework.messaging.handler.annotation.Payload;
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQConsumerApplication.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java
similarity index 91%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQConsumerApplication.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java
index e7a2385f..caf9f357 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQConsumerApplication.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/com/alibaba/cloud/examples/RocketMQConsumerApplication.java
@@ -1,10 +1,11 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
+
+import com.alibaba.cloud.examples.RocketMQConsumerApplication.MySink;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQConsumerApplication.MySink;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.Input;
import org.springframework.cloud.stream.binder.PollableMessageSource;
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 9a9603c2..54757414 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/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java
similarity index 90%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java
index e98b6a10..89e69a66 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-consume-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Foo.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/Foo.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
/**
* @author Jim
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQProduceApplication.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQProduceApplication.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java
index 9a55a4a4..3f8034b2 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RocketMQProduceApplication.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/RocketMQProduceApplication.java
@@ -1,10 +1,11 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
+
+import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
import org.springframework.cloud.stream.annotation.EnableBinding;
import org.springframework.cloud.stream.annotation.Output;
import org.springframework.context.annotation.Bean;
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SenderService.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java
similarity index 92%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SenderService.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java
index b6d49cf8..70ce1f51 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SenderService.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/SenderService.java
@@ -1,12 +1,13 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import com.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
+
import org.apache.rocketmq.common.message.MessageConst;
import org.apache.rocketmq.spring.support.RocketMQHeaders;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alibaba.cloud.examples.RocketMQProduceApplication.MySource;
import org.springframework.messaging.Message;
import org.springframework.messaging.MessageHeaders;
import org.springframework.messaging.support.MessageBuilder;
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/TransactionListenerImpl.java
similarity index 97%
rename from spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java
rename to spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/TransactionListenerImpl.java
index 0bd48410..f2b3b6b6 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TransactionListenerImpl.java
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/java/com/alibaba/cloud/examples/TransactionListenerImpl.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.apache.rocketmq.spring.annotation.RocketMQTransactionListener;
import org.apache.rocketmq.spring.core.RocketMQLocalTransactionListener;
diff --git a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/resources/application.properties
index a77b3084..56269492 100644
--- a/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/rocketmq-example/rocketmq-produce-example/src/main/resources/application.properties
@@ -1,4 +1,4 @@
-logging.level.org.springframework.cloud.stream.binder.rocketmq=DEBUG
+logging.level.com.alibaba.cloud.stream.binder.rocketmq=DEBUG
spring.cloud.stream.rocketmq.binder.name-server=127.0.0.1:9876
diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml
similarity index 81%
rename from spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml
rename to spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml
index 6ecb7cf2..885fc028 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/pom.xml
+++ b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/pom.xml
@@ -4,22 +4,22 @@
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
- spring-cloud-bus-rocketmq-example
- Spring Cloud Bus RocketMQ Example
+ com.alibaba.cloud
+ rocketmq-spring-cloud-bus-example
+ RocketMQ Spring Cloud Bus Example
- org.springframework.cloud
- spring-cloud-starter-bus-rocketmq
+ com.alibaba.cloud
+ rocketmq-spring-cloud-starter-bus
diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java
rename to spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java
index 60299a22..6a8eee88 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java
+++ b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/RocketMQBusApplication.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples.rocketmq;
+package com.alibaba.cloud.examples.rocketmq;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -39,7 +39,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
*/
@RestController
@EnableAutoConfiguration
-@RemoteApplicationEventScan(basePackages = "org.springframework.cloud.alibaba.cloud.examples.rocketmq")
+@RemoteApplicationEventScan(basePackages = "com.alibaba.cloud.examples.rocketmq")
public class RocketMQBusApplication {
public static void main(String[] args) {
diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/User.java b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/User.java
rename to spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java
index ae22c92b..1e23e2bf 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/User.java
+++ b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/User.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples.rocketmq;
+package com.alibaba.cloud.examples.rocketmq;
/**
* User Domain
diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java
similarity index 95%
rename from spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java
rename to spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java
index fa404e89..dc830630 100644
--- a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java
+++ b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/java/com/alibaba/cloud/examples/rocketmq/UserRemoteApplicationEvent.java
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples.rocketmq;
+package com.alibaba.cloud.examples.rocketmq;
import org.springframework.cloud.bus.event.RemoteApplicationEvent;
diff --git a/spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/resources/bootstrap.properties b/spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/resources/bootstrap.properties
similarity index 100%
rename from spring-cloud-alibaba-examples/spring-cloud-bus-rocketmq-example/src/main/resources/bootstrap.properties
rename to spring-cloud-alibaba-examples/rocketmq-spring-cloud-bus-example/src/main/resources/bootstrap.properties
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 12bf1277..89d5f6f9 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/schedulerx-example/schedulerx-simple-task-example/readme-zh.md b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
index 9e9b6f02..0760f3ea 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/readme-zh.md
@@ -25,7 +25,7 @@ SchedulerX 是阿里中间件团队开发的一款分布式任务调度产品。
6. 进入[SchedulerX任务列表](https://edas.console.aliyun.com/#/edasSchedulerXJob?regionNo=cn-test)页面,选择上方"测试"区域,点击右上角"新建Job",创建一个Job,即如下所示。
Job分组:测试——111-1-1-1111
- Job处理接口:org.springframework.cloud.alibaba.cloud.examples.SimpleTask
+ Job处理接口:com.alibaba.cloud.examples.SimpleTask
类型:简单Job单机版
定时表达式:默认选项——0 * * * * ?
Job描述:无
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HelloController.java b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/HelloController.java
similarity index 94%
rename from spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HelloController.java
rename to spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/HelloController.java
index c11cbf98..56410502 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HelloController.java
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/HelloController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ScxApplication.java b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/ScxApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ScxApplication.java
rename to spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/ScxApplication.java
index baccfd4f..fe3d4357 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ScxApplication.java
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/ScxApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SimpleTask.java b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/SimpleTask.java
similarity index 95%
rename from spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SimpleTask.java
rename to spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/SimpleTask.java
index 17ced464..31d0ffa2 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SimpleTask.java
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/SimpleTask.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.beans.factory.annotation.Autowired;
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestController.java
similarity index 95%
rename from spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
rename to spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestController.java
index b237b279..3230e9b0 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.concurrent.atomic.AtomicInteger;
diff --git a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestService.java b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestService.java
similarity index 93%
rename from spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestService.java
rename to spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestService.java
index 3352c05a..7681b3ad 100644
--- a/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestService.java
+++ b/spring-cloud-alibaba-examples/schedulerx-example/schedulerx-simple-task-example/src/main/java/com/alibaba/cloud/examples/TestService.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.stereotype.Service;
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 10b621c9..3939427b 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/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountApplication.java b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountApplication.java
rename to spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountApplication.java
index 893d3464..7d52d74c 100644
--- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountApplication.java
+++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountController.java b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java
similarity index 97%
rename from spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountController.java
rename to spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java
index 7023438a..bd9654b7 100644
--- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/AccountController.java
+++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/AccountController.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.Random;
diff --git a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
similarity index 98%
rename from spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
rename to spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
index f1a6a50c..2b01844d 100644
--- a/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
+++ b/spring-cloud-alibaba-examples/seata-example/account-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.sql.SQLException;
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 683ace06..165e8d9d 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/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/BusinessApplication.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/BusinessApplication.java
similarity index 97%
rename from spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/BusinessApplication.java
rename to spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/BusinessApplication.java
index c0ed45fc..0b963bc8 100644
--- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/BusinessApplication.java
+++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/BusinessApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java
similarity index 89%
rename from spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
rename to spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java
index 0226f964..d1cf3bb8 100644
--- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/HomeController.java
+++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/HomeController.java
@@ -14,14 +14,15 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
+
+import com.alibaba.cloud.examples.BusinessApplication.OrderService;
+import com.alibaba.cloud.examples.BusinessApplication.StorageService;
import io.seata.spring.annotation.GlobalTransactional;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.springframework.cloud.alibaba.cloud.examples.BusinessApplication.OrderService;
-import org.springframework.cloud.alibaba.cloud.examples.BusinessApplication.StorageService;
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
@@ -59,7 +60,7 @@ public class HomeController {
}
@GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx")
- @RequestMapping(value = "/fescar/rest", method = RequestMethod.GET, produces = "application/json")
+ @RequestMapping(value = "/seata/rest", method = RequestMethod.GET, produces = "application/json")
public String rest() {
String result = restTemplate.getForObject(
@@ -95,7 +96,7 @@ public class HomeController {
}
@GlobalTransactional(timeoutMills = 300000, name = "spring-cloud-demo-tx")
- @RequestMapping(value = "/fescar/feign", method = RequestMethod.GET, produces = "application/json")
+ @RequestMapping(value = "/seata/feign", method = RequestMethod.GET, produces = "application/json")
public String feign() {
String result = storageService.storage(COMMODITY_CODE, ORDER_COUNT);
diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java
similarity index 94%
rename from spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java
rename to spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java
index 6594793a..54ff8a0c 100644
--- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java
+++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/java/com/alibaba/cloud/examples/Order.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.io.Serializable;
diff --git a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties
index 1832ce6f..75ed9290 100644
--- a/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/seata-example/business-service/src/main/resources/application.properties
@@ -5,4 +5,4 @@ spring.application.name=business-service
#feign.hystrix.enabled=true
#feign.sentinel.enabled=true
-logging.level.com.alibaba.fescar=debug
\ No newline at end of file
+logging.level.io.seata=debug
\ No newline at end of file
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 a42da637..baee8a37 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/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
similarity index 98%
rename from spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
rename to spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
index 5ec93801..b9808246 100644
--- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
+++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.sql.SQLException;
diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OderApplication.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OderApplication.java
similarity index 95%
rename from spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OderApplication.java
rename to spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OderApplication.java
index 1ab0dab1..9bd64f51 100644
--- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OderApplication.java
+++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OderApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java
similarity index 94%
rename from spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java
rename to spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java
index 6594793a..54ff8a0c 100644
--- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/Order.java
+++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/Order.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.io.Serializable;
diff --git a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OrderController.java b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java
similarity index 98%
rename from spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OrderController.java
rename to spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java
index db294ed1..ce231648 100644
--- a/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/OrderController.java
+++ b/spring-cloud-alibaba-examples/seata-example/order-service/src/main/java/com/alibaba/cloud/examples/OrderController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import io.seata.core.context.RootContext;
diff --git a/spring-cloud-alibaba-examples/seata-example/readme-zh.md b/spring-cloud-alibaba-examples/seata-example/readme-zh.md
index 9c12eb50..b54c4da7 100644
--- a/spring-cloud-alibaba-examples/seata-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/seata-example/readme-zh.md
@@ -120,16 +120,16 @@ sh seata-server.sh 8091 file
启动示例后,通过 HTTP 的 GET 方法访问如下两个 URL,可以分别验证在 `business-service` 中 通过 RestTemplate 和 FeignClient 调用其他服务的场景。
```$xslt
-http://127.0.0.1:18081/fescar/feign
+http://127.0.0.1:18081/seata/feign
-http://127.0.0.1:18081/fescar/rest
+http://127.0.0.1:18081/seata/rest
```
## 如何验证分布式事务成功?
### Xid 信息是否成功传递
-在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中,第一个执行的逻辑都是输出 RootContext 中的 Xid 信息,如果看到都输出了正确的 Xid 信息,即每次都发生变化,且同一次调用中所有服务的 Xid 都一致。则表明 Fescar 的 Xid 的传递和还原是正常的。
+在 `account-server`、`order-service` 和 `storage-service` 三个 服务的 Controller 中,第一个执行的逻辑都是输出 RootContext 中的 Xid 信息,如果看到都输出了正确的 Xid 信息,即每次都发生变化,且同一次调用中所有服务的 Xid 都一致。则表明 Seata 的 Xid 的传递和还原是正常的。
### 数据库中数据是否一致
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 4e85a826..0ae44a05 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/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
similarity index 98%
rename from spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
rename to spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
index 99b89f63..fd029e06 100644
--- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/DatabaseConfiguration.java
+++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/DatabaseConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.sql.SQLException;
diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageApplication.java b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageApplication.java
rename to spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageApplication.java
index 94bbac7f..4e6185b2 100644
--- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageApplication.java
+++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageController.java b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java
similarity index 97%
rename from spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageController.java
rename to spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java
index 31552104..23c41209 100644
--- a/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/org/springframework/cloud/alibaba/cloud/examples/StorageController.java
+++ b/spring-cloud-alibaba-examples/seata-example/storage-service/src/main/java/com/alibaba/cloud/examples/StorageController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import io.seata.core.context.RootContext;
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 76afa6d9..cd802d1c 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-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ExceptionUtil.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java
similarity index 78%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ExceptionUtil.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java
index 94ef5dde..76c6c25a 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ExceptionUtil.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ExceptionUtil.java
@@ -1,6 +1,6 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
-import org.springframework.cloud.alibaba.sentinel.rest.SentinelClientHttpResponse;
+import com.alibaba.cloud.sentinel.rest.SentinelClientHttpResponse;
import org.springframework.http.HttpRequest;
import org.springframework.http.client.ClientHttpRequestExecution;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListConverter.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/JsonFlowRuleListConverter.java
similarity index 89%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListConverter.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/JsonFlowRuleListConverter.java
index c5cea94d..aee0fe99 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/JsonFlowRuleListConverter.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/JsonFlowRuleListConverter.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.List;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java
similarity index 85%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java
index c05c01af..b0c15104 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ServiceApplication.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/ServiceApplication.java
@@ -1,8 +1,8 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.cloud.alibaba.sentinel.annotation.SentinelRestTemplate;
+import com.alibaba.cloud.sentinel.annotation.SentinelRestTemplate;
import org.springframework.context.annotation.Bean;
import org.springframework.web.client.RestTemplate;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java
similarity index 94%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java
index bb7f79b1..68f8a2d9 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/TestController.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-core-example/src/main/java/com/alibaba/cloud/examples/TestController.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md
index 25efd6dd..47844f26 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme-zh.md
@@ -50,7 +50,7 @@ Provider端在application.properties文件中定义dubbo相关的配置,比如
foo.service.version = 1.0.0
- dubbo.scan.basePackages = org.springframework.cloud.alibaba.cloud.examples
+ dubbo.scan.basePackages = com.alibaba.cloud.examples
dubbo.application.id = dubbo-provider-demo
dubbo.application.name = dubbo-provider-demo
@@ -66,7 +66,7 @@ Provider端在application.properties文件中定义dubbo相关的配置,比如
`sentinel-dubbo-api`模块中定义了FooService服务,内容如下:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
@@ -93,17 +93,17 @@ Consumer端在服务调用之前,先定义限流规则。
`sentinel-dubbo-api`模块中定义了FooService服务,内容如下:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
-该服务在Sentinel下对应的资源名是 `org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)` 。
+该服务在Sentinel下对应的资源名是 `com.alibaba.cloud.examples.FooService:hello(java.lang.String)` 。
定义该资源名对应的限流规则:
FlowRule flowRule = new FlowRule();
- flowRule.setResource("org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)");
+ flowRule.setResource("com.alibaba.cloud.examples.FooService:hello(java.lang.String)");
flowRule.setCount(10);
flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS);
flowRule.setLimitApp("default");
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md
index a69ea0b1..8cbb24c6 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/readme.md
@@ -48,7 +48,7 @@ Define some configs of dubbo in `application.properties` in provider side, like
foo.service.version = 1.0.0
- dubbo.scan.basePackages = org.springframework.cloud.alibaba.cloud.examples
+ dubbo.scan.basePackages = com.alibaba.cloud.examples
dubbo.application.id = dubbo-provider-demo
dubbo.application.name = dubbo-provider-demo
@@ -64,7 +64,7 @@ Define some configs of dubbo in `application.properties` in provider side, like
`sentinel-dubbo-api` define a service named FooService:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
@@ -91,17 +91,17 @@ We will configure flow control rules before service invocation in consumer side.
`sentinel-dubbo-api` define a service named FooService:
- package org.springframework.cloud.alibaba.cloud.examples.FooService;
+ package com.alibaba.cloud.examples.FooService;
public interface FooService {
String hello(String name);
}
-The resource name of this service's `hello` method is `org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)` .
+The resource name of this service's `hello` method is `com.alibaba.cloud.examples.FooService:hello(java.lang.String)` .
Configure rules:
FlowRule flowRule = new FlowRule();
- flowRule.setResource("org.springframework.cloud.alibaba.cloud.examples.dubbo.FooService:hello(java.lang.String)");
+ flowRule.setResource("com.alibaba.cloud.examples.FooService:hello(java.lang.String)");
flowRule.setCount(10);
flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS);
flowRule.setLimitApp("default");
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 6c7465f0..fe786d28 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-api/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooService.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java
similarity index 61%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooService.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java
index e07540b6..fca02cfc 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooService.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-api/src/main/java/com/alibaba/cloud/examples/FooService.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
/**
* @author fangjian
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 0ce67127..9f63b868 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-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java
similarity index 86%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java
index 705ddbc5..e4a6022c 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceConsumer.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/FooServiceConsumer.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.apache.dubbo.config.annotation.Reference;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java
similarity index 87%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java
index d0aba685..d8a6d404 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboConsumerApp.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-consumer-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboConsumerApp.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.Collections;
@@ -16,7 +16,7 @@ import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
/**
* @author fangjian
*/
-@SpringBootApplication(scanBasePackages = "org.springframework.cloud.alibaba.cloud.examples")
+@SpringBootApplication(scanBasePackages = "com.alibaba.cloud.examples")
public class SentinelDubboConsumerApp {
@Bean
@@ -28,7 +28,7 @@ public class SentinelDubboConsumerApp {
FlowRule flowRule = new FlowRule();
flowRule.setResource(
- "org.springframework.cloud.alibaba.cloud.examples.FooService:hello(java.lang.String)");
+ "com.alibaba.cloud.examples.FooService:hello(java.lang.String)");
flowRule.setCount(10);
flowRule.setGrade(RuleConstant.FLOW_GRADE_QPS);
flowRule.setLimitApp("default");
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 fbba495e..6e9792f9 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-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/FooServiceImpl.java
similarity index 86%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/FooServiceImpl.java
index 857b31bc..041627d4 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/FooServiceImpl.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/FooServiceImpl.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.apache.dubbo.config.annotation.Service;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboProviderApp.java
similarity index 89%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboProviderApp.java
index 346fb48f..ac4f7838 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelDubboProviderApp.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/java/com/alibaba/cloud/examples/SentinelDubboProviderApp.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.WebApplicationType;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/resources/application.properties
index f7e84bcb..f1479b33 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-dubbo-example/sentinel-dubbo-provider-example/src/main/resources/application.properties
@@ -2,7 +2,7 @@ spring.application.name = dubbo-provider-demo
foo.service.version = 1.0.0
-dubbo.scan.basePackages = org.springframework.cloud.alibaba.cloud.examples
+dubbo.scan.basePackages = com.alibaba.cloud.examples
dubbo.application.id = dubbo-provider-demo
dubbo.application.name = dubbo-provider-demo
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 e2979eb1..e7a264e7 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-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MySCGConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java
similarity index 96%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MySCGConfiguration.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java
index 0c39e3f7..552ea04c 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MySCGConfiguration.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/MySCGConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import com.alibaba.csp.sentinel.adapter.gateway.sc.callback.BlockRequestHandler;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesWebFluxController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java
similarity index 96%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesWebFluxController.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java
index 7767a871..fccd58bf 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesWebFluxController.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/RulesWebFluxController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.List;
import java.util.Set;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java
index 786d8dcd..64da9790 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-spring-cloud-gateway-example/src/main/java/com/alibaba/cloud/examples/SentinelSpringCloudGatewayApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
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 c3b4f17c..a69ba6cc 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-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MyConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/MyConfiguration.java
similarity index 96%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MyConfiguration.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/MyConfiguration.java
index 9d95923a..4c0225ce 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/MyConfiguration.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/MyConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import static org.springframework.web.reactive.function.BodyInserters.fromObject;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxApplication.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxApplication.java
index 87a42503..353b8ba0 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxApplication.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
similarity index 84%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxController.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
index 2c5f9f1d..32b008bf 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelWebFluxController.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-webflux-example/src/main/java/com/alibaba/cloud/examples/SentinelWebFluxController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -44,4 +44,11 @@ public class SentinelWebFluxController {
.transform(new SentinelReactorTransformer<>("flux"));
}
+ @GetMapping("/test")
+ public Flux test() {
+ return Flux.fromArray(new String[] { "test" })
+ // transform the publisher here.
+ .transform(new SentinelReactorTransformer<>("test"));
+ }
+
}
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 0f0b0c09..d1d62c85 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/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesController.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/RulesController.java
similarity index 96%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesController.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/RulesController.java
index 01411ab7..73d9ef5a 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/RulesController.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/RulesController.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import java.util.List;
import java.util.Set;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelZuulApplication.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelZuulApplication.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java
index 7e99e220..1477ba31 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/SentinelZuulApplication.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/SentinelZuulApplication.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java
similarity index 97%
rename from spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java
rename to spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java
index 796241a2..168ec000 100644
--- a/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/org/springframework/cloud/alibaba/cloud/examples/ZuulConfiguration.java
+++ b/spring-cloud-alibaba-examples/sentinel-example/sentinel-zuul-example/src/main/java/com/alibaba/cloud/examples/ZuulConfiguration.java
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.examples;
+package com.alibaba.cloud.examples;
import javax.servlet.http.HttpServletRequest;
diff --git a/spring-cloud-alibaba-examples/sms-example/pom.xml b/spring-cloud-alibaba-examples/sms-example/pom.xml
index 9d567214..bd32a704 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/sms-example/readme-zh.md b/spring-cloud-alibaba-examples/sms-example/readme-zh.md
index c07b3608..9c99b1a4 100644
--- a/spring-cloud-alibaba-examples/sms-example/readme-zh.md
+++ b/spring-cloud-alibaba-examples/sms-example/readme-zh.md
@@ -251,7 +251,7 @@ public QuerySendDetailsResponse querySendDetailsResponse(
发送状态的回执消息如下所示:
```plain
-org.springframework.cloud.alibaba.cloud.example.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8"
+com.alibaba.cloud.examples.SmsReportMessageListener; MessageID:9F3CFCE6BB3B2C8F-2-1682D84D9AD-20000000A,MessageMD5:C6AFEE0EE560BBC3380252337AC36985,RequestID:5C349CCEB8C115CCF344A3EB,MessageBody:"{"send_time":"2019-01-08 20:51:40","report_time":"2019-01-08 20:51:47","success":true,"err_msg":"用户接收成功","err_code":"DELIVERED","phone_number":"152********","sms_size":"1","biz_id":"667618746951900475^0","out_id":"edasTraceId"}",ReceiptHandle:"1-ODU4OTkzNDYwMi0xNTQ2OTUxOTM3LTItOA==",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:51:47 CST 2019",FirstDequeueTime:"Tue Jan 08 20:51:47 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:17 CST 2019",Priority:"8"
```
### 上行短信消息
@@ -290,7 +290,7 @@ org.springframework.cloud.alibaba.cloud.example.SmsReportMessageListener; Messag
短信成功恢复后,上行短信消息 SmsUpMessageListener 回调后的信息如下所示:
```plain
-org.springframework.cloud.alibaba.cloud.example.SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8"
+com.alibaba.cloud.examples.SmsUpMessageListener; MessageID:BF030215BA85BB41-1-1682D85425F-400000003,MessageMD5:D1AF5C2D7410EF190532CBF8E17FE2B7,RequestID:5C349CEE36AF628D2A847D50,MessageBody:"{"dest_code":"2493559","send_time":"2019-01-08 20:52:14","sign_name":"【企业级分布式应用服务】","sequence_id":568585703,"phone_number":"152********","content":"5279"}",ReceiptHandle:"1-MTcxNzk4NjkxODctMTU0Njk1MTk2NC0xLTg=",DequeueCount:"1",EnqueueTime:"Tue Jan 08 20:52:14 CST 2019",FirstDequeueTime:"Tue Jan 08 20:52:14 CST 2019",NextVisibleTime:"Tue Jan 08 20:52:44 CST 2019",Priority:"8"
```
## 查看 Endpoint 信息
diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsApplication.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java
similarity index 94%
rename from spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsApplication.java
rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java
index abbd8efb..db770488 100644
--- a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsApplication.java
+++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsApplication.java
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.springframework.cloud.alibaba.cloud.example;
+package com.alibaba.cloud.examples;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsController.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java
similarity index 97%
rename from spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsController.java
rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java
index 97308e66..194ba6d8 100644
--- a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsController.java
+++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsController.java
@@ -1,9 +1,9 @@
-package org.springframework.cloud.alibaba.cloud.example;
+package com.alibaba.cloud.examples;
import java.util.List;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cloud.alicloud.sms.ISmsService;
+import com.alibaba.alicloud.sms.ISmsService;
import org.springframework.core.env.Environment;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsReportMessageListener.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java
similarity index 83%
rename from spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsReportMessageListener.java
rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java
index aa092789..688645fc 100644
--- a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsReportMessageListener.java
+++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsReportMessageListener.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.example;
+package com.alibaba.cloud.examples;
import com.aliyun.mns.model.Message;
import org.springframework.stereotype.Component;
@@ -11,7 +11,7 @@ import java.util.List;
*/
@Component
public class SmsReportMessageListener
- implements org.springframework.cloud.alicloud.sms.SmsReportMessageListener {
+ implements com.alibaba.alicloud.sms.SmsReportMessageListener {
private List smsReportMessageSet = new LinkedList<>();
@Override
diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsUpMessageListener.java b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java
similarity index 76%
rename from spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsUpMessageListener.java
rename to spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java
index 22f4efec..7f743564 100644
--- a/spring-cloud-alibaba-examples/sms-example/src/main/java/org/springframework/cloud/alibaba/cloud/example/SmsUpMessageListener.java
+++ b/spring-cloud-alibaba-examples/sms-example/src/main/java/com/alibaba/cloud/examples/SmsUpMessageListener.java
@@ -1,4 +1,4 @@
-package org.springframework.cloud.alibaba.cloud.example;
+package com.alibaba.cloud.examples;
import org.springframework.stereotype.Component;
@@ -9,7 +9,7 @@ import com.aliyun.mns.model.Message;
*/
@Component
public class SmsUpMessageListener
- implements org.springframework.cloud.alicloud.sms.SmsUpMessageListener {
+ implements com.alibaba.alicloud.sms.SmsUpMessageListener {
@Override
public boolean dealMessage(Message message) {
diff --git a/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties b/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties
index 4464cfe9..74deeecc 100644
--- a/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties
+++ b/spring-cloud-alibaba-examples/sms-example/src/main/resources/application.properties
@@ -5,5 +5,6 @@ spring.cloud.alicloud.access-key=*****
spring.cloud.alicloud.secret-key=******
spring.cloud.alicloud.sms.report-queue-name=*****
spring.cloud.alicloud.sms.up-queue-name=*****
+
#config endpoint
management.endpoints.web.exposure.include=*
\ No newline at end of file
diff --git a/spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 861f60f0..00000000
--- a/spring-cloud-alibaba-nacos-config-server/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-# Auto-Configuration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.nacos.config.server.NacosConfigServerAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index ea1ce500..00000000
--- a/spring-cloud-alibaba-nacos-config/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,7 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.alibaba.nacos.NacosConfigBootstrapConfiguration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.nacos.NacosConfigAutoConfiguration,\
-org.springframework.cloud.alibaba.nacos.endpoint.NacosConfigEndpointAutoConfiguration
-org.springframework.boot.diagnostics.FailureAnalyzer=\
-org.springframework.cloud.alibaba.nacos.diagnostics.analyzer.NacosConnectionFailureAnalyzer
\ No newline at end of file
diff --git a/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 3b6c62c6..00000000
--- a/spring-cloud-alibaba-nacos-discovery/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,8 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.alibaba.nacos.NacosDiscoveryAutoConfiguration,\
- org.springframework.cloud.alibaba.nacos.ribbon.RibbonNacosAutoConfiguration,\
- org.springframework.cloud.alibaba.nacos.endpoint.NacosDiscoveryEndpointAutoConfiguration,\
- org.springframework.cloud.alibaba.nacos.discovery.NacosDiscoveryClientAutoConfiguration,\
- org.springframework.cloud.alibaba.nacos.discovery.configclient.NacosConfigServerAutoConfiguration
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
- org.springframework.cloud.alibaba.nacos.discovery.configclient.NacosDiscoveryClientConfigServiceBootstrapConfiguration
diff --git a/spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 24c7c008..00000000
--- a/spring-cloud-alibaba-seata/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,7 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.seata.rest.SeataRestTemplateAutoConfiguration,\
-org.springframework.cloud.alibaba.seata.web.SeataHandlerInterceptorConfiguration,\
-org.springframework.cloud.alibaba.seata.GlobalTransactionAutoConfiguration,\
-org.springframework.cloud.alibaba.seata.feign.SeataFeignClientAutoConfiguration,\
-org.springframework.cloud.alibaba.seata.feign.hystrix.SeataHystrixAutoConfiguration
-
diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java
deleted file mode 100644
index 0b830217..00000000
--- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/config/AbstractDataSourceProperties.java
+++ /dev/null
@@ -1,108 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.config;
-
-import javax.validation.constraints.NotEmpty;
-import javax.validation.constraints.NotNull;
-
-import org.springframework.cloud.alibaba.sentinel.datasource.RuleType;
-import org.springframework.core.env.Environment;
-
-import com.alibaba.csp.sentinel.adapter.gateway.common.api.GatewayApiDefinitionManager;
-import com.alibaba.csp.sentinel.adapter.gateway.common.rule.GatewayRuleManager;
-import com.alibaba.csp.sentinel.datasource.AbstractDataSource;
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRuleManager;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRuleManager;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRuleManager;
-import com.alibaba.csp.sentinel.slots.system.SystemRuleManager;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-
-/**
- * Abstract class Using by {@link DataSourcePropertiesConfiguration}
- *
- * @author Jim
- */
-public class AbstractDataSourceProperties {
-
- @NotEmpty
- private String dataType = "json";
- @NotNull
- private RuleType ruleType;
- private String converterClass;
- @JsonIgnore
- private final String factoryBeanName;
- @JsonIgnore
- private Environment env;
-
- public AbstractDataSourceProperties(String factoryBeanName) {
- this.factoryBeanName = factoryBeanName;
- }
-
- public String getDataType() {
- return dataType;
- }
-
- public void setDataType(String dataType) {
- this.dataType = dataType;
- }
-
- public RuleType getRuleType() {
- return ruleType;
- }
-
- public void setRuleType(RuleType ruleType) {
- this.ruleType = ruleType;
- }
-
- public String getConverterClass() {
- return converterClass;
- }
-
- public void setConverterClass(String converterClass) {
- this.converterClass = converterClass;
- }
-
- public String getFactoryBeanName() {
- return factoryBeanName;
- }
-
- protected Environment getEnv() {
- return env;
- }
-
- public void setEnv(Environment env) {
- this.env = env;
- }
-
- public void preCheck(String dataSourceName) {
-
- }
-
- public void postRegister(AbstractDataSource dataSource) {
- switch (this.getRuleType()) {
- case FLOW:
- FlowRuleManager.register2Property(dataSource.getProperty());
- break;
- case DEGRADE:
- DegradeRuleManager.register2Property(dataSource.getProperty());
- break;
- case PARAM_FLOW:
- ParamFlowRuleManager.register2Property(dataSource.getProperty());
- break;
- case SYSTEM:
- SystemRuleManager.register2Property(dataSource.getProperty());
- break;
- case AUTHORITY:
- AuthorityRuleManager.register2Property(dataSource.getProperty());
- break;
- case GW_FLOW:
- GatewayRuleManager.register2Property(dataSource.getProperty());
- break;
- case GW_API_GROUP:
- GatewayApiDefinitionManager.register2Property(dataSource.getProperty());
- break;
- default:
- break;
- }
- }
-}
diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java
deleted file mode 100644
index ab4d2429..00000000
--- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/JsonConverter.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
-
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
-import com.alibaba.csp.sentinel.slots.system.SystemRule;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-
-/**
- * Convert sentinel rules for json array Using strict mode to parse json
- *
- * @author Jim
- * @see FlowRule
- * @see DegradeRule
- * @see SystemRule
- * @see AuthorityRule
- * @see ParamFlowRule
- * @see ObjectMapper
- */
-public class JsonConverter extends SentinelConverter {
-
- public JsonConverter(ObjectMapper objectMapper, Class ruleClass) {
- super(objectMapper, ruleClass);
- }
-
-}
diff --git a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java b/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java
deleted file mode 100644
index 6c8485d4..00000000
--- a/spring-cloud-alibaba-sentinel-datasource/src/main/java/org/springframework/cloud/alibaba/sentinel/datasource/converter/XmlConverter.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.springframework.cloud.alibaba.sentinel.datasource.converter;
-
-import com.alibaba.csp.sentinel.slots.block.authority.AuthorityRule;
-import com.alibaba.csp.sentinel.slots.block.degrade.DegradeRule;
-import com.alibaba.csp.sentinel.slots.block.flow.FlowRule;
-import com.alibaba.csp.sentinel.slots.block.flow.param.ParamFlowRule;
-import com.alibaba.csp.sentinel.slots.system.SystemRule;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.dataformat.xml.XmlMapper;
-
-/**
- * Convert sentinel rules for xml array Using strict mode to parse xml
- *
- * @author Jim
- * @see FlowRule
- * @see DegradeRule
- * @see SystemRule
- * @see AuthorityRule
- * @see ParamFlowRule
- * @see ObjectMapper
- */
-public class XmlConverter extends SentinelConverter {
-
- public XmlConverter(XmlMapper xmlMapper, Class ruleClass) {
- super(xmlMapper, ruleClass);
- }
-
-}
diff --git a/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 8917e7c4..00000000
--- a/spring-cloud-alibaba-sentinel-gateway/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,4 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.sentinel.gateway.zuul.SentinelZuulAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.gateway.scg.SentinelSCGAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.gateway.SentinelGatewayAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories b/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 20f314cc..00000000
--- a/spring-cloud-alibaba-sentinel/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,9 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alibaba.sentinel.SentinelWebAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.SentinelWebFluxAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.endpoint.SentinelEndpointAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.custom.SentinelAutoConfiguration,\
-org.springframework.cloud.alibaba.sentinel.feign.SentinelFeignAutoConfiguration
-
-org.springframework.cloud.client.circuitbreaker.EnableCircuitBreaker=\
-org.springframework.cloud.alibaba.sentinel.custom.SentinelCircuitBreakerConfiguration
diff --git a/spring-cloud-alibaba-test/core-support/pom.xml b/spring-cloud-alibaba-test/core-support/pom.xml
index 4d3a9254..47ffef90 100644
--- a/spring-cloud-alibaba-test/core-support/pom.xml
+++ b/spring-cloud-alibaba-test/core-support/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-test
0.9.1.BUILD-SNAPSHOT
diff --git a/spring-cloud-alibaba-test/pom.xml b/spring-cloud-alibaba-test/pom.xml
index 16a7088f..feb3303c 100644
--- a/spring-cloud-alibaba-test/pom.xml
+++ b/spring-cloud-alibaba-test/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
diff --git a/spring-cloud-alibaba-test/sentinel-test-support/pom.xml b/spring-cloud-alibaba-test/sentinel-test-support/pom.xml
index 6a453721..7ae17609 100644
--- a/spring-cloud-alibaba-test/sentinel-test-support/pom.xml
+++ b/spring-cloud-alibaba-test/sentinel-test-support/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-test
0.9.1.BUILD-SNAPSHOT
diff --git a/spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index b5708d18..00000000
--- a/spring-cloud-alicloud-acm/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,6 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
-org.springframework.cloud.alicloud.acm.bootstrap.AcmPropertySourceLocator
-
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alicloud.acm.AcmAutoConfiguration,\
-org.springframework.cloud.alicloud.acm.endpoint.AcmEndpointAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 02177b93..00000000
--- a/spring-cloud-alicloud-ans/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.alicloud.ans.endpoint.AnsEndpointAutoConfiguration,\
- org.springframework.cloud.alicloud.ans.ribbon.RibbonAnsAutoConfiguration,\
- org.springframework.cloud.alicloud.ans.AnsAutoConfiguration,\
- org.springframework.cloud.alicloud.ans.AnsDiscoveryClientAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index b39c6499..00000000
--- a/spring-cloud-alicloud-context/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,15 +0,0 @@
-org.springframework.cloud.bootstrap.BootstrapConfiguration=\
- org.springframework.cloud.alicloud.context.acm.AcmContextBootstrapConfiguration
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.alicloud.context.AliCloudContextAutoConfiguration,\
- org.springframework.cloud.alicloud.context.edas.EdasContextAutoConfiguration,\
- org.springframework.cloud.alicloud.context.ans.AnsContextAutoConfiguration,\
- org.springframework.cloud.alicloud.context.oss.OssContextAutoConfiguration,\
- org.springframework.cloud.alicloud.context.scx.ScxContextAutoConfiguration,\
- org.springframework.cloud.alicloud.context.statistics.StatisticsTaskStarter,\
- org.springframework.cloud.alicloud.context.sms.SmsContextAutoConfiguration
-org.springframework.context.ApplicationListener=\
- org.springframework.cloud.alicloud.context.ans.AnsContextApplicationListener,\
- org.springframework.cloud.alicloud.context.nacos.NacosConfigParameterInitListener,\
- org.springframework.cloud.alicloud.context.nacos.NacosDiscoveryParameterInitListener,\
- org.springframework.cloud.alicloud.context.sentinel.SentinelAliCloudListener
\ No newline at end of file
diff --git a/spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 598bc216..00000000
--- a/spring-cloud-alicloud-oss/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,5 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.alicloud.oss.OssAutoConfiguration,\
-org.springframework.cloud.alicloud.oss.endpoint.OssEndpointAutoConfiguration
-org.springframework.context.ApplicationListener=\
-org.springframework.cloud.alicloud.oss.OssApplicationListener
\ No newline at end of file
diff --git a/spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 5003685d..00000000
--- a/spring-cloud-alicloud-schedulerx/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.alicloud.scx.endpoint.ScxEndpointAutoConfiguration,\
- org.springframework.cloud.alicloud.scx.ScxAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories b/spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 875d39db..00000000
--- a/spring-cloud-alicloud-sms/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,3 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
- org.springframework.cloud.alicloud.sms.config.SmsAutoConfiguration,\
- org.springframework.cloud.alicloud.sms.endpoint.SmsEndpointAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-starter-alibaba/pom.xml b/spring-cloud-starter-alibaba/pom.xml
deleted file mode 100644
index 1b3da1a6..00000000
--- a/spring-cloud-starter-alibaba/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-
- 4.0.0
-
- org.springframework.cloud
- spring-cloud-alibaba
- 0.9.1.BUILD-SNAPSHOT
- ../pom.xml
-
- spring-cloud-starter-alibaba
- 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
-
-
\ No newline at end of file
diff --git a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml b/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml
deleted file mode 100644
index 9c818caf..00000000
--- a/spring-cloud-starter-alibaba/spring-cloud-starter-stream-rocketmq/pom.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
- 4.0.0
-
-
- org.springframework.cloud
- spring-cloud-starter-alibaba
- 0.9.1.BUILD-SNAPSHOT
- ../pom.xml
-
- spring-cloud-starter-stream-rocketmq
- Spring Cloud Starter Stream RocketMQ
-
-
-
- org.springframework.cloud
- spring-cloud-stream-binder-rocketmq
-
-
-
-
diff --git a/spring-cloud-starter-alicloud/pom.xml b/spring-cloud-starter-alicloud/pom.xml
deleted file mode 100644
index 7c37b580..00000000
--- a/spring-cloud-starter-alicloud/pom.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
- 4.0.0
-
- org.springframework.cloud
- spring-cloud-alibaba
- 0.9.1.BUILD-SNAPSHOT
-
- spring-cloud-starter-alicloud
- 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
-
-
\ No newline at end of file
diff --git a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders b/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders
deleted file mode 100644
index 78d86cf9..00000000
--- a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.binders
+++ /dev/null
@@ -1 +0,0 @@
-rocketmq:org.springframework.cloud.stream.binder.rocketmq.config.RocketMQBinderAutoConfiguration
\ No newline at end of file
diff --git a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories b/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories
deleted file mode 100644
index 46f79a88..00000000
--- a/spring-cloud-stream-binder-rocketmq/src/main/resources/META-INF/spring.factories
+++ /dev/null
@@ -1,2 +0,0 @@
-org.springframework.boot.autoconfigure.EnableAutoConfiguration=\
-org.springframework.cloud.stream.binder.rocketmq.config.RocketMQComponent4BinderAutoConfiguration