diff --git a/README.md b/README.md index e7afdadda..f160fe858 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Dubbo Spring Boot Project +# Apache Dubbo Spring Boot Project [![Build Status](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project.svg?branch=master)](https://travis-ci.org/apache/incubator-dubbo-spring-boot-project) [![codecov](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project/branch/master/graph/badge.svg)](https://codecov.io/gh/apache/incubator-dubbo-spring-boot-project) @@ -50,7 +50,7 @@ You can introduce the latest `dubbo-spring-boot-starter` to your project by addi - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter 0.2.1-SNAPSHOT @@ -257,7 +257,7 @@ $ ./mvnw clean install ## Modules -There are some modules in Dubbo Spring Boot Project, let's take a look at below overview: +There are some modules in Apache Dubbo Spring Boot Project, let's take a look at below overview: diff --git a/README_CN.md b/README_CN.md index aa50001fe..905ddd35a 100644 --- a/README_CN.md +++ b/README_CN.md @@ -24,7 +24,7 @@ 您可以为您的工程引入最新 `dubbo-spring-boot-starter` 的发布，增加以下依赖到工程的 `pom.xml` 文件中： ```xml - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter 0.2.1 diff --git a/dubbo-spring-boot-actuator/README.md b/dubbo-spring-boot-actuator/README.md index 0b74034a7..d9df65881 100644 --- a/dubbo-spring-boot-actuator/README.md +++ b/dubbo-spring-boot-actuator/README.md @@ -31,7 +31,7 @@ For now, `dubbo-spring-boot-actuator` will separate two versions for Spring Boot You can introduce the latest `dubbo-spring-boot-actuator` to your project by adding the following dependency to your pom.xml ```xml - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-actuator 0.2.1 @@ -272,7 +272,7 @@ The structure of JSON is simple Key-Value format , the key is property name as a "version": "1.0.0", "warmup": null, "weight": null, - "serviceClass": "com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService" + "serviceClass": "DefaultDemoService" } } ``` diff --git a/dubbo-spring-boot-actuator/README_CN.md b/dubbo-spring-boot-actuator/README_CN.md index 14a4103a7..c9483d44a 100644 --- a/dubbo-spring-boot-actuator/README_CN.md +++ b/dubbo-spring-boot-actuator/README_CN.md @@ -29,14 +29,14 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter 0.2.1 - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-actuator 0.2.1 @@ -258,7 +258,7 @@ The structure of JSON is simple Key-Value format , the key is property name as a "version": "1.0.0", "warmup": null, "weight": null, - "serviceClass": "com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService" + "serviceClass": "DefaultDemoService" } } ``` diff --git a/dubbo-spring-boot-actuator/pom.xml b/dubbo-spring-boot-actuator/pom.xml index 644e5d2b7..e655820e8 100644 --- a/dubbo-spring-boot-actuator/pom.xml +++ b/dubbo-spring-boot-actuator/pom.xml @@ -18,8 +18,8 @@ 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"> + org.apache.dubbo dubbo-spring-boot-parent - com.alibaba.boot ${revision} ../dubbo-spring-boot-parent/pom.xml @@ -27,8 +27,8 @@ dubbo-spring-boot-actuator jar - Dubbo Spring Boot Actuator - Dubbo Spring Boot Actuator + Apache Dubbo Spring Boot Actuator + Apache Dubbo Spring Boot Actuator @@ -66,7 +66,7 @@ - com.alibaba + org.apache.dubbo dubbo true diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java similarity index 83% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java index efa5b4153..fd5a7aad8 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboEndpointsAutoConfiguration.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.autoconfigure; +package org.apache.dubbo.spring.boot.actuate.autoconfigure; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboConfigsMetadataEndpoint; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpoint; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboPropertiesEndpoint; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboReferencesMetadataEndpoint; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboServicesMetadataEndpoint; -import com.alibaba.boot.dubbo.actuate.endpoint.DubboShutdownEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboConfigsMetadataEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboPropertiesEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboReferencesMetadataEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboServicesMetadataEndpoint; +import org.apache.dubbo.spring.boot.actuate.endpoint.DubboShutdownEndpoint; import org.springframework.boot.actuate.autoconfigure.endpoint.condition.ConditionalOnEnabledEndpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; @@ -33,7 +33,6 @@ /** * Dubbo {@link Endpoint} Auto-{@link Configuration} * - * * @see Endpoint * @see Configuration * @since 0.2.0 diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java similarity index 88% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java index 20d2cf1ff..0422fea49 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/autoconfigure/DubboHealthIndicatorAutoConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.autoconfigure; +package org.apache.dubbo.spring.boot.actuate.autoconfigure; -import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicator; -import com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicatorProperties; -import com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration; +import org.apache.dubbo.spring.boot.actuate.health.DubboHealthIndicator; +import org.apache.dubbo.spring.boot.actuate.health.DubboHealthIndicatorProperties; +import org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.endpoint.EndpointAutoConfiguration; import org.springframework.boot.actuate.autoconfigure.health.ConditionalOnEnabledHealthIndicator; @@ -34,7 +34,6 @@ /** * Dubbo {@link DubboHealthIndicator} Auto Configuration * - * * @see HealthIndicator * @since 1.0.0 */ diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/AbstractDubboEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/AbstractDubboEndpoint.java similarity index 91% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/AbstractDubboEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/AbstractDubboEndpoint.java index 45a0cba56..eae99b4a7 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/AbstractDubboEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/AbstractDubboEndpoint.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.spring.ServiceBean; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; import org.springframework.beans.BeansException; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; @@ -39,14 +39,13 @@ import java.util.LinkedHashMap; import java.util.Map; -import static com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor.BEAN_NAME; +import static org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor.BEAN_NAME; import static org.springframework.beans.factory.BeanFactoryUtils.beansOfTypeIncludingAncestors; import static org.springframework.util.ClassUtils.isPrimitiveOrWrapper; /** * Abstract Dubbo {@link Endpoint @Endpoint} * - * * @since 0.2.0 */ public abstract class AbstractDubboEndpoint implements ApplicationContextAware, EnvironmentAware { @@ -55,6 +54,17 @@ public abstract class AbstractDubboEndpoint implements ApplicationContextAware, protected ConfigurableEnvironment environment; + private static boolean isSimpleType(Class type) { + return isPrimitiveOrWrapper(type) + || type == String.class + || type == BigDecimal.class + || type == BigInteger.class + || type == Date.class + || type == URL.class + || type == Class.class + ; + } + @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { this.applicationContext = applicationContext; @@ -110,16 +120,5 @@ protected Map getProtocolConfigsBeanMap() { return beansOfTypeIncludingAncestors(applicationContext, ProtocolConfig.class); } - private static boolean isSimpleType(Class type) { - return isPrimitiveOrWrapper(type) - || type == String.class - || type == BigDecimal.class - || type == BigInteger.class - || type == Date.class - || type == URL.class - || type == Class.class - ; - } - } diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboConfigsMetadataEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboConfigsMetadataEndpoint.java similarity index 83% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboConfigsMetadataEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboConfigsMetadataEndpoint.java index 28b276a1e..2cce5438a 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboConfigsMetadataEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboConfigsMetadataEndpoint.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; - -import com.alibaba.dubbo.config.AbstractConfig; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ConsumerConfig; -import com.alibaba.dubbo.config.MethodConfig; -import com.alibaba.dubbo.config.ModuleConfig; -import com.alibaba.dubbo.config.MonitorConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ProviderConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.ServiceConfig; +package org.apache.dubbo.spring.boot.actuate.endpoint; + +import org.apache.dubbo.config.AbstractConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; +import org.apache.dubbo.config.MethodConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.MonitorConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; @@ -40,7 +40,6 @@ /** * Dubbo Configs Metadata {@link Endpoint} * - * * @since 0.2.0 */ @Endpoint(id = "dubboconfigs") diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpoint.java similarity index 77% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpoint.java index eba7b5666..34d2a9bc3 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpoint.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.boot.dubbo.util.DubboUtils; -import com.alibaba.dubbo.common.Version; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.spring.boot.util.DubboUtils; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; @@ -25,16 +25,15 @@ import java.util.LinkedHashMap; import java.util.Map; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_MAILING_LIST; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL; /** * Actuator {@link Endpoint} to expose Dubbo Meta Data * - * * @see Endpoint * @since 1.0.0 */ diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboPropertiesEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboPropertiesEndpoint.java similarity index 90% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboPropertiesEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboPropertiesEndpoint.java index f9b9d1a55..65de76dae 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboPropertiesEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboPropertiesEndpoint.java @@ -14,19 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; import java.util.SortedMap; -import static com.alibaba.boot.dubbo.util.DubboUtils.filterDubboProperties; +import static org.apache.dubbo.spring.boot.util.DubboUtils.filterDubboProperties; /** * Dubbo Properties {@link Endpoint} * - * * @since 1.0.0 */ @Endpoint(id = "dubboproperties") diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboReferencesMetadataEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java similarity index 91% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboReferencesMetadataEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java index 3d4bbf6ed..b6aa6ff7d 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboReferencesMetadataEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboReferencesMetadataEndpoint.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.ReferenceBean; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.ReferenceBean; +import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; import org.springframework.beans.factory.annotation.InjectionMetadata; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; @@ -30,7 +30,6 @@ /** * Dubbo {@link Reference} Metadata {@link Endpoint} * - * * @since 1.0.0 */ @Endpoint(id = "dubboreferences") diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboServicesMetadataEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java similarity index 94% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboServicesMetadataEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java index 0c4c7886f..dfef5a89d 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboServicesMetadataEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboServicesMetadataEndpoint.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.spring.ServiceBean; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.ReadOperation; @@ -28,7 +28,6 @@ /** * Dubbo {@link Service} Metadata {@link Endpoint} * - * * @since 0.2.0 */ @Endpoint(id = "dubboservices") diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboShutdownEndpoint.java similarity index 86% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboShutdownEndpoint.java index 10148003f..a10f4d47a 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboShutdownEndpoint.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboShutdownEndpoint.java @@ -14,11 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.spring.ServiceBean; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; import org.springframework.boot.actuate.endpoint.annotation.Endpoint; import org.springframework.boot.actuate.endpoint.annotation.WriteOperation; @@ -27,7 +26,7 @@ import java.util.Map; import java.util.TreeMap; -import static com.alibaba.dubbo.registry.support.AbstractRegistryFactory.getRegistries; +import static org.apache.dubbo.registry.support.AbstractRegistryFactory.getRegistries; /** * Dubbo Shutdown @@ -49,7 +48,6 @@ public Map shutdown() throws Exception { // protocols int protocolsCount = getProtocolConfigsBeanMap().size(); - ProtocolConfig.destroyAll(); shutdownCountData.put("registries", registriesCount); shutdownCountData.put("protocols", protocolsCount); diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicator.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicator.java similarity index 85% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicator.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicator.java index e84a24e98..2b2cf17da 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicator.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.health; +package org.apache.dubbo.spring.boot.actuate.health; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ProviderConfig; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.actuate.health.AbstractHealthIndicator; @@ -32,13 +32,11 @@ import java.util.Map; import java.util.Set; -import static com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicatorProperties.PREFIX; -import static com.alibaba.dubbo.common.extension.ExtensionLoader.getExtensionLoader; +import static org.apache.dubbo.common.extension.ExtensionLoader.getExtensionLoader; /** * Dubbo {@link HealthIndicator} * - * * @see HealthIndicator * @since 1.0.0 */ @@ -75,16 +73,16 @@ protected void doHealthCheck(Health.Builder builder) throws Exception { StatusChecker checker = extensionLoader.getExtension(statusCheckerName); - com.alibaba.dubbo.common.status.Status status = checker.check(); + org.apache.dubbo.common.status.Status status = checker.check(); - com.alibaba.dubbo.common.status.Status.Level level = status.getLevel(); + org.apache.dubbo.common.status.Status.Level level = status.getLevel(); - if (!hasError && level.equals(com.alibaba.dubbo.common.status.Status.Level.ERROR)) { + if (!hasError && level.equals(org.apache.dubbo.common.status.Status.Level.ERROR)) { hasError = true; builder.down(); } - if (!hasError && !hasUnknown && level.equals(com.alibaba.dubbo.common.status.Status.Level.UNKNOWN)) { + if (!hasError && !hasUnknown && level.equals(org.apache.dubbo.common.status.Status.Level.UNKNOWN)) { hasUnknown = true; builder.unknown(); } @@ -129,13 +127,13 @@ private Map resolveStatusCheckerNamesMapFromDubboHealthIndicator for (String statusName : status.getDefaults()) { - statusCheckerNamesMap.put(statusName, PREFIX + ".status.defaults"); + statusCheckerNamesMap.put(statusName, DubboHealthIndicatorProperties.PREFIX + ".status.defaults"); } for (String statusName : status.getExtras()) { - statusCheckerNamesMap.put(statusName, PREFIX + ".status.extras"); + statusCheckerNamesMap.put(statusName, DubboHealthIndicatorProperties.PREFIX + ".status.extras"); } diff --git a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorProperties.java similarity index 79% rename from dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java rename to dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorProperties.java index e6db92811..d931b19c5 100644 --- a/dubbo-spring-boot-actuator/src/main/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorProperties.java +++ b/dubbo-spring-boot-actuator/src/main/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorProperties.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.health; +package org.apache.dubbo.spring.boot.actuate.health; -import com.alibaba.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.status.StatusChecker; import org.springframework.boot.actuate.health.HealthIndicator; import org.springframework.boot.context.properties.ConfigurationProperties; @@ -25,12 +25,11 @@ import java.util.LinkedHashSet; import java.util.Set; -import static com.alibaba.boot.dubbo.actuate.health.DubboHealthIndicatorProperties.PREFIX; +import static org.apache.dubbo.spring.boot.actuate.health.DubboHealthIndicatorProperties.PREFIX; /** * Dubbo {@link HealthIndicator} Properties * - * * @see HealthIndicator * @since 1.0.0 */ @@ -55,13 +54,13 @@ public void setStatus(Status status) { /** * The nested class for {@link StatusChecker}'s names * 
-     * registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker
-     * spring=com.alibaba.dubbo.config.spring.status.SpringStatusChecker
-     * datasource=com.alibaba.dubbo.config.spring.status.DataSourceStatusChecker
-     * memory=com.alibaba.dubbo.common.status.support.MemoryStatusChecker
-     * load=com.alibaba.dubbo.common.status.support.LoadStatusChecker
-     * server=com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker
-     * threadpool=com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker
+     * registry= org.apache.dubbo.registry.status.RegistryStatusChecker
+     * spring= org.apache.dubbo.config.spring.status.SpringStatusChecker
+     * datasource= org.apache.dubbo.config.spring.status.DataSourceStatusChecker
+     * memory= org.apache.dubbo.common.status.support.MemoryStatusChecker
+     * load= org.apache.dubbo.common.status.support.LoadStatusChecker
+     * server= org.apache.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker
+     * threadpool= org.apache.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker
      *
* * @see StatusChecker diff --git a/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories b/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories index ad900adb9..f80694c1f 100644 --- a/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories +++ b/dubbo-spring-boot-actuator/src/main/resources/META-INF/spring.factories @@ -1,3 +1,3 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.alibaba.boot.dubbo.actuate.autoconfigure.DubboEndpointsAutoConfiguration,\ -com.alibaba.boot.dubbo.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration \ No newline at end of file +org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointsAutoConfiguration,\ +org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboHealthIndicatorAutoConfiguration \ No newline at end of file diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java similarity index 93% rename from dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java rename to dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java index 0cdfb2144..863489004 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.boot.dubbo.util.DubboUtils; +import org.apache.dubbo.spring.boot.util.DubboUtils; import org.junit.Assert; import org.junit.Test; @@ -27,12 +27,11 @@ import java.util.Map; -import static com.alibaba.dubbo.common.Version.getVersion; +import static org.apache.dubbo.common.Version.getVersion; /** * {@link DubboEndpoint} Test * - * * @see DubboEndpoint * @since 1.0.0 */ diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java similarity index 94% rename from dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java rename to dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java index 29e2af649..f269fbb64 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/endpoint/DubboEndpointsAutoConfigurationTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.endpoint; +package org.apache.dubbo.spring.boot.actuate.endpoint; -import com.alibaba.boot.dubbo.actuate.autoconfigure.DubboEndpointsAutoConfiguration; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.spring.boot.actuate.autoconfigure.DubboEndpointsAutoConfiguration; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; @@ -60,7 +60,7 @@ "dubbo.protocol.port=20880", "dubbo.provider.id=my-provider", "dubbo.provider.host=127.0.0.1", - "dubbo.scan.basePackages=com.alibaba.boot.dubbo.actuate.endpoint", + "dubbo.scan.basePackages= org.apache.dubbo.spring.boot.actuate.endpoint", "management.endpoint.dubbo.enabled = true", "management.endpoint.dubboshutdown.enabled = true", "management.endpoint.dubboconfigs.enabled = true", @@ -156,7 +156,7 @@ public void testServices() { Assert.assertEquals(1, services.size()); - Map demoServiceMeta = services.get("ServiceBean:com.alibaba.boot.dubbo.actuate.endpoint.DubboEndpointsAutoConfigurationTest$DemoService:1.0.0"); + Map demoServiceMeta = services.get("ServiceBean:DubboEndpointsAutoConfigurationTest$DemoService:1.0.0"); Assert.assertEquals("1.0.0", demoServiceMeta.get("version")); @@ -187,7 +187,7 @@ public void testProperties() { Assert.assertEquals("20880", properties.get("dubbo.protocol.port")); Assert.assertEquals("my-provider", properties.get("dubbo.provider.id")); Assert.assertEquals("127.0.0.1", properties.get("dubbo.provider.host")); - Assert.assertEquals("com.alibaba.boot.dubbo.actuate.endpoint", properties.get("dubbo.scan.basePackages")); + Assert.assertEquals("org.apache.dubbo.spring.boot.actuate.endpoint", properties.get("dubbo.scan.basePackages")); } @Test @@ -206,6 +206,10 @@ private void testHttpEndpoint(String actuatorURI, Supplier resultsSupplier) } + interface DemoService { + String sayHello(String name); + } + @Service( version = "${dubbo.service.version}", application = "${dubbo.application.id}", @@ -220,9 +224,5 @@ public String sayHello(String name) { } - interface DemoService { - String sayHello(String name); - } - } diff --git a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorTest.java similarity index 96% rename from dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java rename to dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorTest.java index 41de0a8e1..6a2efe373 100644 --- a/dubbo-spring-boot-actuator/src/test/java/com/alibaba/boot/dubbo/actuate/health/DubboHealthIndicatorTest.java +++ b/dubbo-spring-boot-actuator/src/test/java/org/apache/dubbo/spring/boot/actuate/health/DubboHealthIndicatorTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.actuate.health; +package org.apache.dubbo.spring.boot.actuate.health; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfig; +import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig; import org.junit.Assert; import org.junit.Test; @@ -34,7 +34,6 @@ /** * {@link DubboHealthIndicator} Test * - * * @see DubboHealthIndicator * @since 1.0.0 */ diff --git a/dubbo-spring-boot-autoconfigure/README.md b/dubbo-spring-boot-autoconfigure/README.md index 0b461cec1..d27c8f677 100644 --- a/dubbo-spring-boot-autoconfigure/README.md +++ b/dubbo-spring-boot-autoconfigure/README.md @@ -21,7 +21,7 @@ You can introduce the latest `dubbo-spring-boot-autoconfigure` to your project ```xml - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-autoconfigure 0.2.1 diff --git a/dubbo-spring-boot-autoconfigure/pom.xml b/dubbo-spring-boot-autoconfigure/pom.xml index f9e933a4a..f50475ae4 100644 --- a/dubbo-spring-boot-autoconfigure/pom.xml +++ b/dubbo-spring-boot-autoconfigure/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-parent ${revision} ../dubbo-spring-boot-parent/pom.xml @@ -27,8 +27,8 @@ dubbo-spring-boot-autoconfigure jar - Dubbo Spring Boot Auto-Configure - Dubbo Spring Boot Auto-Configure + Apache Dubbo Spring Boot Auto-Configure + Apache Dubbo Spring Boot Auto-Configure @@ -54,17 +54,11 @@ - com.alibaba + org.apache.dubbo dubbo true - - - com.alibaba.spring - spring-context-support - - org.springframework.boot diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java similarity index 79% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java index 58029f446..d90bd0d8b 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfiguration.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfiguration.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.autoconfigure; +package org.apache.dubbo.spring.boot.autoconfigure; -import com.alibaba.dubbo.config.AbstractConfig; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; -import com.alibaba.dubbo.config.spring.context.annotation.DubboConfigConfiguration; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfig; +import org.apache.dubbo.config.AbstractConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.config.spring.context.annotation.DubboConfigConfiguration; +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; +import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig; import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean; @@ -39,10 +39,10 @@ import java.util.Set; -import static com.alibaba.boot.dubbo.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_PREFIX; -import static com.alibaba.boot.dubbo.util.DubboUtils.MULTIPLE_CONFIG_PROPERTY_NAME; import static java.util.Collections.emptySet; +import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; +import static org.apache.dubbo.spring.boot.util.DubboUtils.MULTIPLE_CONFIG_PROPERTY_NAME; import static org.springframework.beans.factory.config.ConfigurableBeanFactory.SCOPE_PROTOTYPE; /** diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinder.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java similarity index 92% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinder.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java index 72a66e7c1..7c1dc8729 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinder.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinder.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.autoconfigure; +package org.apache.dubbo.spring.boot.autoconfigure; -import com.alibaba.dubbo.config.AbstractConfig; -import com.alibaba.dubbo.config.spring.context.properties.AbstractDubboConfigBinder; -import com.alibaba.dubbo.config.spring.context.properties.DubboConfigBinder; +import org.apache.dubbo.config.AbstractConfig; +import org.apache.dubbo.config.spring.context.properties.AbstractDubboConfigBinder; +import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder; import org.springframework.boot.context.properties.bind.BindHandler; import org.springframework.boot.context.properties.bind.Bindable; diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListener.java similarity index 98% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListener.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListener.java index b8a22348e..f4a94d2d2 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListener.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,6 +54,14 @@ public class AwaitingNonWebApplicationListener implements SmartApplicationListen private final ExecutorService executorService = Executors.newSingleThreadExecutor(); + private static T[] of(T... values) { + return values; + } + + static AtomicBoolean getAwaited() { + return awaited; + } + @Override public boolean supportsEventType(Class eventType) { return ObjectUtils.containsElement(SUPPORTED_APPLICATION_EVENTS, eventType); @@ -64,10 +72,6 @@ public boolean supportsSourceType(Class sourceType) { return true; } - private static T[] of(T... values) { - return values; - } - @Override public void onApplicationEvent(ApplicationEvent event) { if (event instanceof ApplicationReadyEvent) { @@ -146,8 +150,4 @@ private void executeMutually(Runnable runnable) { lock.unlock(); } } - - static AtomicBoolean getAwaited() { - return awaited; - } } diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListener.java similarity index 86% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListener.java index e2a236318..319c1d9ee 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListener.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.config.AbstractConfig; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.config.AbstractConfig; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,9 +29,9 @@ import java.util.SortedMap; -import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE; -import static com.alibaba.boot.dubbo.util.DubboUtils.OVERRIDE_CONFIG_PROPERTY_NAME; -import static com.alibaba.boot.dubbo.util.DubboUtils.filterDubboProperties; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE; +import static org.apache.dubbo.spring.boot.util.DubboUtils.OVERRIDE_CONFIG_PROPERTY_NAME; +import static org.apache.dubbo.spring.boot.util.DubboUtils.filterDubboProperties; /** * {@link ApplicationListener} to override the dubbo properties from {@link Environment}into diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListener.java similarity index 88% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListener.java index 9802a3b96..1db2438e8 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListener.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; -import com.alibaba.dubbo.common.Version; +import org.apache.dubbo.common.Version; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,10 +27,10 @@ import java.util.concurrent.atomic.AtomicBoolean; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.LINE_SEPARATOR; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_MAILING_LIST; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.LINE_SEPARATOR; /** * Dubbo Welcome Logo {@link ApplicationListener} diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessor.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java similarity index 95% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessor.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java index 3292bf9fa..3e406c73d 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessor.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessor.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.env; +package org.apache.dubbo.spring.boot.env; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfig; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubboConfigBinding; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfig; +import org.apache.dubbo.config.spring.context.annotation.EnableDubboConfigBinding; import org.springframework.boot.SpringApplication; import org.springframework.boot.context.ContextIdApplicationContextInitializer; diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java similarity index 99% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java index 59cde995f..ba0e9c790 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/DubboUtils.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/DubboUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.util; +package org.apache.dubbo.spring.boot.util; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/EnvironmentUtils.java b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/EnvironmentUtils.java similarity index 98% rename from dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/EnvironmentUtils.java rename to dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/EnvironmentUtils.java index 9b20c58f8..1f0e1181c 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/java/com/alibaba/boot/dubbo/util/EnvironmentUtils.java +++ b/dubbo-spring-boot-autoconfigure/src/main/java/org/apache/dubbo/spring/boot/util/EnvironmentUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.util; +package org.apache.dubbo.spring.boot.util; import org.springframework.core.env.CompositePropertySource; import org.springframework.core.env.ConfigurableEnvironment; diff --git a/dubbo-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories b/dubbo-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories index 4ea2a1a98..1ef3d5b9c 100644 --- a/dubbo-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories +++ b/dubbo-spring-boot-autoconfigure/src/main/resources/META-INF/spring.factories @@ -1,11 +1,11 @@ org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ -com.alibaba.boot.dubbo.autoconfigure.DubboAutoConfiguration +org.apache.dubbo.spring.boot.autoconfigure.DubboAutoConfiguration org.springframework.context.ApplicationListener=\ -com.alibaba.boot.dubbo.context.event.OverrideDubboConfigApplicationListener,\ -com.alibaba.boot.dubbo.context.event.WelcomeLogoApplicationListener,\ -com.alibaba.boot.dubbo.context.event.AwaitingNonWebApplicationListener +org.apache.dubbo.spring.boot.context.event.OverrideDubboConfigApplicationListener,\ +org.apache.dubbo.spring.boot.context.event.WelcomeLogoApplicationListener,\ +org.apache.dubbo.spring.boot.context.event.AwaitingNonWebApplicationListener org.springframework.boot.env.EnvironmentPostProcessor=\ -com.alibaba.boot.dubbo.env.DubboDefaultPropertiesEnvironmentPostProcessor \ No newline at end of file +org.apache.dubbo.spring.boot.env.DubboDefaultPropertiesEnvironmentPostProcessor \ No newline at end of file diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java similarity index 95% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java index 4163ac05d..2d7aaec8f 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnMultipleConfigTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.autoconfigure; +package org.apache.dubbo.spring.boot.autoconfigure; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ConsumerConfig; -import com.alibaba.dubbo.config.ModuleConfig; -import com.alibaba.dubbo.config.MonitorConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ProviderConfig; -import com.alibaba.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.MonitorConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.RegistryConfig; import org.junit.Assert; import org.junit.Test; @@ -43,7 +43,6 @@ /** * {@link DubboAutoConfiguration} Test On multiple Dubbo Configuration * - * * @since 1.0.0 */ @RunWith(SpringJUnit4ClassRunner.class) diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java similarity index 88% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java index 7f4cd5e16..6f93ad0c8 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/DubboAutoConfigurationOnSingleConfigTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.autoconfigure; - -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ConsumerConfig; -import com.alibaba.dubbo.config.ModuleConfig; -import com.alibaba.dubbo.config.MonitorConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ProviderConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; -import com.alibaba.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; +package org.apache.dubbo.spring.boot.autoconfigure; + +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.MonitorConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor; +import org.apache.dubbo.config.spring.beans.factory.annotation.ServiceAnnotationBeanPostProcessor; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinderTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java similarity index 87% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinderTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java index 0a151bab8..fa91c09fb 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/autoconfigure/RelaxedDubboConfigBinderTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/autoconfigure/RelaxedDubboConfigBinderTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.autoconfigure; +package org.apache.dubbo.spring.boot.autoconfigure; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.RegistryConfig; import org.junit.Assert; import org.junit.Test; @@ -26,15 +26,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.TestPropertySource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; /** * {@link RelaxedDubboConfigBinder} Test * - * * @since 0.1.1 */ -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @TestPropertySource(locations = "classpath:/dubbo.properties") @ContextConfiguration(classes = RelaxedDubboConfigBinder.class) public class RelaxedDubboConfigBinderTest { diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListenerTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListenerTest.java similarity index 97% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListenerTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListenerTest.java index 42710cd31..e4064b9c4 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/AwaitingNonWebApplicationListenerTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/AwaitingNonWebApplicationListenerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerDisableTest.java similarity index 95% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerDisableTest.java index c69e5f513..3fff62140 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerDisableTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerDisableTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; -import com.alibaba.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.ConfigUtils; import org.junit.Assert; import org.junit.BeforeClass; @@ -31,7 +31,6 @@ /** * {@link OverrideDubboConfigApplicationListener} Test * - * * @see OverrideDubboConfigApplicationListener * @since 1.0.0 */ diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java similarity index 83% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java index 2fd7cd15f..8e8116171 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/OverrideDubboConfigApplicationListenerTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/OverrideDubboConfigApplicationListenerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; -import com.alibaba.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.ConfigUtils; import org.junit.Assert; import org.junit.BeforeClass; @@ -31,7 +31,6 @@ /** * {@link OverrideDubboConfigApplicationListener} Test * - * * @see OverrideDubboConfigApplicationListener * @since 1.0.0 */ @@ -58,9 +57,9 @@ public void testOnApplicationEvent() { Properties properties = ConfigUtils.getProperties(); - Assert.assertEquals("dubbo-demo-application",properties.get("dubbo.application.name")); - Assert.assertEquals("dubbo-demo-module",properties.get("dubbo.module.name")); - Assert.assertEquals("zookeeper://192.168.99.100:32770",properties.get("dubbo.registry.address")); + Assert.assertEquals("dubbo-demo-application", properties.get("dubbo.application.name")); + Assert.assertEquals("dubbo-demo-module", properties.get("dubbo.module.name")); + Assert.assertEquals("zookeeper://192.168.99.100:32770", properties.get("dubbo.registry.address")); } diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListenerTest.java similarity index 96% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListenerTest.java index 34bb97196..be9d2a3d8 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/context/event/WelcomeLogoApplicationListenerTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/context/event/WelcomeLogoApplicationListenerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.context.event; +package org.apache.dubbo.spring.boot.context.event; import org.junit.Assert; import org.junit.Test; @@ -26,7 +26,6 @@ /** * {@link WelcomeLogoApplicationListener} Test * - * * @see WelcomeLogoApplicationListener * @since 1.0.0 */ diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java similarity index 99% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java index d941a4f4c..2fbb6aa1b 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/env/DubboDefaultPropertiesEnvironmentPostProcessorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.env; +package org.apache.dubbo.spring.boot.env; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/DubboUtilsTest.java similarity index 65% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/DubboUtilsTest.java index c972dc863..910cb7c43 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/DubboUtilsTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/DubboUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.util; +package org.apache.dubbo.spring.boot.util; import org.junit.Assert; import org.junit.Test; @@ -22,25 +22,24 @@ import java.util.SortedMap; -import static com.alibaba.boot.dubbo.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; -import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_MULTIPLE_CONFIG_PROPERTY_VALUE; -import static com.alibaba.boot.dubbo.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_CONFIG_PREFIX; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_MAILING_LIST; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_PREFIX; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SCAN_PREFIX; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL; -import static com.alibaba.boot.dubbo.util.DubboUtils.MULTIPLE_CONFIG_PROPERTY_NAME; -import static com.alibaba.boot.dubbo.util.DubboUtils.OVERRIDE_CONFIG_PROPERTY_NAME; -import static com.alibaba.boot.dubbo.util.DubboUtils.filterDubboProperties; +import static org.apache.dubbo.spring.boot.util.DubboUtils.BASE_PACKAGES_PROPERTY_NAME; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DEFAULT_MULTIPLE_CONFIG_PROPERTY_VALUE; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DEFAULT_OVERRIDE_CONFIG_PROPERTY_VALUE; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_CONFIG_PREFIX; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_MAILING_LIST; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_PREFIX; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SCAN_PREFIX; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GITHUB_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_GIT_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.DUBBO_SPRING_BOOT_ISSUES_URL; +import static org.apache.dubbo.spring.boot.util.DubboUtils.MULTIPLE_CONFIG_PROPERTY_NAME; +import static org.apache.dubbo.spring.boot.util.DubboUtils.OVERRIDE_CONFIG_PROPERTY_NAME; +import static org.apache.dubbo.spring.boot.util.DubboUtils.filterDubboProperties; /** * {@link DubboUtils} Test * - * * @see DubboUtils * @since 1.0.0 */ @@ -86,8 +85,8 @@ public void testFilterDubboProperties() { SortedMap dubboProperties = filterDubboProperties(environment); - Assert.assertEquals("true",dubboProperties.get(MULTIPLE_CONFIG_PROPERTY_NAME)); - Assert.assertEquals("true",dubboProperties.get(OVERRIDE_CONFIG_PROPERTY_NAME)); + Assert.assertEquals("true", dubboProperties.get(MULTIPLE_CONFIG_PROPERTY_NAME)); + Assert.assertEquals("true", dubboProperties.get(OVERRIDE_CONFIG_PROPERTY_NAME)); } diff --git a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/EnvironmentUtilsTest.java b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/EnvironmentUtilsTest.java similarity index 97% rename from dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/EnvironmentUtilsTest.java rename to dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/EnvironmentUtilsTest.java index 9155471a3..805b225f7 100644 --- a/dubbo-spring-boot-autoconfigure/src/test/java/com/alibaba/boot/dubbo/util/EnvironmentUtilsTest.java +++ b/dubbo-spring-boot-autoconfigure/src/test/java/org/apache/dubbo/spring/boot/util/EnvironmentUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.util; +package org.apache.dubbo.spring.boot.util; import org.junit.Assert; import org.junit.Test; @@ -29,7 +29,6 @@ /** * {@link EnvironmentUtils} Test * - * * @see EnvironmentUtils * @since 1.0.0 */ diff --git a/dubbo-spring-boot-distribution/pom.xml b/dubbo-spring-boot-distribution/pom.xml index 377375b8a..8c21fba20 100644 --- a/dubbo-spring-boot-distribution/pom.xml +++ b/dubbo-spring-boot-distribution/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-parent ${revision} ../dubbo-spring-boot-parent/pom.xml @@ -27,8 +27,8 @@ dubbo-spring-boot-distribution pom - Dubbo Spring Boot Distribution - Dubbo Spring Boot Distribution + Apache Dubbo Spring Boot Distribution + Apache Dubbo Spring Boot Distribution diff --git a/dubbo-spring-boot-parent/pom.xml b/dubbo-spring-boot-parent/pom.xml index c583e0f02..b9441f98f 100644 --- a/dubbo-spring-boot-parent/pom.xml +++ b/dubbo-spring-boot-parent/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-project ${revision} ../pom.xml @@ -28,8 +28,8 @@ dubbo-spring-boot-parent pom - Dubbo Spring Boot Parent - Dubbo Spring Boot Parent + Apache Dubbo Spring Boot Parent + Apache Dubbo Spring Boot Parent 1.8 @@ -38,7 +38,7 @@ UTF-8 UTF-8 2.1.1.RELEASE - 2.6.5 + 2.7.0-SNAPSHOT 0.0.2 0.6.2 @@ -56,7 +56,6 @@ 0.12 2.5.3 2.19.1 - 1.0.2 @@ -72,7 +71,7 @@ - com.alibaba + org.apache.dubbo dubbo-dependencies-bom ${dubbo.version} pom @@ -81,7 +80,7 @@ - com.alibaba + org.apache.dubbo dubbo ${dubbo.version} @@ -100,20 +99,6 @@ - - - com.alibaba - dubbo-registry-nacos - ${dubbo-registry-nacos.version} - - - - - com.alibaba.nacos - nacos-client - ${nacos-client.version} - - @@ -127,6 +112,19 @@ false + + + apache.snapshots.https + Apache Development Snapshot Repository + https://repository.apache.org/content/repositories/snapshots + + false + + + true + + + spring-milestone Spring Milestone diff --git a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml index 1c1920ff6..d36748277 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml +++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-auto-configure-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-auto-configure-consumer-sample - Dubbo Spring Boot Samples : Auto-Configure :: Consumer Sample + Apache Dubbo Spring Boot Samples : Auto-Configure :: Consumer Sample @@ -36,13 +36,13 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo diff --git a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java similarity index 90% rename from dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java rename to dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java index d84b96e4c..c04e9590a 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboAutoConfigurationConsumerBootstrap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.consumer.bootstrap; +package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,14 +39,14 @@ public class DubboAutoConfigurationConsumerBootstrap { @Reference(version = "1.0.0", url = "dubbo://localhost:12345") private DemoService demoService; + public static void main(String[] args) { + SpringApplication.run(DubboAutoConfigurationConsumerBootstrap.class).close(); + } + @Bean public ApplicationRunner runner() { return args -> { logger.info(demoService.sayHello("mercyblitz")); }; } - - public static void main(String[] args) { - SpringApplication.run(DubboAutoConfigurationConsumerBootstrap.class).close(); - } } diff --git a/dubbo-spring-boot-samples/auto-configure-samples/pom.xml b/dubbo-spring-boot-samples/auto-configure-samples/pom.xml index c9946947c..51d86611f 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/pom.xml +++ b/dubbo-spring-boot-samples/auto-configure-samples/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-samples ${revision} ../pom.xml @@ -26,8 +26,8 @@ 4.0.0 dubbo-spring-boot-auto-configure-samples - Dubbo Spring Boot Samples : Auto-Configure - Dubbo Spring Boot Auto-Configure Samples + Apache Dubbo Spring Boot Samples : Auto-Configure + Apache Dubbo Spring Boot Auto-Configure Samples pom diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml index 8d8e32212..c842d8ebf 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-auto-configure-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-auto-configure-provider-sample - Dubbo Spring Boot Samples : Auto-Configure :: Provider Sample + Apache Dubbo Spring Boot Samples : Auto-Configure :: Provider Sample @@ -37,13 +37,13 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java similarity index 90% rename from dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java rename to dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java index 012746bef..949f5ce0c 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboAutoConfigurationProviderBootstrap.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.bootstrap; +package org.apache.dubbo.spring.boot.demo.provider.bootstrap; -import com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService; +import org.apache.dubbo.spring.boot.demo.provider.service.DefaultDemoService; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java similarity index 88% rename from dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java rename to dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index 01dfccc3c..257bee6e7 100644 --- a/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/auto-configure-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.service; +package org.apache.dubbo.spring.boot.demo.provider.service; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.springframework.beans.factory.annotation.Value; diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml deleted file mode 100644 index 2f11091ad..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/pom.xml +++ /dev/null @@ -1,93 +0,0 @@ - - - - com.alibaba.boot.samples - dubbo-spring-boot-registry-nacos-samples - ${revision} - ../pom.xml - - 4.0.0 - - dubbo-spring-boot-registry-nacos-consumer-sample - Dubbo Spring Boot Samples : Registry Nacos :: Consumer Sample - - - - - org.springframework.boot - spring-boot-starter - - - - com.alibaba.boot - dubbo-spring-boot-starter - ${project.version} - - - - - com.alibaba - dubbo - - - - ${project.groupId} - dubbo-spring-boot-sample-api - ${project.version} - - - - - io.netty - netty-all - - - - - com.alibaba - dubbo-registry-nacos - - - - - com.alibaba.nacos - nacos-client - - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - - \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java deleted file mode 100644 index 408fe5e18..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryNacosConsumerBootstrap.java +++ /dev/null @@ -1,50 +0,0 @@ -/* - * 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.boot.dubbo.demo.consumer.bootstrap; - -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Reference; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.boot.ApplicationRunner; -import org.springframework.boot.SpringApplication; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.context.annotation.Bean; - -/** - * Dubbo Registry Nacos Consumer Bootstrap - */ -@EnableAutoConfiguration -public class DubboRegistryNacosConsumerBootstrap { - - private final Logger logger = LoggerFactory.getLogger(getClass()); - - @Reference(version = "${demo.service.version}") - private DemoService demoService; - - @Bean - public ApplicationRunner runner() { - return args -> { - logger.info(demoService.sayHello("mercyblitz")); - }; - } - - public static void main(String[] args) { - SpringApplication.run(DubboRegistryNacosConsumerBootstrap.class).close(); - } -} diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/resources/application.yml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/resources/application.yml deleted file mode 100644 index 7889cf709..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/consumer-sample/src/main/resources/application.yml +++ /dev/null @@ -1,11 +0,0 @@ -spring: - application: - name: dubbo-registry-nacos-consumer-sample - -demo: - service: - version: 1.0.0 - -dubbo: - registry: - address: nacos://127.0.0.1:8848 \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/pom.xml deleted file mode 100644 index 32e281652..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - com.alibaba.boot.samples - dubbo-spring-boot-samples - ${revision} - ../pom.xml - - 4.0.0 - - dubbo-spring-boot-registry-nacos-samples - Dubbo Spring Boot Samples : Registry Nacos - Dubbo Spring Boot Registry Nacos Samples - pom - - - consumer-sample - provider-sample - - - \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml deleted file mode 100644 index 93740dbd5..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/pom.xml +++ /dev/null @@ -1,94 +0,0 @@ - - - - com.alibaba.boot.samples - dubbo-spring-boot-registry-nacos-samples - ${revision} - ../pom.xml - - 4.0.0 - - dubbo-spring-boot-registry-nacos-provider-sample - Dubbo Spring Boot Samples : Registry Nacos :: Provider Sample - - - - - - org.springframework.boot - spring-boot-starter-web - - - - com.alibaba.boot - dubbo-spring-boot-starter - ${project.version} - - - - - com.alibaba - dubbo - - - - ${project.groupId} - dubbo-spring-boot-sample-api - ${project.version} - - - - - io.netty - netty-all - - - - - com.alibaba - dubbo-registry-nacos - - - - - com.alibaba.nacos - nacos-client - - - - - - - org.springframework.boot - spring-boot-maven-plugin - ${spring-boot.version} - - - - repackage - - - - - - - - - \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryNacosProviderBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryNacosProviderBootstrap.java deleted file mode 100644 index 361a392b6..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryNacosProviderBootstrap.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.boot.dubbo.demo.provider.bootstrap; - -import com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService; - -import org.springframework.boot.WebApplicationType; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.builder.SpringApplicationBuilder; - -/** - * Dubbo Registry ZooKeeper Provider Bootstrap - * - * @see DefaultDemoService - * @since 1.0.0 - */ -@EnableAutoConfiguration -public class DubboRegistryNacosProviderBootstrap { - - public static void main(String[] args) { - new SpringApplicationBuilder(DubboRegistryNacosProviderBootstrap.class) - .web(WebApplicationType.NONE) - .run(); - } -} diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/resources/application.properties b/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/resources/application.properties deleted file mode 100644 index 91635fb70..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/resources/application.properties +++ /dev/null @@ -1,20 +0,0 @@ -# Spring boot application -spring.application.name=dubbo-registry-nacos-provider-sample - -# Base packages to scan Dubbo Component: @com.alibaba.dubbo.config.annotation.Service -dubbo.scan.base-packages=com.alibaba.boot.dubbo.demo.provider.service - -# Dubbo Application -## The default value of dubbo.application.name is ${spring.application.name} -## dubbo.application.name=${spring.application.name} - -# Dubbo Protocol -dubbo.protocol.name=dubbo -## Random port -dubbo.protocol.port=-1 - -## Dubbo Registry -dubbo.registry.address=nacos://127.0.0.1:8848 - -## DemoService version -demo.service.version=1.0.0 \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml index 375c27963..fe0ca52f8 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-registry-zookeeper-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-registry-zookeeper-consumer-sample - Dubbo Spring Boot Samples : Registry Zookeeper :: Consumer Sample + Apache Dubbo Spring Boot Samples : Registry Zookeeper :: Consumer Sample @@ -36,13 +36,13 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo @@ -57,6 +57,16 @@ curator-framework + + org.apache.curator + curator-recipes + + + + org.apache.zookeeper + zookeeper + + diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java similarity index 90% rename from dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java rename to dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java index 1b7935bb1..3da78b1a1 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboRegistryZooKeeperConsumerBootstrap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.consumer.bootstrap; +package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,14 +37,14 @@ public class DubboRegistryZooKeeperConsumerBootstrap { @Reference(version = "${demo.service.version}") private DemoService demoService; + public static void main(String[] args) { + SpringApplication.run(DubboRegistryZooKeeperConsumerBootstrap.class).close(); + } + @Bean public ApplicationRunner runner() { return args -> { logger.info(demoService.sayHello("mercyblitz")); }; } - - public static void main(String[] args) { - SpringApplication.run(DubboRegistryZooKeeperConsumerBootstrap.class).close(); - } } diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/pom.xml index f27101a2c..b0b46fe77 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-samples ${revision} ../pom.xml @@ -26,8 +26,8 @@ 4.0.0 dubbo-spring-boot-registry-zookeeper-samples - Dubbo Spring Boot Samples : Registry Zookeeper - Dubbo Spring Boot Registry Zookeeper Samples + Apache Dubbo Spring Boot Samples : Registry Zookeeper + Apache Dubbo Spring Boot Registry Zookeeper Samples pom diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml index fb4690953..78b30b39a 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-registry-zookeeper-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-registry-zookeeper-provider-sample - Dubbo Spring Boot Samples : Registry Zookeeper :: Provider Sample + Apache Dubbo Spring Boot Samples : Registry Zookeeper :: Provider Sample @@ -37,14 +37,14 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java deleted file mode 100644 index f1d9ae1c9..000000000 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * 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.boot.dubbo.demo.provider.service; - -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Service; - -import org.springframework.beans.factory.annotation.Value; - -/** - * Default {@link DemoService} - * - * @see DemoService - * @since 1.0.0 - */ -@Service(version = "${demo.service.version}") -public class DefaultDemoService implements DemoService { - - /** - * The default value of ${dubbo.application.name} is ${spring.application.name} - */ - @Value("${dubbo.application.name}") - private String serviceName; - - public String sayHello(String name) { - return String.format("[%s] : Hello, %s", serviceName, name); - } -} \ No newline at end of file diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java similarity index 93% rename from dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java rename to dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java index bcc940760..a2f1eaadf 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboRegistryZooKeeperProviderBootstrap.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.bootstrap; +package org.apache.dubbo.spring.boot.demo.provider.bootstrap; -import com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService; +import org.apache.dubbo.spring.boot.demo.provider.service.DefaultDemoService; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/EmbeddedZooKeeper.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/EmbeddedZooKeeper.java similarity index 99% rename from dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/EmbeddedZooKeeper.java rename to dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/EmbeddedZooKeeper.java index ced63442b..1758fc858 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/EmbeddedZooKeeper.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/EmbeddedZooKeeper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.bootstrap; +package org.apache.dubbo.spring.boot.demo.provider.bootstrap; import org.apache.zookeeper.server.ServerConfig; @@ -108,6 +108,14 @@ public int getClientPort() { return this.clientPort; } + /** + * {@inheritDoc} + */ + @Override + public boolean isAutoStartup() { + return this.autoStartup; + } + /** * Specify whether to start automatically. Default is true. * @@ -121,8 +129,8 @@ public void setAutoStartup(boolean autoStartup) { * {@inheritDoc} */ @Override - public boolean isAutoStartup() { - return this.autoStartup; + public int getPhase() { + return this.phase; } /** @@ -134,14 +142,6 @@ public void setPhase(int phase) { this.phase = phase; } - /** - * {@inheritDoc} - */ - @Override - public int getPhase() { - return this.phase; - } - /** * {@inheritDoc} */ diff --git a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java similarity index 88% rename from dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java rename to dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index f1d9ae1c9..1e4c18be5 100644 --- a/dubbo-spring-boot-samples/dubbo-registry-nacos-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/dubbo-registry-zookeeper-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.service; +package org.apache.dubbo.spring.boot.demo.provider.service; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.springframework.beans.factory.annotation.Value; diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml index 413eb9bf7..aa438e9f4 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-externalized-configuration-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-externalized-configuration-consumer-sample - Dubbo Spring Boot Samples : Externalized Configuration :: Consumer Sample + Apache Dubbo Spring Boot Samples : Externalized Configuration :: Consumer Sample @@ -36,13 +36,13 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java similarity index 90% rename from dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java rename to dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java index 2eb78b432..835bfac46 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/com/alibaba/boot/dubbo/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/consumer-sample/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/bootstrap/DubboExternalizedConfigurationConsumerBootstrap.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.consumer.bootstrap; +package org.apache.dubbo.spring.boot.demo.consumer.bootstrap; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -37,14 +37,14 @@ public class DubboExternalizedConfigurationConsumerBootstrap { @Reference(version = "${demo.service.version}", url = "${demo.service.url}") private DemoService demoService; + public static void main(String[] args) { + SpringApplication.run(DubboExternalizedConfigurationConsumerBootstrap.class).close(); + } + @Bean public ApplicationRunner runner() { return args -> { logger.info(demoService.sayHello("mercyblitz")); }; } - - public static void main(String[] args) { - SpringApplication.run(DubboExternalizedConfigurationConsumerBootstrap.class).close(); - } } diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/pom.xml b/dubbo-spring-boot-samples/externalized-configuration-samples/pom.xml index 9bf23e9a6..75a4810b4 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/pom.xml +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-samples ${revision} ../pom.xml @@ -26,8 +26,8 @@ 4.0.0 dubbo-spring-boot-externalized-configuration-samples - Dubbo Spring Boot Samples : Externalized Configuration - Dubbo Spring Boot Externalized Configuration Samples + Apache Dubbo Spring Boot Samples : Externalized Configuration + Apache Dubbo Spring Boot Externalized Configuration Samples pom diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml index 4f90d8c3a..559045ada 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/pom.xml @@ -18,7 +18,7 @@ xmlns="http://maven.apache.org/POM/4.0.0" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-externalized-configuration-samples ${revision} ../pom.xml @@ -26,7 +26,7 @@ 4.0.0 dubbo-spring-boot-externalized-configuration-provider-sample - Dubbo Spring Boot Samples : Externalized Configuration :: Provider Sample + Apache Dubbo Spring Boot Samples : Externalized Configuration :: Provider Sample @@ -37,13 +37,13 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-starter ${project.version} - com.alibaba + org.apache.dubbo dubbo diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java similarity index 90% rename from dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java rename to dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java index 6264c17f8..657ddddee 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/bootstrap/DubboExternalizedConfigurationProviderBootstrap.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.bootstrap; +package org.apache.dubbo.spring.boot.demo.provider.bootstrap; -import com.alibaba.boot.dubbo.demo.provider.service.DefaultDemoService; +import org.apache.dubbo.spring.boot.demo.provider.service.DefaultDemoService; import org.springframework.boot.WebApplicationType; import org.springframework.boot.autoconfigure.EnableAutoConfiguration; diff --git a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java similarity index 88% rename from dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java rename to dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java index f1d9ae1c9..1e4c18be5 100644 --- a/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/com/alibaba/boot/dubbo/demo/provider/service/DefaultDemoService.java +++ b/dubbo-spring-boot-samples/externalized-configuration-samples/provider-sample/src/main/java/org/apache/dubbo/spring/boot/demo/provider/service/DefaultDemoService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.provider.service; +package org.apache.dubbo.spring.boot.demo.provider.service; -import com.alibaba.boot.dubbo.demo.consumer.DemoService; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.spring.boot.demo.consumer.DemoService; import org.springframework.beans.factory.annotation.Value; diff --git a/dubbo-spring-boot-samples/pom.xml b/dubbo-spring-boot-samples/pom.xml index 991c839b3..33d018fda 100644 --- a/dubbo-spring-boot-samples/pom.xml +++ b/dubbo-spring-boot-samples/pom.xml @@ -18,24 +18,23 @@ 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"> - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-parent ${revision} ../dubbo-spring-boot-parent/pom.xml 4.0.0 - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-samples pom - Dubbo Spring Boot Samples - Dubbo Spring Boot Samples + Apache Dubbo Spring Boot Samples + Apache Dubbo Spring Boot Samples sample-api auto-configure-samples externalized-configuration-samples - dubbo-registry-nacos-samples dubbo-registry-zookeeper-samples diff --git a/dubbo-spring-boot-samples/sample-api/pom.xml b/dubbo-spring-boot-samples/sample-api/pom.xml index e6a6746db..bf3cfd10b 100644 --- a/dubbo-spring-boot-samples/sample-api/pom.xml +++ b/dubbo-spring-boot-samples/sample-api/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot.samples + org.apache.dubbo.samples dubbo-spring-boot-samples ${revision} ../pom.xml @@ -26,6 +26,6 @@ 4.0.0 dubbo-spring-boot-sample-api - Dubbo Spring Boot Samples : API + Apache Dubbo Spring Boot Samples : API \ No newline at end of file diff --git a/dubbo-spring-boot-samples/sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java b/dubbo-spring-boot-samples/sample-api/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/DemoService.java similarity index 94% rename from dubbo-spring-boot-samples/sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java rename to dubbo-spring-boot-samples/sample-api/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/DemoService.java index bff13094f..0ec07f21d 100644 --- a/dubbo-spring-boot-samples/sample-api/src/main/java/com/alibaba/boot/dubbo/demo/consumer/DemoService.java +++ b/dubbo-spring-boot-samples/sample-api/src/main/java/org/apache/dubbo/spring/boot/demo/consumer/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.boot.dubbo.demo.consumer; +package org.apache.dubbo.spring.boot.demo.consumer; /** * Demo Service interface diff --git a/dubbo-spring-boot-starter/pom.xml b/dubbo-spring-boot-starter/pom.xml index 2bd319a87..e81df959e 100644 --- a/dubbo-spring-boot-starter/pom.xml +++ b/dubbo-spring-boot-starter/pom.xml @@ -18,7 +18,7 @@ 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"> - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-parent ${revision} ../dubbo-spring-boot-parent @@ -27,8 +27,8 @@ dubbo-spring-boot-starter jar - Dubbo Spring Boot Starter - Dubbo Spring Boot Starter + Apache Dubbo Spring Boot Starter + Apache Dubbo Spring Boot Starter @@ -53,7 +53,7 @@ - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-autoconfigure ${project.version} diff --git a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides b/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides deleted file mode 100644 index 5ea3fc3fe..000000000 --- a/dubbo-spring-boot-starter/src/main/resources/META-INF/spring.provides +++ /dev/null @@ -1 +0,0 @@ -provides: dubbo-spring-boot-autoconfigure,dubbo \ No newline at end of file diff --git a/pom.xml b/pom.xml index 0f1dd4f89..35c8fd9e0 100644 --- a/pom.xml +++ b/pom.xml @@ -24,20 +24,20 @@ 7 - com.alibaba.boot + org.apache.dubbo dubbo-spring-boot-project ${revision} pom - Dubbo Spring Boot Project - Dubbo Spring Boot Project + Apache Dubbo Spring Boot Project + Apache Dubbo Spring Boot Project https://github.com/apache/incubator-dubbo-spring-boot-project 3.0.1 2.19.1 - 0.2.1 + 1.0.0-SNAPSHOT