diff --git a/LICENSE b/LICENSE index 685172ecd9..94465f06b0 100644 --- a/LICENSE +++ b/LICENSE @@ -256,7 +256,7 @@ The Apache Software License, Version 1.1 IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -For the com.alibaba.dubbo.common.concurrent package: +For the org.apache.dubbo.common.concurrent package: This product bundles and repackages the following code in Google Guava 16.0.1, which is available under a "Apache License 2.0" license. For details, see https://github.com/google/guava/blob/v16.0.1/COPYING. @@ -265,7 +265,7 @@ This product bundles and repackages the following code in Google Guava 16.0.1, w * com.google.common.util.concurrent.ListenableFuture * com.google.common.util.concurrent.ListenableFutureTask -For the package com.alibaba.dubbo.common.threadlocal: +For the package org.apache.dubbo.common.threadlocal: This product contains a modified portion of 'Netty', an event-driven asynchronous network application framework also under a "Apache License 2.0" license, see https://github.com/netty/netty/blob/4.1/LICENSE.txt: diff --git a/all/pom.xml b/all/pom.xml index 3fec8297be..675989972a 100644 --- a/all/pom.xml +++ b/all/pom.xml @@ -428,117 +428,117 @@ - META-INF/dubbo/internal/com.alibaba.dubbo.common.compiler.Compiler + META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler - META-INF/dubbo/internal/com.alibaba.dubbo.common.extension.ExtensionFactory + META-INF/dubbo/internal/org.apache.dubbo.common.extension.ExtensionFactory - META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization + META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization - META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker + META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker - META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool + META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher + META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 + META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter + META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.exchange.Exchanger + META-INF/dubbo/internal/org.apache.dubbo.remoting.exchange.Exchanger - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.http.HttpBinder + META-INF/dubbo/internal/org.apache.dubbo.remoting.http.HttpBinder - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.p2p.Networker + META-INF/dubbo/internal/org.apache.dubbo.remoting.p2p.Networker - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler + META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler - META-INF/dubbo/internal/com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter + META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol + META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter + META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.InvokerListener + META-INF/dubbo/internal/org.apache.dubbo.rpc.InvokerListener - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ExporterListener + META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ProxyFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.ProxyFactory - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Cluster + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Cluster - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.LoadBalance + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.LoadBalance - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Merger + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Merger - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.RouterFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.RouterFactory - META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory + META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ConfiguratorFactory - META-INF/dubbo/internal/com.alibaba.dubbo.container.Container + META-INF/dubbo/internal/org.apache.dubbo.container.Container - META-INF/dubbo/internal/com.alibaba.dubbo.monitor.MonitorFactory + META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory - META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory + META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory - META-INF/dubbo/internal/com.alibaba.dubbo.validation.Validation + META-INF/dubbo/internal/org.apache.dubbo.validation.Validation - META-INF/dubbo/internal/com.alibaba.dubbo.cache.CacheFactory + META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory - META-INF/dubbo/internal/com.alibaba.dubbo.common.store.DataStore + META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore - META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter + META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter - META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand + META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand diff --git a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java index 37ec8a304b..b896c0ee84 100644 --- a/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java +++ b/dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java @@ -16,8 +16,8 @@ */ package org.apache.dubbo.bootstrap; -import com.alibaba.dubbo.config.DubboShutdownHook; -import com.alibaba.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.DubboShutdownHook; +import org.apache.dubbo.config.ServiceConfig; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java similarity index 80% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java index b2ab3a5b94..e5ecb157c0 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Cluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Cluster.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.support.FailoverCluster; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.support.FailoverCluster; /** * Cluster. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Configurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java similarity index 90% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Configurator.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java index 132e86caec..aa229fabc5 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Configurator.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Configurator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; /** * Configurator. (SPI, Prototype, ThreadSafe) diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/ConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java similarity index 83% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/ConfiguratorFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java index 6997a1713b..026d6f54ed 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/ConfiguratorFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/ConfiguratorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * ConfiguratorFactory. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Directory.java similarity index 80% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Directory.java index 97957145a6..67f021659e 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Directory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Directory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.Node; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Node; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; import java.util.List; @@ -28,7 +28,7 @@ import java.util.List; *

* Directory Service * - * @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory) + * @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory) */ public interface Directory extends Node { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java similarity index 74% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java index 120ba428c6..4e6ced18a0 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/LoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/LoadBalance.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; import java.util.List; @@ -31,7 +31,7 @@ import java.util.List; *

* Load-Balancing * - * @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory) + * @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory) */ @SPI(RandomLoadBalance.NAME) public interface LoadBalance { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java similarity index 90% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java index d0b8bf1db3..64bccf8cbd 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Merger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Merger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI public interface Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java similarity index 78% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java index a5eea1c9bf..47aa2515a3 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/Router.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/Router.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; import java.util.List; @@ -28,8 +28,8 @@ import java.util.List; *

* Routing * - * @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory) - * @see com.alibaba.dubbo.rpc.cluster.Directory#list(Invocation) + * @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory) + * @see org.apache.dubbo.rpc.cluster.Directory#list(Invocation) */ public interface Router extends Comparable { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java similarity index 74% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java index 35e57a73fa..679b9fe589 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RouterFactory.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.rpc.Invocation; /** * RouterFactory. (SPI, Singleton, ThreadSafe) *

* Routing * - * @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory) - * @see com.alibaba.dubbo.rpc.cluster.Directory#list(Invocation) + * @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory) + * @see org.apache.dubbo.rpc.cluster.Directory#list(Invocation) */ @SPI public interface RouterFactory { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RuleConverter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java similarity index 88% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RuleConverter.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java index 0a11ae6efd..f2cecdc4d7 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RuleConverter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/RuleConverter.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.SPI; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java index 42b688b9d8..bf8ba2a571 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/AbstractConfigurator.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/AbstractConfigurator.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator; +package org.apache.dubbo.rpc.cluster.configurator; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.cluster.Configurator; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.cluster.Configurator; import java.util.HashSet; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java similarity index 84% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java index d796df4859..c81d9b8f1d 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfigurator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.absent; +package org.apache.dubbo.rpc.cluster.configurator.absent; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.configurator.AbstractConfigurator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.configurator.AbstractConfigurator; /** * AbsentConfigurator diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java index fbe8e981cf..86b0e708b4 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.absent; +package org.apache.dubbo.rpc.cluster.configurator.absent; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.Configurator; -import com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.Configurator; +import org.apache.dubbo.rpc.cluster.ConfiguratorFactory; /** * AbsentConfiguratorFactory diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java similarity index 84% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java index f8c7ee8d98..1d57773edb 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfigurator.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.override; +package org.apache.dubbo.rpc.cluster.configurator.override; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.configurator.AbstractConfigurator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.configurator.AbstractConfigurator; /** * AbsentConfigurator diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java index fc648a727b..051b4bd82f 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.override; +package org.apache.dubbo.rpc.cluster.configurator.override; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.Configurator; -import com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.Configurator; +import org.apache.dubbo.rpc.cluster.ConfiguratorFactory; /** * AbsentConfiguratorFactory diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/AbstractDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java similarity index 86% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/AbstractDirectory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java index 6934069ee9..085094df22 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/AbstractDirectory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/AbstractDirectory.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.directory; +package org.apache.dubbo.rpc.cluster.directory; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; -import com.alibaba.dubbo.rpc.cluster.router.MockInvokersSelector; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.rpc.cluster.router.MockInvokersSelector; import java.util.ArrayList; import java.util.Collections; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java index ae64aa832b..47a0d12bc7 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.directory; +package org.apache.dubbo.rpc.cluster.directory; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Router; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Router; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java index 4e3ecec27e..ff94b3cf57 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/AbstractLoadBalance.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java index d65113ba0b..31749b287a 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.support.RpcUtils; import java.io.UnsupportedEncodingException; import java.security.MessageDigest; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java similarity index 92% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java index aa6ec12c23..7a8eb3dbd0 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveLoadBalance.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcStatus; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcStatus; import java.util.List; import java.util.Random; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java index df2ff47d3f..b5dea51182 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalance.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; import java.util.List; import java.util.Random; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java similarity index 91% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java index 9d4d0267d6..c2bf0b8c89 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalance.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.AtomicPositiveInteger; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.AtomicPositiveInteger; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; import java.util.LinkedHashMap; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java similarity index 95% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java index 6ec7637531..d6e58778ba 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ArrayMerger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; import java.lang.reflect.Array; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/BooleanArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/BooleanArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/BooleanArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/BooleanArrayMerger.java index 1b4c4b1ca4..090f8b13f7 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/BooleanArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/BooleanArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class BooleanArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ByteArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ByteArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ByteArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ByteArrayMerger.java index 7951b8d035..c135bb34cc 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ByteArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ByteArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class ByteArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CharArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/CharArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CharArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/CharArrayMerger.java index b72c64aef1..e9a3dbcf19 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/CharArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/CharArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class CharArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/DoubleArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/DoubleArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/DoubleArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/DoubleArrayMerger.java index b249490034..c42e225276 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/DoubleArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/DoubleArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class DoubleArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/FloatArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/FloatArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/FloatArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/FloatArrayMerger.java index 5bf14cbc95..d6a9e8b464 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/FloatArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/FloatArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class FloatArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/IntArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/IntArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/IntArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/IntArrayMerger.java index dc23767277..7be893997d 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/IntArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/IntArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class IntArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ListMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java similarity index 92% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ListMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java index bc61dae445..9ec2fe9251 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ListMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ListMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/LongArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/LongArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/LongArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/LongArrayMerger.java index a5ad107581..40ab0257fa 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/LongArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/LongArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class LongArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java index b8affc99f7..3e11e8bad4 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MapMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MapMerger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MergerFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java similarity index 91% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MergerFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java index 417d56773e..9264fb7c15 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/MergerFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/MergerFactory.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.rpc.cluster.Merger; import java.util.Set; import java.util.concurrent.ConcurrentHashMap; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/SetMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java similarity index 92% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/SetMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java index ec72bb803e..558d5853cc 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/SetMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/SetMerger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; import java.util.HashSet; import java.util.Set; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ShortArrayMerger.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ShortArrayMerger.java similarity index 93% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ShortArrayMerger.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ShortArrayMerger.java index 77342fc83c..3cbce9be51 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/merger/ShortArrayMerger.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/merger/ShortArrayMerger.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; -import com.alibaba.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.Merger; public class ShortArrayMerger implements Merger { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/MockInvokersSelector.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/MockInvokersSelector.java similarity index 89% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/MockInvokersSelector.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/MockInvokersSelector.java index d406f78da4..0ca2a4997d 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/MockInvokersSelector.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/MockInvokersSelector.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router; +package org.apache.dubbo.rpc.cluster.router; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Router; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Router; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java similarity index 92% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouter.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java index 05f1d7136d..af36757028 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.condition; +package org.apache.dubbo.rpc.cluster.router.condition; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Router; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Router; import java.text.ParseException; import java.util.ArrayList; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java similarity index 82% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java index 08ebb5787b..a616d8d015 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.condition; +package org.apache.dubbo.rpc.cluster.router.condition; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.RouterFactory; /** * ConditionRouterFactory diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterFactory.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterFactory.java index b91f4f6c16..6b8b324555 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.file; +package org.apache.dubbo.rpc.cluster.router.file; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.IOUtils; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; -import com.alibaba.dubbo.rpc.cluster.router.script.ScriptRouterFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.IOUtils; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.rpc.cluster.router.script.ScriptRouterFactory; import java.io.File; import java.io.FileReader; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouter.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java similarity index 88% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouter.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java index 74938c6439..616432254a 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouter.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouter.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.script; +package org.apache.dubbo.rpc.cluster.router.script; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Router; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Router; import javax.script.Bindings; import javax.script.Compilable; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java similarity index 86% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java index 2cda98edbe..56976ed731 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.script; +package org.apache.dubbo.rpc.cluster.router.script; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.RouterFactory; /** * ScriptRouterFactory diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java similarity index 91% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java index 9bd3497e14..a4a1905cf2 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvoker.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.support.RpcUtils; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableCluster.java similarity index 79% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableCluster.java index 4040baca19..85e91e0527 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableCluster.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java similarity index 82% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java index ff37f729e4..c75052c02e 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/AvailableClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/AvailableClusterInvoker.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java similarity index 80% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java index 598aa94ac4..c0cbdf763e 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * BroadcastCluster diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java similarity index 79% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java index 4771e6a7d3..ab0623ea4a 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/BroadcastClusterInvoker.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtils.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java similarity index 95% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtils.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java index 9739f553ae..2b875552d7 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtils.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ClusterUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java index f188b4dc55..34c0199e79 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * {@link FailbackClusterInvoker} diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java similarity index 83% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java index 3cc22a8439..55a4180f60 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvoker.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.HashMap; import java.util.List; @@ -52,8 +52,8 @@ public class FailbackClusterInvoker extends AbstractClusterInvoker { private static final long RETRY_FAILED_PERIOD = 5 * 1000; /** - * Use {@link NamedInternalThreadFactory} to produce {@link com.alibaba.dubbo.common.threadlocal.InternalThread} - * which with the use of {@link com.alibaba.dubbo.common.threadlocal.InternalThreadLocal} in {@link RpcContext}. + * Use {@link NamedInternalThreadFactory} to produce {@link org.apache.dubbo.common.threadlocal.InternalThread} + * which with the use of {@link org.apache.dubbo.common.threadlocal.InternalThreadLocal} in {@link RpcContext}. */ private final ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(2, new NamedInternalThreadFactory("failback-cluster-timer", true)); diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java index a1e3dba97f..5633603f0b 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * {@link FailfastClusterInvoker} diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java similarity index 83% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java index 8616ef437f..4122e8c9fe 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvoker.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java index 4dbfe1f17a..38d0f58991 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * {@link FailoverClusterInvoker} diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java index 525f3d071f..00b981fd20 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvoker.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.ArrayList; import java.util.HashSet; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java index c406967050..eed0b5bdc8 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * {@link FailsafeClusterInvoker} diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java similarity index 78% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java index 069fa03dad..0f5378a19a 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/FailsafeClusterInvoker.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java similarity index 80% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java index 6e02908f79..3701d64011 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * {@link ForkingClusterInvoker} diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java index 7d9a58d824..4cbaa0221a 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvoker.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.ArrayList; import java.util.List; @@ -44,8 +44,8 @@ import java.util.concurrent.atomic.AtomicInteger; public class ForkingClusterInvoker extends AbstractClusterInvoker { /** - * Use {@link NamedInternalThreadFactory} to produce {@link com.alibaba.dubbo.common.threadlocal.InternalThread} - * which with the use of {@link com.alibaba.dubbo.common.threadlocal.InternalThreadLocal} in {@link RpcContext}. + * Use {@link NamedInternalThreadFactory} to produce {@link org.apache.dubbo.common.threadlocal.InternalThread} + * which with the use of {@link org.apache.dubbo.common.threadlocal.InternalThreadLocal} in {@link RpcContext}. */ private final ExecutorService executor = Executors.newCachedThreadPool( new NamedInternalThreadFactory("forking-cluster-timer", true)); diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableCluster.java similarity index 82% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableCluster.java index ec942b737d..1e0f43d5be 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableCluster.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; public class MergeableCluster implements Cluster { diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java similarity index 89% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java index cb76f1cbac..0c68eab84e 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvoker.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.Merger; -import com.alibaba.dubbo.rpc.cluster.merger.MergerFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.Merger; +import org.apache.dubbo.rpc.cluster.merger.MergerFactory; import java.lang.reflect.Array; import java.lang.reflect.Method; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java similarity index 87% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java index 18d9ded42e..7e3b4e7df8 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvoker.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support.wrapper; +package org.apache.dubbo.rpc.cluster.support.wrapper; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.support.MockInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.support.MockInvoker; import java.util.List; diff --git a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java similarity index 81% rename from dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java rename to dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java index 9692cbb524..cfe8cece56 100644 --- a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java +++ b/dubbo-cluster/src/main/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterWrapper.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support.wrapper; +package org.apache.dubbo.rpc.cluster.support.wrapper; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; /** * mock impl diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Cluster b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Cluster deleted file mode 100644 index 54e85ed763..0000000000 --- a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Cluster +++ /dev/null @@ -1,9 +0,0 @@ -mock=com.alibaba.dubbo.rpc.cluster.support.wrapper.MockClusterWrapper -failover=com.alibaba.dubbo.rpc.cluster.support.FailoverCluster -failfast=com.alibaba.dubbo.rpc.cluster.support.FailfastCluster -failsafe=com.alibaba.dubbo.rpc.cluster.support.FailsafeCluster -failback=com.alibaba.dubbo.rpc.cluster.support.FailbackCluster -forking=com.alibaba.dubbo.rpc.cluster.support.ForkingCluster -available=com.alibaba.dubbo.rpc.cluster.support.AvailableCluster -mergeable=com.alibaba.dubbo.rpc.cluster.support.MergeableCluster -broadcast=com.alibaba.dubbo.rpc.cluster.support.BroadcastCluster \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory deleted file mode 100644 index 19236c0cf1..0000000000 --- a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory +++ /dev/null @@ -1,2 +0,0 @@ -override=com.alibaba.dubbo.rpc.cluster.configurator.override.OverrideConfiguratorFactory -absent=com.alibaba.dubbo.rpc.cluster.configurator.absent.AbsentConfiguratorFactory \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.LoadBalance b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.LoadBalance deleted file mode 100644 index de8a7f3eba..0000000000 --- a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.LoadBalance +++ /dev/null @@ -1,4 +0,0 @@ -random=com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance -roundrobin=com.alibaba.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance -leastactive=com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance -consistenthash=com.alibaba.dubbo.rpc.cluster.loadbalance.ConsistentHashLoadBalance \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Merger b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Merger deleted file mode 100644 index 70f211c0fd..0000000000 --- a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Merger +++ /dev/null @@ -1,11 +0,0 @@ -map=com.alibaba.dubbo.rpc.cluster.merger.MapMerger -set=com.alibaba.dubbo.rpc.cluster.merger.SetMerger -list=com.alibaba.dubbo.rpc.cluster.merger.ListMerger -byte=com.alibaba.dubbo.rpc.cluster.merger.ByteArrayMerger -char=com.alibaba.dubbo.rpc.cluster.merger.CharArrayMerger -short=com.alibaba.dubbo.rpc.cluster.merger.ShortArrayMerger -int=com.alibaba.dubbo.rpc.cluster.merger.IntArrayMerger -long=com.alibaba.dubbo.rpc.cluster.merger.LongArrayMerger -float=com.alibaba.dubbo.rpc.cluster.merger.FloatArrayMerger -double=com.alibaba.dubbo.rpc.cluster.merger.DoubleArrayMerger -boolean=com.alibaba.dubbo.rpc.cluster.merger.BooleanArrayMerger diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.RouterFactory b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.RouterFactory deleted file mode 100644 index 239c6f0b62..0000000000 --- a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.RouterFactory +++ /dev/null @@ -1,3 +0,0 @@ -file=com.alibaba.dubbo.rpc.cluster.router.file.FileRouterFactory -script=com.alibaba.dubbo.rpc.cluster.router.script.ScriptRouterFactory -condition=com.alibaba.dubbo.rpc.cluster.router.condition.ConditionRouterFactory \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Cluster b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Cluster new file mode 100644 index 0000000000..ef212d70e8 --- /dev/null +++ b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Cluster @@ -0,0 +1,9 @@ +mock=org.apache.dubbo.rpc.cluster.support.wrapper.MockClusterWrapper +failover=org.apache.dubbo.rpc.cluster.support.FailoverCluster +failfast=org.apache.dubbo.rpc.cluster.support.FailfastCluster +failsafe=org.apache.dubbo.rpc.cluster.support.FailsafeCluster +failback=org.apache.dubbo.rpc.cluster.support.FailbackCluster +forking=org.apache.dubbo.rpc.cluster.support.ForkingCluster +available=org.apache.dubbo.rpc.cluster.support.AvailableCluster +mergeable=org.apache.dubbo.rpc.cluster.support.MergeableCluster +broadcast=org.apache.dubbo.rpc.cluster.support.BroadcastCluster \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ConfiguratorFactory b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ConfiguratorFactory new file mode 100644 index 0000000000..000018773f --- /dev/null +++ b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ConfiguratorFactory @@ -0,0 +1,2 @@ +override=org.apache.dubbo.rpc.cluster.configurator.override.OverrideConfiguratorFactory +absent=org.apache.dubbo.rpc.cluster.configurator.absent.AbsentConfiguratorFactory \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.LoadBalance b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.LoadBalance new file mode 100644 index 0000000000..69e1cff2dc --- /dev/null +++ b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.LoadBalance @@ -0,0 +1,4 @@ +random=org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance +roundrobin=org.apache.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance +leastactive=org.apache.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance +consistenthash=org.apache.dubbo.rpc.cluster.loadbalance.ConsistentHashLoadBalance \ No newline at end of file diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Merger b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Merger new file mode 100644 index 0000000000..699decf96f --- /dev/null +++ b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Merger @@ -0,0 +1,11 @@ +map=org.apache.dubbo.rpc.cluster.merger.MapMerger +set=org.apache.dubbo.rpc.cluster.merger.SetMerger +list=org.apache.dubbo.rpc.cluster.merger.ListMerger +byte=org.apache.dubbo.rpc.cluster.merger.ByteArrayMerger +char=org.apache.dubbo.rpc.cluster.merger.CharArrayMerger +short=org.apache.dubbo.rpc.cluster.merger.ShortArrayMerger +int=org.apache.dubbo.rpc.cluster.merger.IntArrayMerger +long=org.apache.dubbo.rpc.cluster.merger.LongArrayMerger +float=org.apache.dubbo.rpc.cluster.merger.FloatArrayMerger +double=org.apache.dubbo.rpc.cluster.merger.DoubleArrayMerger +boolean=org.apache.dubbo.rpc.cluster.merger.BooleanArrayMerger diff --git a/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.RouterFactory b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.RouterFactory new file mode 100644 index 0000000000..0ada9c3be9 --- /dev/null +++ b/dubbo-cluster/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.RouterFactory @@ -0,0 +1,3 @@ +file=org.apache.dubbo.rpc.cluster.router.file.FileRouterFactory +script=org.apache.dubbo.rpc.cluster.router.script.ScriptRouterFactory +condition=org.apache.dubbo.rpc.cluster.router.condition.ConditionRouterFactory \ No newline at end of file diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/StickyTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/StickyTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java index 080003824e..ded3ad6af6 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/StickyTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/StickyTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster; +package org.apache.dubbo.rpc.cluster; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.support.AbstractClusterInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.support.AbstractClusterInvoker; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java similarity index 90% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java index 7dc3effd80..9b3789d382 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/absent/AbsentConfiguratorTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.absent; +package org.apache.dubbo.rpc.cluster.configurator.absent; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.cluster.configurator.consts.UrlConstant; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.cluster.configurator.consts.UrlConstant; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/consts/UrlConstant.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java similarity index 96% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/consts/UrlConstant.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java index 3f8e0ecca9..193f7ac364 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/consts/UrlConstant.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/consts/UrlConstant.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.consts; +package org.apache.dubbo.rpc.cluster.configurator.consts; /** * test case url constant diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java similarity index 88% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java index ada9d7ea92..1f665ba4d1 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/configurator/override/OverrideConfiguratorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.configurator.override; +package org.apache.dubbo.rpc.cluster.configurator.override; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.cluster.configurator.absent.AbsentConfigurator; -import com.alibaba.dubbo.rpc.cluster.configurator.consts.UrlConstant; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.cluster.configurator.absent.AbsentConfigurator; +import org.apache.dubbo.rpc.cluster.configurator.consts.UrlConstant; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/MockDirInvocation.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/MockDirInvocation.java similarity index 91% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/MockDirInvocation.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/MockDirInvocation.java index 4c900fb712..279160e716 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/MockDirInvocation.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/MockDirInvocation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.directory; +package org.apache.dubbo.rpc.cluster.directory; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectoryTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectoryTest.java similarity index 85% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectoryTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectoryTest.java index 29839b25bf..0bf0562fd7 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/directory/StaticDirectoryTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/directory/StaticDirectoryTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.directory; +package org.apache.dubbo.rpc.cluster.directory; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.router.MockInvoker; -import com.alibaba.dubbo.rpc.cluster.router.condition.ConditionRouterFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.router.MockInvoker; +import org.apache.dubbo.rpc.cluster.router.condition.ConditionRouterFactory; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoService.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoService.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java index e7d5575fcf..258b8c8b77 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoService.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.filter; +package org.apache.dubbo.rpc.cluster.filter; /** * TestService diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceLocal.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceLocal.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java index 342b2e6cea..e715ae6517 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceLocal.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceLocal.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.filter; +package org.apache.dubbo.rpc.cluster.filter; /** * TestService diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceMock.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceMock.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceMock.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceMock.java index 04db836ebd..f888a1c02f 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceMock.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceMock.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.filter; +package org.apache.dubbo.rpc.cluster.filter; /** * MockService.java diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceStub.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java similarity index 93% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceStub.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java index cdc80c341c..02fda0aa0f 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/DemoServiceStub.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/DemoServiceStub.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.filter; +package org.apache.dubbo.rpc.cluster.filter; /** * TestService diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/MockService.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/MockService.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/MockService.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/MockService.java index 49bea97465..e01d9a4fff 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/filter/MockService.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/filter/MockService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.filter; +package org.apache.dubbo.rpc.cluster.filter; /** * MockService.java diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java index 4cfaffbd71..7281fdbdeb 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Invoker; import org.junit.Assert; import org.junit.Ignore; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java index 4d82c86d32..fd151bcdb2 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LeastActiveBalanceTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Invoker; import org.junit.Assert; import org.junit.Ignore; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java index e7a22c5092..877631f56e 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/LoadBalanceBaseTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.cluster.LoadBalance; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java index a49dfda97f..3f20291d3d 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RandomLoadBalanceTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcStatus; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcStatus; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java index ffc4e6c000..f3ae351874 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/RoundRobinLoadBalanceTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.loadbalance; +package org.apache.dubbo.rpc.cluster.loadbalance; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Invoker; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/merger/ResultMergerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java similarity index 99% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/merger/ResultMergerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java index cede590cc0..f5044f305e 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/merger/ResultMergerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/merger/ResultMergerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.merger; +package org.apache.dubbo.rpc.cluster.merger; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/MockInvoker.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java similarity index 85% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/MockInvoker.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java index 1f5926a41d..c7db31fce0 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/MockInvoker.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/MockInvoker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router; +package org.apache.dubbo.rpc.cluster.router; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; public class MockInvoker implements Invoker { private boolean available = false; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java similarity index 96% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java index afbbc9ba1e..0a4ba90243 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/condition/ConditionRouterTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.condition; +package org.apache.dubbo.rpc.cluster.router.condition; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.router.MockInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.router.MockInvoker; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java similarity index 90% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java index a95fc5cec4..941e80cdd1 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/file/FileRouterEngineTest.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.file; +package org.apache.dubbo.rpc.cluster.router.file; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.cluster.support.AbstractClusterInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.cluster.support.AbstractClusterInvoker; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterTest.java similarity index 91% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterTest.java index a073ce2210..8a01a99ec5 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/router/script/ScriptRouterTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/router/script/ScriptRouterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.router.script; +package org.apache.dubbo.rpc.cluster.router.script; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.router.MockInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.router.MockInvoker; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java similarity index 95% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java index 495d6feaf4..37f2f27745 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/AbstractClusterInvokerTest.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.cluster.filter.DemoService; -import com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance; -import com.alibaba.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; -import com.alibaba.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.cluster.filter.DemoService; +import org.apache.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance; +import org.apache.dubbo.rpc.cluster.loadbalance.RandomLoadBalance; +import org.apache.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtilsTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java similarity index 96% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtilsTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java index d2359fb9aa..65cc1b2ce5 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ClusterUtilsTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ClusterUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java similarity index 86% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java index 883db13627..fa9ac1a868 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailSafeClusterInvokerTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.filter.DemoService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.filter.DemoService; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java similarity index 89% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java index d70d1da3ff..42a4ec6eba 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailbackClusterInvokerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java similarity index 91% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java index cbc495ce83..41dc79ca2e 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailfastClusterInvokerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; import org.junit.Assert; import org.junit.After; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java index f41864ffb3..28ba182974 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/FailoverClusterInvokerTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java similarity index 90% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java index d929183de6..97dcbcd764 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/ForkingClusterInvokerTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/Menu.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/Menu.java similarity index 97% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/Menu.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/Menu.java index a0683258ff..b3564d27ae 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/Menu.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/Menu.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; import java.util.ArrayList; import java.util.Collections; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MenuService.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MenuService.java similarity index 95% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MenuService.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MenuService.java index 845583dd4e..caf27df57b 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MenuService.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MenuService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; import java.util.List; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java similarity index 96% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java index 5d3b4c1722..12d6ba41e3 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/MergeableClusterInvokerTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support; +package org.apache.dubbo.rpc.cluster.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.cluster.Directory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java similarity index 94% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java index 7ef2cfeaad..4893dc7337 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MockClusterInvokerTest.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support.wrapper; +package org.apache.dubbo.rpc.cluster.support.wrapper; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Directory; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.cluster.support.AbstractClusterInvoker; -import com.alibaba.dubbo.rpc.support.MockProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.cluster.support.AbstractClusterInvoker; +import org.apache.dubbo.rpc.support.MockProtocol; import org.junit.Assert; import org.junit.Before; @@ -594,7 +594,7 @@ public class MockClusterInvokerTest { @Test public void testMockInvokerFromOverride_Invoke_force_throwCustemException() throws Throwable { URL url = URL.valueOf("remote://1.2.3.4/" + IHelloService.class.getName()) - .addParameter("getBoolean2.mock", "force:throw com.alibaba.dubbo.rpc.cluster.support.wrapper.MyMockException") + .addParameter("getBoolean2.mock", "force:throw org.apache.dubbo.rpc.cluster.support.wrapper.MyMockException") .addParameter("invoke_return_error", "true"); Invoker cluster = getClusterInvoker(url); //Configured with mock diff --git a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MyMockException.java b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MyMockException.java similarity index 92% rename from dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MyMockException.java rename to dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MyMockException.java index 4055a75160..d9a59cfb90 100644 --- a/dubbo-cluster/src/test/java/com/alibaba/dubbo/rpc/cluster/support/wrapper/MyMockException.java +++ b/dubbo-cluster/src/test/java/org/apache/dubbo/rpc/cluster/support/wrapper/MyMockException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.cluster.support.wrapper; +package org.apache.dubbo.rpc.cluster.support.wrapper; public class MyMockException extends RuntimeException { diff --git a/dubbo-cluster/src/test/resources/log4j.xml b/dubbo-cluster/src/test/resources/log4j.xml index fb51910e66..9b7df211e9 100644 --- a/dubbo-cluster/src/test/resources/log4j.xml +++ b/dubbo-cluster/src/test/resources/log4j.xml @@ -17,7 +17,7 @@ --> - + diff --git a/dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/availablerule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript similarity index 100% rename from dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/availablerule.javascript rename to dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/availablerule.javascript diff --git a/dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/methodrule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript similarity index 100% rename from dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/methodrule.javascript rename to dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/methodrule.javascript diff --git a/dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/notAvailablerule.javascript b/dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript similarity index 100% rename from dubbo-cluster/src/test/resources/com/alibaba/dubbo/rpc/cluster/router/file/notAvailablerule.javascript rename to dubbo-cluster/src/test/resources/org/apache/dubbo/rpc/cluster/router/file/notAvailablerule.javascript diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java index 3b4e5cffd8..0304af69eb 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Constants.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Constants.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; import java.util.concurrent.ExecutorService; import java.util.regex.Pattern; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Extension.java similarity index 91% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Extension.java index 1cd2031ed0..724a0d7dcd 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Extension.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Extension.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; @@ -51,7 +51,7 @@ import java.lang.annotation.Target; * instead of reporting which extract extension implementation fails and the extract reason. *

* - * @deprecated because it's too general, switch to use {@link com.alibaba.dubbo.common.extension.SPI} + * @deprecated because it's too general, switch to use {@link org.apache.dubbo.common.extension.SPI} */ @Deprecated @Documented diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Node.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Node.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Node.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Node.java index c3cfef2949..7b097f72b2 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Node.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Node.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; /** * Node. (API/SPI, Prototype, ThreadSafe) diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Parameters.java similarity index 94% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Parameters.java index daea5b52e4..39999279ec 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Parameters.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Parameters.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; import java.io.UnsupportedEncodingException; import java.net.URLDecoder; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Resetable.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Resetable.java index 81294e41eb..f2eb8da4ed 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Resetable.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Resetable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; /** * Resetable. diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/URL.java index f8a111967b..45d776ab32 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/URL.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/URL.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; -import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.CollectionUtils; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; import java.io.Serializable; import java.io.UnsupportedEncodingException; @@ -44,7 +44,7 @@ import java.util.concurrent.ConcurrentHashMap; *
  • http://www.facebook.com/friends?param1=value1&param2=value2 *
  • http://username:password@10.20.130.230:8080/list?version=1.0.0 *
  • ftp://username:password@192.168.1.7:21/1/read.txt - *
  • registry://192.168.1.7:9090/com.alibaba.service1?param1=value1&param2=value2 + *
  • registry://192.168.1.7:9090/org.apache.dubbo.service1?param1=value1&param2=value2 * *

    * Some strange example below: @@ -68,7 +68,7 @@ import java.util.concurrent.ConcurrentHashMap; * @see java.net.URL * @see java.net.URI */ -public final class URL implements Serializable { +public /**final**/ class URL implements Serializable { private static final long serialVersionUID = -1985165475234910535L; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Version.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/Version.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/Version.java index b84aaa5bfb..5721859d25 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/Version.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ClassHelper; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ClassHelper; import java.net.URL; import java.security.CodeSource; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanAccessor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanAccessor.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanAccessor.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanAccessor.java index 563e8036d5..7160de265f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanAccessor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanAccessor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.beanutil; +package org.apache.dubbo.common.beanutil; public enum JavaBeanAccessor { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanDescriptor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanDescriptor.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanDescriptor.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanDescriptor.java index 6a9cfcf7f9..bd328c1c0d 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/beanutil/JavaBeanDescriptor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/beanutil/JavaBeanDescriptor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.beanutil; +package org.apache.dubbo.common.beanutil; import java.io.Serializable; import java.util.Iterator; @@ -30,7 +30,7 @@ public final class JavaBeanDescriptor implements Serializable, Iterable * If default extension's name is not give on interface's {@link SPI}, then a name is generated from interface's * class name with the rule: divide classname from capital char into several parts, and separate the parts with - * dot '.', for example: for {@code com.alibaba.dubbo.xxx.YyyInvokerWrapper}, its default name is + * dot '.', for example: for {@code org.apache.dubbo.xxx.YyyInvokerWrapper}, its default name is * String[] {"yyy.invoker.wrapper"}. This name will be used to search for parameter from URL. * * @return parameter key names in URL diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionFactory.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionFactory.java index 4cfc7a7d7d..35cee53399 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extension; +package org.apache.dubbo.common.extension; /** * ExtensionFactory diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionLoader.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionLoader.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java index 7509a3d56d..315c9e107b 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/ExtensionLoader.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/ExtensionLoader.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extension; +package org.apache.dubbo.common.extension; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.support.ActivateComparator; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.Holder; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.support.ActivateComparator; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.Holder; +import org.apache.dubbo.common.utils.StringUtils; import java.io.BufferedReader; import java.io.InputStreamReader; @@ -52,9 +52,9 @@ import java.util.regex.Pattern; * * * @see Service Provider in Java 5 - * @see com.alibaba.dubbo.common.extension.SPI - * @see com.alibaba.dubbo.common.extension.Adaptive - * @see com.alibaba.dubbo.common.extension.Activate + * @see org.apache.dubbo.common.extension.SPI + * @see org.apache.dubbo.common.extension.Adaptive + * @see org.apache.dubbo.common.extension.Activate */ public class ExtensionLoader { @@ -140,7 +140,7 @@ public class ExtensionLoader { * @param url url * @param key url parameter key which used to get extension point names * @return extension list which are activated. - * @see #getActivateExtension(com.alibaba.dubbo.common.URL, String, String) + * @see #getActivateExtension(org.apache.dubbo.common.URL, String, String) */ public List getActivateExtension(URL url, String key) { return getActivateExtension(url, key, null); @@ -152,7 +152,7 @@ public class ExtensionLoader { * @param url url * @param values extension point names * @return extension list which are activated - * @see #getActivateExtension(com.alibaba.dubbo.common.URL, String[], String) + * @see #getActivateExtension(org.apache.dubbo.common.URL, String[], String) */ public List getActivateExtension(URL url, String[] values) { return getActivateExtension(url, values, null); @@ -165,7 +165,7 @@ public class ExtensionLoader { * @param key url parameter key which used to get extension point names * @param group group * @return extension list which are activated. - * @see #getActivateExtension(com.alibaba.dubbo.common.URL, String[], String) + * @see #getActivateExtension(org.apache.dubbo.common.URL, String[], String) */ public List getActivateExtension(URL url, String key, String group) { String value = url.getParameter(key); @@ -179,7 +179,7 @@ public class ExtensionLoader { * @param values extension point names * @param group group * @return extension list which are activated - * @see com.alibaba.dubbo.common.extension.Activate + * @see org.apache.dubbo.common.extension.Activate */ public List getActivateExtension(URL url, String[] values, String group) { List exts = new ArrayList(); @@ -576,14 +576,17 @@ public class ExtensionLoader { } Map> extensionClasses = new HashMap>(); - loadDirectory(extensionClasses, DUBBO_INTERNAL_DIRECTORY); - loadDirectory(extensionClasses, DUBBO_DIRECTORY); - loadDirectory(extensionClasses, SERVICES_DIRECTORY); + loadDirectory(extensionClasses, DUBBO_INTERNAL_DIRECTORY, type.getName()); + loadDirectory(extensionClasses, DUBBO_INTERNAL_DIRECTORY, type.getName().replace("org.apache", "com.alibaba")); + loadDirectory(extensionClasses, DUBBO_DIRECTORY, type.getName()); + loadDirectory(extensionClasses, DUBBO_DIRECTORY, type.getName().replace("org.apache", "com.alibaba")); + loadDirectory(extensionClasses, SERVICES_DIRECTORY, type.getName()); + loadDirectory(extensionClasses, SERVICES_DIRECTORY, type.getName().replace("org.apache", "com.alibaba")); return extensionClasses; } - private void loadDirectory(Map> extensionClasses, String dir) { - String fileName = dir + type.getName(); + private void loadDirectory(Map> extensionClasses, String dir, String type) { + String fileName = dir + type; try { Enumeration urls; ClassLoader classLoader = findClassLoader(); @@ -700,7 +703,7 @@ public class ExtensionLoader { @SuppressWarnings("deprecation") private String findAnnotationName(Class clazz) { - com.alibaba.dubbo.common.Extension extension = clazz.getAnnotation(com.alibaba.dubbo.common.Extension.class); + org.apache.dubbo.common.Extension extension = clazz.getAnnotation(org.apache.dubbo.common.Extension.class); if (extension == null) { String name = clazz.getSimpleName(); if (name.endsWith(type.getSimpleName())) { @@ -731,7 +734,7 @@ public class ExtensionLoader { private Class createAdaptiveExtensionClass() { String code = createAdaptiveExtensionClassCode(); ClassLoader classLoader = findClassLoader(); - com.alibaba.dubbo.common.compiler.Compiler compiler = ExtensionLoader.getExtensionLoader(com.alibaba.dubbo.common.compiler.Compiler.class).getAdaptiveExtension(); + org.apache.dubbo.common.compiler.Compiler compiler = ExtensionLoader.getExtensionLoader(org.apache.dubbo.common.compiler.Compiler.class).getAdaptiveExtension(); return compiler.compile(code, classLoader); } @@ -840,7 +843,7 @@ public class ExtensionLoader { boolean hasInvocation = false; for (int i = 0; i < pts.length; ++i) { - if (pts[i].getName().equals("com.alibaba.dubbo.rpc.Invocation")) { + if (pts[i].getName().equals("org.apache.dubbo.rpc.Invocation")) { // Null Point check String s = String.format("\nif (arg%d == null) throw new IllegalArgumentException(\"invocation == null\");", i); code.append(s); diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/SPI.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/SPI.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java index 7e7c5437ce..21eec7278e 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/SPI.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/SPI.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extension; +package org.apache.dubbo.common.extension; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/AdaptiveExtensionFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/AdaptiveExtensionFactory.java similarity index 86% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/AdaptiveExtensionFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/AdaptiveExtensionFactory.java index 55bbf5b2e0..6ecd0467b6 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/AdaptiveExtensionFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/AdaptiveExtensionFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extension.factory; +package org.apache.dubbo.common.extension.factory; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionFactory; -import com.alibaba.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionFactory; +import org.apache.dubbo.common.extension.ExtensionLoader; import java.util.ArrayList; import java.util.Collections; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/SpiExtensionFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/SpiExtensionFactory.java similarity index 83% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/SpiExtensionFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/SpiExtensionFactory.java index f8d7ba5f02..51c2b3c4b4 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/factory/SpiExtensionFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/factory/SpiExtensionFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extension.factory; +package org.apache.dubbo.common.extension.factory; -import com.alibaba.dubbo.common.extension.ExtensionFactory; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.ExtensionFactory; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extension.SPI; /** * SpiExtensionFactory diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/support/ActivateComparator.java b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java similarity index 91% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/support/ActivateComparator.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java index 7cf7a1b371..9dddd589c1 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/extension/support/ActivateComparator.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/extension/support/ActivateComparator.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extension.support; +package org.apache.dubbo.common.extension.support; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extension.SPI; import java.util.Comparator; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/Bytes.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/Bytes.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java index fb7d861610..a2cc9835c5 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/Bytes.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/Bytes.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; -import com.alibaba.dubbo.common.utils.IOUtils; +import org.apache.dubbo.common.utils.IOUtils; import java.io.File; import java.io.FileInputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/StreamUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/StreamUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java index 4c988d08ea..9b52286769 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/StreamUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/StreamUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStream.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStream.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStream.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStream.java index 8f30e9c965..b221da99f2 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStream.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStream.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStream.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStream.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStream.java index cdfc5ed9d4..a5227c3faf 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStream.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import java.io.IOException; import java.io.OutputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringReader.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringReader.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringReader.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringReader.java index 4c0e68bcff..dd8334ebb4 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringReader.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringReader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import java.io.IOException; import java.io.Reader; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringWriter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringWriter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java index 42934a3e75..ec99514e58 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/io/UnsafeStringWriter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/io/UnsafeStringWriter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import java.io.IOException; import java.io.Writer; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/GenericJSONConverter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/GenericJSONConverter.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/GenericJSONConverter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/GenericJSONConverter.java index 02553aa535..f06089f035 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/GenericJSONConverter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/GenericJSONConverter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.io.Bytes; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.io.Bytes; import java.io.IOException; import java.lang.reflect.Array; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/J2oVisitor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/J2oVisitor.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/J2oVisitor.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/J2oVisitor.java index f0a8b29329..eeeac01856 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/J2oVisitor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/J2oVisitor.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.utils.Stack; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.utils.Stack; +import org.apache.dubbo.common.utils.StringUtils; import java.io.IOException; import java.lang.reflect.Array; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSON.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSON.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSON.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSON.java index a27ccf9de2..2471856899 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSON.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSON.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.utils.Stack; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.utils.Stack; import java.io.IOException; import java.io.Reader; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONArray.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONArray.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONArray.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONArray.java index 42edfb4ed5..9c9cadf340 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONArray.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONArray.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import java.io.IOException; import java.util.ArrayList; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONConverter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONConverter.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONConverter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONConverter.java index 2fc24742f6..e9fe94c03e 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONConverter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONConverter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import java.io.IOException; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONNode.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONNode.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONNode.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONNode.java index c6f5f64f49..0e7531b164 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONNode.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONNode.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import java.io.IOException; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONObject.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONObject.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONObject.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONObject.java index 68757fc162..52c1990ba0 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONObject.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONObject.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import java.io.IOException; import java.util.HashMap; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONReader.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONReader.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONReader.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONReader.java index a51e751153..2fbf4f6df2 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONReader.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONReader.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONToken.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONToken.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONToken.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONToken.java index 1dd9d511aa..7e363c9f20 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONToken.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONToken.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; /** * JSONToken. diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONVisitor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONVisitor.java similarity index 94% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONVisitor.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONVisitor.java index 9fa7aa41ef..6c9b1b69ca 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONVisitor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONVisitor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; /** * JSONVisitor. diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONWriter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONWriter.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONWriter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONWriter.java index ea0bca7651..ee45e129bf 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/JSONWriter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/JSONWriter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; -import com.alibaba.dubbo.common.utils.Stack; +import org.apache.dubbo.common.utils.Stack; import java.io.IOException; import java.io.OutputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/ParseException.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/ParseException.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/ParseException.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/ParseException.java index 421e2769ba..4994e44ce3 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/ParseException.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/ParseException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; /** * ParseException. diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/Yylex.java b/dubbo-common/src/main/java/org/apache/dubbo/common/json/Yylex.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/json/Yylex.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/json/Yylex.java index 3b2e1682ad..c7b11e9529 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/json/Yylex.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/json/Yylex.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; /** * This class is a scanner generated by * JFlex 1.4.3 * on 7/3/10 3:12 AM from the specification file - * /Users/qianlei/dev/proj/dubbo-1.1/dubbo.common/src/main/java/com/alibaba/dubbo/common/json/json.flex + * /Users/qianlei/dev/proj/dubbo-1.1/dubbo.common/src/main/java/org.apache.dubbo/common/json/json.flex */ @Deprecated public class Yylex { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Level.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/Level.java similarity index 91% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Level.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/Level.java index 32d5accee8..e4ef5391db 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Level.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/Level.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; /** * Level diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Logger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/Logger.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Logger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/Logger.java index ea3949091e..3b78d04542 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/Logger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/Logger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; /** * Logger interface diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerAdapter.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerAdapter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerAdapter.java index a27c3e93d1..3300b3cb2f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerAdapter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerAdapter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; import java.io.File; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerFactory.java similarity index 91% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerFactory.java index 5ab42236a9..7848224d95 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/LoggerFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/LoggerFactory.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.jcl.JclLoggerAdapter; -import com.alibaba.dubbo.common.logger.jdk.JdkLoggerAdapter; -import com.alibaba.dubbo.common.logger.log4j.Log4jLoggerAdapter; -import com.alibaba.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; -import com.alibaba.dubbo.common.logger.support.FailsafeLogger; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.jcl.JclLoggerAdapter; +import org.apache.dubbo.common.logger.jdk.JdkLoggerAdapter; +import org.apache.dubbo.common.logger.log4j.Log4jLoggerAdapter; +import org.apache.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; +import org.apache.dubbo.common.logger.support.FailsafeLogger; import java.io.File; import java.util.Map; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLogger.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLogger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLogger.java index 428fd3d405..c88c1ab0bf 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLogger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.jcl; +package org.apache.dubbo.common.logger.jcl; -import com.alibaba.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.Logger; import org.apache.commons.logging.Log; import java.io.Serializable; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLoggerAdapter.java similarity index 85% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLoggerAdapter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLoggerAdapter.java index 52a062ee75..6a80695250 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jcl/JclLoggerAdapter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jcl/JclLoggerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.jcl; +package org.apache.dubbo.common.logger.jcl; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerAdapter; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerAdapter; import org.apache.commons.logging.LogFactory; import java.io.File; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLogger.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLogger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLogger.java index 547f87fb87..5f778885f5 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLogger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLogger.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.jdk; +package org.apache.dubbo.common.logger.jdk; -import com.alibaba.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.Logger; import java.util.logging.Level; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLoggerAdapter.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLoggerAdapter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLoggerAdapter.java index 35c0e4ce79..4419c154df 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/jdk/JdkLoggerAdapter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/jdk/JdkLoggerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.jdk; +package org.apache.dubbo.common.logger.jdk; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerAdapter; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerAdapter; import java.io.File; import java.io.InputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLogger.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLogger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLogger.java index aceb8ccf77..db87391d9f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLogger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLogger.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.log4j; +package org.apache.dubbo.common.logger.log4j; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.support.FailsafeLogger; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.support.FailsafeLogger; import org.apache.log4j.Level; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLoggerAdapter.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLoggerAdapter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLoggerAdapter.java index 3877db6741..e92a0971e9 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/log4j/Log4jLoggerAdapter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/log4j/Log4jLoggerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.log4j; +package org.apache.dubbo.common.logger.log4j; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerAdapter; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerAdapter; import org.apache.log4j.Appender; import org.apache.log4j.FileAppender; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java similarity index 94% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLogger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java index f41032bead..20409d7fcb 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLogger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLogger.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.slf4j; +package org.apache.dubbo.common.logger.slf4j; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.support.FailsafeLogger; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.support.FailsafeLogger; import org.slf4j.spi.LocationAwareLogger; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java similarity index 85% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java index 788920399f..b23c461863 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.slf4j; +package org.apache.dubbo.common.logger.slf4j; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerAdapter; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerAdapter; import java.io.File; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/support/FailsafeLogger.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/logger/support/FailsafeLogger.java index f37579fbc0..57e24c3728 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/logger/support/FailsafeLogger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/logger/support/FailsafeLogger.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.support; +package org.apache.dubbo.common.logger.support; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.utils.NetUtils; public class FailsafeLogger implements Logger { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/Status.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/Status.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/status/Status.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/status/Status.java index ad598c94db..db443b21c8 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/Status.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/Status.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.status; +package org.apache.dubbo.common.status; /** * Status diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/StatusChecker.java similarity index 88% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/status/StatusChecker.java index 08cf053930..368b85e78c 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/StatusChecker.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/StatusChecker.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.status; +package org.apache.dubbo.common.status; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; /** * StatusChecker diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/LoadStatusChecker.java similarity index 87% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/status/support/LoadStatusChecker.java index 20715c5d71..7f91255ad3 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/LoadStatusChecker.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/LoadStatusChecker.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; import java.lang.management.ManagementFactory; import java.lang.management.OperatingSystemMXBean; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/MemoryStatusChecker.java similarity index 86% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/status/support/MemoryStatusChecker.java index 65b4baa60b..e81286dfcc 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/MemoryStatusChecker.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/MemoryStatusChecker.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; /** * MemoryStatus diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/StatusUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/StatusUtils.java similarity index 89% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/StatusUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/status/support/StatusUtils.java index e835dd6b21..21fb384113 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/status/support/StatusUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/status/support/StatusUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.Status.Level; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.Status.Level; import java.util.Map; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/store/DataStore.java b/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/store/DataStore.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java index a6ac2a4dd2..8a6d475e4c 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/store/DataStore.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/store/DataStore.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.store; +package org.apache.dubbo.common.store; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; import java.util.Map; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/store/support/SimpleDataStore.java b/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/store/support/SimpleDataStore.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java index d070875acf..2252e8308e 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/store/support/SimpleDataStore.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/store/support/SimpleDataStore.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.store.support; +package org.apache.dubbo.common.store.support; -import com.alibaba.dubbo.common.store.DataStore; +import org.apache.dubbo.common.store.DataStore; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThread.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThread.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThread.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThread.java index a836561c50..e891cd8f7f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThread.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThread.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; /** * InternalThread diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocal.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocal.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java index bbf412d628..ac887e4530 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocal.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocal.java @@ -14,7 +14,7 @@ * under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; import java.util.Collections; import java.util.IdentityHashMap; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalMap.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalMap.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java index 6b0300bf64..46d9ec4805 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalMap.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalMap.java @@ -14,7 +14,7 @@ * under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; import java.util.Arrays; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java index 03868b9175..52b8d562c0 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactory.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; /** * NamedInternalThreadFactory diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java similarity index 83% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java index 466b1db0de..0142dedf5e 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/ThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/ThreadPool.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool; +package org.apache.dubbo.common.threadpool; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; import java.util.concurrent.Executor; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReport.java similarity index 91% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReport.java index 9246d96a8f..7aef31ca94 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReport.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReport.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support; +package org.apache.dubbo.common.threadpool.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.JVMUtil; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.JVMUtil; import java.io.File; import java.io.FileOutputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java similarity index 84% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java index c5aa285930..51c40742dd 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPool.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.cached; +package org.apache.dubbo.common.threadpool.support.cached; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java similarity index 85% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPool.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java index 2f97b6b517..14c9bcf938 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPool.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java index 883294d0c7..f8eb5df2c8 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutor.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; import java.util.concurrent.RejectedExecutionHandler; import java.util.concurrent.ThreadFactory; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueue.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueue.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueue.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueue.java index 7e7d87051a..a798491560 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueue.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueue.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.RejectedExecutionException; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java similarity index 83% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java index d3b61a5869..682bf89977 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPool.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.fixed; +package org.apache.dubbo.common.threadpool.support.fixed; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPool.java b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java similarity index 85% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPool.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java index b50bc9ee71..3a7dc46de0 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPool.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPool.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.limited; +package org.apache.dubbo.common.threadpool.support.limited; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.NamedInternalThreadFactory; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.NamedInternalThreadFactory; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import java.util.concurrent.Executor; import java.util.concurrent.LinkedBlockingQueue; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Assert.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Assert.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Assert.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/Assert.java index 72a242f9bc..4c6582ed9c 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Assert.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Assert.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; public abstract class Assert { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/AtomicPositiveInteger.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/AtomicPositiveInteger.java index c7d01e1034..1f92b642eb 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/AtomicPositiveInteger.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/AtomicPositiveInteger.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ClassHelper.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ClassHelper.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java index f6ac8d3bb1..8ecb8f4045 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ClassHelper.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ClassHelper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.lang.reflect.Array; import java.util.Arrays; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CollectionUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CollectionUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java index 314560d11f..eca847f6e7 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CollectionUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CollectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.ArrayList; import java.util.Collection; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java index 3d54a3ed2e..424cead9b1 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/CompatibleTypeUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.lang.reflect.Array; import java.math.BigDecimal; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConcurrentHashSet.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConcurrentHashSet.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConcurrentHashSet.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConcurrentHashSet.java index 7eab158f41..a3ac9db8fd 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConcurrentHashSet.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConcurrentHashSet.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.AbstractSet; import java.util.ConcurrentModificationException; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java index 8c4ac69aea..f112ec2576 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ConfigUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ConfigUtils.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import java.io.FileInputStream; import java.io.InputStream; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/DubboAppender.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java similarity index 94% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/DubboAppender.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java index 96e894931d..da3968e9f6 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/DubboAppender.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/DubboAppender.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.apache.log4j.ConsoleAppender; import org.apache.log4j.spi.LoggingEvent; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ExecutorUtil.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ExecutorUtil.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java index d605e13066..d33af36424 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ExecutorUtil.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ExecutorUtil.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import java.util.concurrent.Executor; import java.util.concurrent.ExecutorService; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Holder.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Holder.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Holder.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/Holder.java index 810b83b1d0..145ab8eba1 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Holder.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Holder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; /** * Helper Class for hold a value. diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/IOUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/IOUtils.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/IOUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/IOUtils.java index 761e23c4b8..7129c34011 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/IOUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/IOUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.io.BufferedReader; import java.io.File; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/JVMUtil.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/JVMUtil.java similarity index 99% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/JVMUtil.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/JVMUtil.java index 49c726c6f9..052a120781 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/JVMUtil.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/JVMUtil.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.io.OutputStream; import java.lang.management.LockInfo; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LRUCache.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LRUCache.java similarity index 98% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LRUCache.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/LRUCache.java index 835772b351..b7bfc6e49f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LRUCache.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LRUCache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.LinkedHashMap; import java.util.concurrent.locks.Lock; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Log.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Log.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Log.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/Log.java index b9790f4b25..6604c2b93f 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Log.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Log.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.apache.log4j.Level; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogHelper.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogHelper.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogHelper.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogHelper.java index 7f962b266c..99ba5ab828 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogHelper.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogHelper.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.Logger; public class LogHelper { diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogUtil.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogUtil.java similarity index 93% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogUtil.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogUtil.java index 2991cb364b..d5b3e2b713 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/LogUtil.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/LogUtil.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.log4j.Level; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NamedThreadFactory.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NamedThreadFactory.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NamedThreadFactory.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/NamedThreadFactory.java index 36ace7ddf5..a0c4620d35 100755 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NamedThreadFactory.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NamedThreadFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java similarity index 95% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java index 7b8bb534c6..cbe345cd59 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/NetUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/NetUtils.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import java.io.IOException; import java.net.InetAddress; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java index 952062999d..09fd234d8b 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/PojoUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/PojoUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.lang.reflect.Array; import java.lang.reflect.Constructor; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java index 38c4a0d079..ea499a3212 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/ReflectUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/ReflectUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import javassist.CtClass; import javassist.CtConstructor; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Stack.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Stack.java similarity index 94% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Stack.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/Stack.java index 83b6687d8e..867f7f83b7 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/Stack.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/Stack.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import java.util.ArrayList; import java.util.EmptyStackException; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/StringUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java similarity index 96% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/StringUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java index ca510aec94..fed75258b6 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/StringUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/StringUtils.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.io.UnsafeStringWriter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.io.UnsafeStringWriter; import com.alibaba.fastjson.JSON; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import java.io.PrintWriter; import java.util.ArrayList; diff --git a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java similarity index 97% rename from dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java rename to dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java index 9ba130081f..408cac7844 100644 --- a/dubbo-common/src/main/java/com/alibaba/dubbo/common/utils/UrlUtils.java +++ b/dubbo-common/src/main/java/org/apache/dubbo/common/utils/UrlUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import java.util.ArrayList; import java.util.HashMap; diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.compiler.Compiler b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.compiler.Compiler deleted file mode 100644 index 45d649e8f8..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.compiler.Compiler +++ /dev/null @@ -1,3 +0,0 @@ -adaptive=com.alibaba.dubbo.common.compiler.support.AdaptiveCompiler -jdk=com.alibaba.dubbo.common.compiler.support.JdkCompiler -javassist=com.alibaba.dubbo.common.compiler.support.JavassistCompiler \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extension.ExtensionFactory b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extension.ExtensionFactory deleted file mode 100644 index 21bf88fc57..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extension.ExtensionFactory +++ /dev/null @@ -1,2 +0,0 @@ -adaptive=com.alibaba.dubbo.common.extension.factory.AdaptiveExtensionFactory -spi=com.alibaba.dubbo.common.extension.factory.SpiExtensionFactory \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter deleted file mode 100644 index 7ad69e0dd8..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter +++ /dev/null @@ -1,4 +0,0 @@ -slf4j=com.alibaba.dubbo.common.logger.slf4j.Slf4jLoggerAdapter -jcl=com.alibaba.dubbo.common.logger.jcl.JclLoggerAdapter -log4j=com.alibaba.dubbo.common.logger.log4j.Log4jLoggerAdapter -jdk=com.alibaba.dubbo.common.logger.jdk.JdkLoggerAdapter \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker deleted file mode 100644 index d4eca747fd..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker +++ /dev/null @@ -1,2 +0,0 @@ -memory=com.alibaba.dubbo.common.status.support.MemoryStatusChecker -load=com.alibaba.dubbo.common.status.support.LoadStatusChecker \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.store.DataStore b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.store.DataStore deleted file mode 100644 index f51ef51b8a..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.store.DataStore +++ /dev/null @@ -1 +0,0 @@ -simple=com.alibaba.dubbo.common.store.support.SimpleDataStore \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool b/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool deleted file mode 100644 index 8d87177b74..0000000000 --- a/dubbo-common/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool +++ /dev/null @@ -1,4 +0,0 @@ -fixed=com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool -cached=com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool -limited=com.alibaba.dubbo.common.threadpool.support.limited.LimitedThreadPool -eager=com.alibaba.dubbo.common.threadpool.support.eager.EagerThreadPool diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler new file mode 100644 index 0000000000..c6d72aa21e --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler @@ -0,0 +1,3 @@ +adaptive=org.apache.dubbo.common.compiler.support.AdaptiveCompiler +jdk=org.apache.dubbo.common.compiler.support.JdkCompiler +javassist=org.apache.dubbo.common.compiler.support.JavassistCompiler \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ExtensionFactory b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ExtensionFactory new file mode 100644 index 0000000000..5ab75b071a --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extension.ExtensionFactory @@ -0,0 +1,2 @@ +adaptive=org.apache.dubbo.common.extension.factory.AdaptiveExtensionFactory +spi=org.apache.dubbo.common.extension.factory.SpiExtensionFactory \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter new file mode 100644 index 0000000000..fb0b3d8f96 --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter @@ -0,0 +1,4 @@ +slf4j=org.apache.dubbo.common.logger.slf4j.Slf4jLoggerAdapter +jcl=org.apache.dubbo.common.logger.jcl.JclLoggerAdapter +log4j=org.apache.dubbo.common.logger.log4j.Log4jLoggerAdapter +jdk=org.apache.dubbo.common.logger.jdk.JdkLoggerAdapter \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker new file mode 100644 index 0000000000..4e80075719 --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker @@ -0,0 +1,2 @@ +memory=org.apache.dubbo.common.status.support.MemoryStatusChecker +load=org.apache.dubbo.common.status.support.LoadStatusChecker \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore new file mode 100644 index 0000000000..c1325315d6 --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore @@ -0,0 +1 @@ +simple=org.apache.dubbo.common.store.support.SimpleDataStore \ No newline at end of file diff --git a/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool new file mode 100644 index 0000000000..5c16c89a35 --- /dev/null +++ b/dubbo-common/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool @@ -0,0 +1,4 @@ +fixed=org.apache.dubbo.common.threadpool.support.fixed.FixedThreadPool +cached=org.apache.dubbo.common.threadpool.support.cached.CachedThreadPool +limited=org.apache.dubbo.common.threadpool.support.limited.LimitedThreadPool +eager=org.apache.dubbo.common.threadpool.support.eager.EagerThreadPool diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java b/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java deleted file mode 100644 index a2526b5a22..0000000000 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java +++ /dev/null @@ -1,21 +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.dubbo.common.model; - -public enum AnimalEnum { - dog, cat, rat, cow, bull, horse; -} \ No newline at end of file diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java index 0a19b7abb0..bb9b0c3d98 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/URLTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/URLTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common; +package org.apache.dubbo.common; -import com.alibaba.dubbo.common.utils.CollectionUtils; +import org.apache.dubbo.common.utils.CollectionUtils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/Bean.java b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java similarity index 90% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/Bean.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java index 6f6f7559af..2ca32b2303 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/Bean.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/Bean.java @@ -1,8 +1,8 @@ -package com.alibaba.dubbo.common.beanutil; +package org.apache.dubbo.common.beanutil; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; import java.util.Collection; import java.util.Date; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java index 025b1462c3..372825ec25 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/beanutil/JavaBeanSerializeUtilTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.beanutil; +package org.apache.dubbo.common.beanutil; -import com.alibaba.dubbo.common.model.person.BigPerson; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonInfo; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; -import com.alibaba.dubbo.common.utils.PojoUtilsTest; +import org.apache.dubbo.common.model.person.BigPerson; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonInfo; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.utils.PojoUtilsTest; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ClassGeneratorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ClassGeneratorTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ClassGeneratorTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ClassGeneratorTest.java index 578261becf..4fa775daf4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ClassGeneratorTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ClassGeneratorTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.bytecode; +package org.apache.dubbo.common.bytecode; import junit.framework.TestCase; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/MixinTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/MixinTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java index 622726de67..7488791e3c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/MixinTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/MixinTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.bytecode; +package org.apache.dubbo.common.bytecode; import junit.framework.TestCase; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ProxyTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ProxyTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ProxyTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ProxyTest.java index b2b0d1c80f..cac558c8a6 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/ProxyTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/ProxyTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.bytecode; +package org.apache.dubbo.common.bytecode; import junit.framework.TestCase; import net.sf.cglib.proxy.Enhancer; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/WrapperTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/WrapperTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java index 5229b37212..b1a79be5c9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/bytecode/WrapperTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/bytecode/WrapperTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.bytecode; +package org.apache.dubbo.common.bytecode; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/compiler/support/JdkCompilerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/JdkCompilerTest.java similarity index 94% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/compiler/support/JdkCompilerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/JdkCompilerTest.java index 4806a1df03..47b8420cab 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/compiler/support/JdkCompilerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/compiler/support/JdkCompilerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.compiler.support; +package org.apache.dubbo.common.compiler.support; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ExecutionListTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ExecutionListTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java index 16026e5ad8..bd1900e6bb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ExecutionListTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.concurrent; +package org.apache.dubbo.common.concurrent; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ListenableFutureTaskTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ListenableFutureTaskTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ListenableFutureTaskTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ListenableFutureTaskTest.java index cd11f8f826..0dc9e14468 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/concurrent/ListenableFutureTaskTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ListenableFutureTaskTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.concurrent; +package org.apache.dubbo.common.concurrent; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoaderTest.java similarity index 82% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoaderTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoaderTest.java index a864907478..367e848062 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoaderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoaderTest.java @@ -14,38 +14,38 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader; +package org.apache.dubbo.common.extensionloader; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; -import com.alibaba.dubbo.common.extensionloader.activate.impl.ActivateExt1Impl1; -import com.alibaba.dubbo.common.extensionloader.activate.impl.GroupActivateExtImpl; -import com.alibaba.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl1; -import com.alibaba.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl2; -import com.alibaba.dubbo.common.extensionloader.activate.impl.ValueActivateExtImpl; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; -import com.alibaba.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl1; -import com.alibaba.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl2; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper1; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper2; -import com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt2; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt3; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt4; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt1Impl1; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdaptive; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdd1; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdd2; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt2_ManualAdaptive; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt3_ManualAdaptive; -import com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt4_ManualAdaptive; -import com.alibaba.dubbo.common.extensionloader.ext9_empty.Ext9Empty; -import com.alibaba.dubbo.common.extensionloader.ext9_empty.impl.Ext9EmptyImpl; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extensionloader.activate.impl.ActivateExt1Impl1; +import org.apache.dubbo.common.extensionloader.activate.impl.GroupActivateExtImpl; +import org.apache.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl1; +import org.apache.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl2; +import org.apache.dubbo.common.extensionloader.activate.impl.ValueActivateExtImpl; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl1; +import org.apache.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl2; +import org.apache.dubbo.common.extensionloader.ext2.Ext2; +import org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt; +import org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper1; +import org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper2; +import org.apache.dubbo.common.extensionloader.ext7.InitErrorExt; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt1; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt2; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt3; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt4; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt1Impl1; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdaptive; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdd1; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt1_ManualAdd2; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt2_ManualAdaptive; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt3_ManualAdaptive; +import org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt4_ManualAdaptive; +import org.apache.dubbo.common.extensionloader.ext9_empty.Ext9Empty; +import org.apache.dubbo.common.extensionloader.ext9_empty.impl.Ext9EmptyImpl; import org.junit.Assert; import org.junit.Test; @@ -84,7 +84,7 @@ public class ExtensionLoaderTest { fail(); } catch (IllegalArgumentException expected) { assertThat(expected.getMessage(), - containsString("Extension type(class com.alibaba.dubbo.common.extensionloader.ExtensionLoaderTest) is not interface")); + containsString("Extension type(class org.apache.dubbo.common.extensionloader.ExtensionLoaderTest) is not interface")); } } @@ -95,7 +95,7 @@ public class ExtensionLoaderTest { fail(); } catch (IllegalArgumentException expected) { assertThat(expected.getMessage(), - allOf(containsString("com.alibaba.dubbo.common.extensionloader.NoSpiExt"), + allOf(containsString("org.apache.dubbo.common.extensionloader.NoSpiExt"), containsString("is not extension"), containsString("WITHOUT @SPI Annotation"))); } @@ -149,7 +149,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(SimpleExt.class).getExtension("XXX"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("No such extension com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt by name XXX")); + assertThat(expected.getMessage(), containsString("No such extension org.apache.dubbo.common.extensionloader.ext1.SimpleExt by name XXX")); } } @@ -159,7 +159,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(WrappedExt.class).getExtension("XXX"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("No such extension com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt by name XXX")); + assertThat(expected.getMessage(), containsString("No such extension org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt by name XXX")); } } @@ -232,7 +232,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(AddExt1.class).getExtension("Manual1"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("No such extension com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1 by name Manual")); + assertThat(expected.getMessage(), containsString("No such extension org.apache.dubbo.common.extensionloader.ext8_add.AddExt1 by name Manual")); } ExtensionLoader.getExtensionLoader(AddExt1.class).addExtension("Manual1", AddExt1_ManualAdd1.class); @@ -260,7 +260,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(AddExt1.class).addExtension("impl1", AddExt1_ManualAdd1.class); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Extension name impl1 already existed(Extension interface com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1)!")); + assertThat(expected.getMessage(), containsString("Extension name impl1 already existed(Extension interface org.apache.dubbo.common.extensionloader.ext8_add.AddExt1)!")); } } @@ -283,7 +283,7 @@ public class ExtensionLoaderTest { loader.addExtension(null, AddExt1_ManualAdaptive.class); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Adaptive Extension already existed(Extension interface com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1)!")); + assertThat(expected.getMessage(), containsString("Adaptive Extension already existed(Extension interface org.apache.dubbo.common.extensionloader.ext8_add.AddExt1)!")); } } @@ -293,7 +293,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(AddExt1.class).getExtension("Manual2"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("No such extension com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1 by name Manual")); + assertThat(expected.getMessage(), containsString("No such extension org.apache.dubbo.common.extensionloader.ext8_add.AddExt1 by name Manual")); } { @@ -332,7 +332,7 @@ public class ExtensionLoaderTest { ExtensionLoader.getExtensionLoader(AddExt1.class).replaceExtension("NotExistedExtension", AddExt1_ManualAdd1.class); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Extension name NotExistedExtension not existed(Extension interface com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1)")); + assertThat(expected.getMessage(), containsString("Extension name NotExistedExtension not existed(Extension interface org.apache.dubbo.common.extensionloader.ext8_add.AddExt1)")); } } @@ -344,7 +344,7 @@ public class ExtensionLoaderTest { loader.replaceExtension(null, AddExt4_ManualAdaptive.class); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Adaptive Extension not existed(Extension interface com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt4)")); + assertThat(expected.getMessage(), containsString("Adaptive Extension not existed(Extension interface org.apache.dubbo.common.extensionloader.ext8_add.AddExt4)")); } } @@ -358,7 +358,7 @@ public class ExtensionLoaderTest { loader.getExtension("error"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Failed to load extension class(interface: interface com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt")); + assertThat(expected.getMessage(), containsString("Failed to load extension class(interface: interface org.apache.dubbo.common.extensionloader.ext7.InitErrorExt")); assertThat(expected.getCause(), instanceOf(ExceptionInInitializerError.class)); } } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java index b857566896..0fd8e41e71 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_Test.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader; +package org.apache.dubbo.common.extensionloader; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; -import com.alibaba.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExt_ManualAdaptive; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; -import com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; -import com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt; -import com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2; -import com.alibaba.dubbo.common.utils.LogUtil; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; +import org.apache.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExt_ManualAdaptive; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.extensionloader.ext2.Ext2; +import org.apache.dubbo.common.extensionloader.ext2.UrlHolder; +import org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; +import org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt; +import org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; +import org.apache.dubbo.common.extensionloader.ext6_inject.Ext6; +import org.apache.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2; +import org.apache.dubbo.common.utils.LogUtil; import org.junit.Assert; import org.junit.Test; @@ -148,8 +148,8 @@ public class ExtensionLoader_Adaptive_Test { fail(); } catch (IllegalStateException expected) { assertThat(expected.getMessage(), - allOf(containsString("Can not create adaptive extension interface com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"), - containsString("No adaptive method on extension com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class"))); + allOf(containsString("Can not create adaptive extension interface org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"), + containsString("No adaptive method on extension org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class"))); } // report same error when get is invoked for multiple times try { @@ -157,8 +157,8 @@ public class ExtensionLoader_Adaptive_Test { fail(); } catch (IllegalStateException expected) { assertThat(expected.getMessage(), - allOf(containsString("Can not create adaptive extension interface com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"), - containsString("No adaptive method on extension com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class"))); + allOf(containsString("Can not create adaptive extension interface org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt"), + containsString("No adaptive method on extension org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt, refuse to create the adaptive class"))); } } @@ -176,7 +176,7 @@ public class ExtensionLoader_Adaptive_Test { assertThat(expected.getMessage(), containsString("method ")); assertThat( expected.getMessage(), - containsString("of interface com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt is not adaptive method!")); + containsString("of interface org.apache.dubbo.common.extensionloader.ext1.SimpleExt is not adaptive method!")); } } @@ -240,14 +240,14 @@ public class ExtensionLoader_Adaptive_Test { ext.echo(null, "haha"); fail(); } catch (IllegalArgumentException e) { - assertEquals("com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder argument == null", e.getMessage()); + assertEquals("org.apache.dubbo.common.extensionloader.ext2.UrlHolder argument == null", e.getMessage()); } try { ext.echo(new UrlHolder(), "haha"); fail(); } catch (IllegalArgumentException e) { - assertEquals("com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder argument getUrl() == null", e.getMessage()); + assertEquals("org.apache.dubbo.common.extensionloader.ext2.UrlHolder argument getUrl() == null", e.getMessage()); } } @@ -265,7 +265,7 @@ public class ExtensionLoader_Adaptive_Test { assertThat(expected.getMessage(), containsString("method ")); assertThat( expected.getMessage(), - containsString("of interface com.alibaba.dubbo.common.extensionloader.ext2.Ext2 is not adaptive method!")); + containsString("of interface org.apache.dubbo.common.extensionloader.ext2.Ext2 is not adaptive method!")); } } @@ -291,7 +291,7 @@ public class ExtensionLoader_Adaptive_Test { ext.echo(holder, "haha"); fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Fail to get extension(com.alibaba.dubbo.common.extensionloader.ext2.Ext2) name from url")); + assertThat(expected.getMessage(), containsString("Fail to get extension(org.apache.dubbo.common.extensionloader.ext2.Ext2) name from url")); } } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java similarity index 91% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java index 0b98dce4be..46d08358b9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Adaptive_UseJdkCompiler_Test.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader; +package org.apache.dubbo.common.extensionloader; -import com.alibaba.dubbo.common.compiler.support.AdaptiveCompiler; +import org.apache.dubbo.common.compiler.support.AdaptiveCompiler; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java similarity index 78% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java index a609f0f70e..137ae302c9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ExtensionLoader_Compatible_Test.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader; +package org.apache.dubbo.common.extensionloader; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt; -import com.alibaba.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl1; -import com.alibaba.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl2; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.compatible.CompatibleExt; +import org.apache.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl1; +import org.apache.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl2; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/NoSpiExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/NoSpiExt.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/NoSpiExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/NoSpiExt.java index 513c9fe9ef..6ec06b3e7d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/NoSpiExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/NoSpiExt.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader; +package org.apache.dubbo.common.extensionloader; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; /** * Has no SPI annotation diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/ActivateExt1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/ActivateExt1.java similarity index 89% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/ActivateExt1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/ActivateExt1.java index 81a7979079..cd53052a31 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/ActivateExt1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/ActivateExt1.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate; +package org.apache.dubbo.common.extensionloader.activate; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI("impl1") public interface ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java index 2639e39aba..41bd2cf2da 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ActivateExt1Impl1.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate.impl; +package org.apache.dubbo.common.extensionloader.activate.impl; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; @Activate(group = {"default_group"}) public class ActivateExt1Impl1 implements ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java index 8c68225790..a63072e707 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/GroupActivateExtImpl.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate.impl; +package org.apache.dubbo.common.extensionloader.activate.impl; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; @Activate(group = {"group1", "group2"}) public class GroupActivateExtImpl implements ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java index 4d43e93f8e..df3accb792 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl1.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate.impl; +package org.apache.dubbo.common.extensionloader.activate.impl; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; @Activate(order = 1, group = {"order"}) public class OrderActivateExtImpl1 implements ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java index 1f9cdd75b4..e844514554 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/OrderActivateExtImpl2.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate.impl; +package org.apache.dubbo.common.extensionloader.activate.impl; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; @Activate(order = 2, group = {"order"}) public class OrderActivateExtImpl2 implements ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java index 91874275c0..29394db3e6 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/activate/impl/ValueActivateExtImpl.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.activate.impl; +package org.apache.dubbo.common.extensionloader.activate.impl; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extensionloader.activate.ActivateExt1; @Activate(value = {"value"}, group = {"value"}) public class ValueActivateExtImpl implements ActivateExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java similarity index 82% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java index 09310009ed..062118448e 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/HasAdaptiveExt.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.adaptive; +package org.apache.dubbo.common.extensionloader.adaptive; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; @SPI public interface HasAdaptiveExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java index 15a9d063a4..52f5747f3c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExtImpl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.adaptive.impl; +package org.apache.dubbo.common.extensionloader.adaptive.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; public class HasAdaptiveExtImpl1 implements HasAdaptiveExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java index d3f64c914f..96b88cdd84 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/adaptive/impl/HasAdaptiveExt_ManualAdaptive.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.adaptive.impl; +package org.apache.dubbo.common.extensionloader.adaptive.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt; @Adaptive public class HasAdaptiveExt_ManualAdaptive implements HasAdaptiveExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/CompatibleExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/CompatibleExt.java similarity index 81% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/CompatibleExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/CompatibleExt.java index 2bf6889903..20fc98c588 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/CompatibleExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/CompatibleExt.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.compatible; +package org.apache.dubbo.common.extensionloader.compatible; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; @SPI("impl1") public interface CompatibleExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java index b23e789baa..b30a6fe08d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl1.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.compatible.impl; +package org.apache.dubbo.common.extensionloader.compatible.impl; -import com.alibaba.dubbo.common.Extension; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt; +import org.apache.dubbo.common.Extension; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.compatible.CompatibleExt; @Extension("impl1") public class CompatibleExtImpl1 implements CompatibleExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java index eb52bab81d..ccbf04e54b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/compatible/impl/CompatibleExtImpl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.compatible.impl; +package org.apache.dubbo.common.extensionloader.compatible.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.compatible.CompatibleExt; public class CompatibleExtImpl2 implements CompatibleExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/SimpleExt.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/SimpleExt.java index 1d5c263fe6..34267d96b7 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/SimpleExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/SimpleExt.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext1; +package org.apache.dubbo.common.extensionloader.ext1; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * Simple extension, has no wrapper diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java index f89336c9f9..182dbd0ce4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext1.impl; +package org.apache.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; public class SimpleExtImpl1 implements SimpleExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java index 7408e4613e..9882c39ee2 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext1.impl; +package org.apache.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; public class SimpleExtImpl2 implements SimpleExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java index b49cf93b45..4d987fe6a4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext1/impl/SimpleExtImpl3.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext1.impl; +package org.apache.dubbo.common.extensionloader.ext1.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; public class SimpleExtImpl3 implements SimpleExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/Ext2.java similarity index 81% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/Ext2.java index db6723e865..c9948c62fb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/Ext2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/Ext2.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext2; +package org.apache.dubbo.common.extensionloader.ext2; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * Has no default diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/UrlHolder.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/UrlHolder.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/UrlHolder.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/UrlHolder.java index 60f6b9dc08..56b832f5f0 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/UrlHolder.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/UrlHolder.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext2; +package org.apache.dubbo.common.extensionloader.ext2; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; public class UrlHolder { private Double Num; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java similarity index 80% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java index 932c0a7b31..6fa34a858b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl1.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext2.impl; +package org.apache.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext2.Ext2; +import org.apache.dubbo.common.extensionloader.ext2.UrlHolder; public class Ext2Impl1 implements Ext2 { public String echo(UrlHolder holder, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java similarity index 80% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java index 35dbee85a4..bfad56eb8c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl2.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext2.impl; +package org.apache.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext2.Ext2; +import org.apache.dubbo.common.extensionloader.ext2.UrlHolder; public class Ext2Impl2 implements Ext2 { public String echo(UrlHolder holder, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java similarity index 80% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java index 3e45d93140..952ec8c87a 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext2/impl/Ext2Impl3.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext2.impl; +package org.apache.dubbo.common.extensionloader.ext2.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext2.Ext2; -import com.alibaba.dubbo.common.extensionloader.ext2.UrlHolder; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext2.Ext2; +import org.apache.dubbo.common.extensionloader.ext2.UrlHolder; public class Ext2Impl3 implements Ext2 { public String echo(UrlHolder holder, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java index 71141efa11..efebec8a11 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/UseProtocolKeyExt.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext3; +package org.apache.dubbo.common.extensionloader.ext3; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; @SPI("impl1") public interface UseProtocolKeyExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java index 75c585b6f0..08516122f5 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext3.impl; +package org.apache.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; public class UseProtocolKeyExtImpl1 implements UseProtocolKeyExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java index 02300ed734..cbb8885b64 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext3.impl; +package org.apache.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; public class UseProtocolKeyExtImpl2 implements UseProtocolKeyExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java index 908657c5fb..b5474ab2f5 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext3/impl/UseProtocolKeyExtImpl3.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext3.impl; +package org.apache.dubbo.common.extensionloader.ext3.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt; public class UseProtocolKeyExtImpl3 implements UseProtocolKeyExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/NoUrlParamExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/NoUrlParamExt.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/NoUrlParamExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/NoUrlParamExt.java index da52ff429b..89cdeff91f 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/NoUrlParamExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/NoUrlParamExt.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext4; +package org.apache.dubbo.common.extensionloader.ext4; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java index 5d5456e1b3..c9aa0d8eae 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl1.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext4.impl; +package org.apache.dubbo.common.extensionloader.ext4.impl; -import com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt; +import org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java index 956c45224c..79adef0aa9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext4/impl/Ext4Impl2.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext4.impl; +package org.apache.dubbo.common.extensionloader.ext4.impl; -import com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt; +import org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java index 70972c4d6f..c6374c658c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/NoAdaptiveMethodExt.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext5; +package org.apache.dubbo.common.extensionloader.ext5; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.SPI; /** * No Adaptive Method!! diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java index f79feb0fa3..bdf7ab5c57 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext5.impl; +package org.apache.dubbo.common.extensionloader.ext5.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; public class Ext5Impl1 implements NoAdaptiveMethodExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java index 03d2b510e1..6f3dbd0ea5 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext5/impl/Ext5Impl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext5.impl; +package org.apache.dubbo.common.extensionloader.ext5.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt; public class Ext5Impl2 implements NoAdaptiveMethodExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Dao.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Dao.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Dao.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Dao.java index aa7c1f9e51..d47f6b1ef4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Dao.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Dao.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_inject; +package org.apache.dubbo.common.extensionloader.ext6_inject; public interface Dao { public void update(); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Ext6.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Ext6.java index 18dc276344..1ac0a8fc82 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/Ext6.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/Ext6.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_inject; +package org.apache.dubbo.common.extensionloader.ext6_inject; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * No default diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java index 93bd4d9f03..9a5287c6fe 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/DaoImpl.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; +package org.apache.dubbo.common.extensionloader.ext6_inject.impl; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Dao; +import org.apache.dubbo.common.extensionloader.ext6_inject.Dao; public class DaoImpl implements Dao { public void update() { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java similarity index 78% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java index 886cc18340..88e9e6ee29 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl1.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; +package org.apache.dubbo.common.extensionloader.ext6_inject.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Dao; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext1.SimpleExt; +import org.apache.dubbo.common.extensionloader.ext6_inject.Dao; +import org.apache.dubbo.common.extensionloader.ext6_inject.Ext6; import org.junit.Assert; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java index 84581f6383..5fd1844e12 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_inject/impl/Ext6Impl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_inject.impl; +package org.apache.dubbo.common.extensionloader.ext6_inject.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext6_inject.Ext6; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java index 7fbeb103bc..cf00736966 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/WrappedExt.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_wrap; +package org.apache.dubbo.common.extensionloader.ext6_wrap; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.SPI; /** * No Adaptive Method!! diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java index 98481a9f99..a0cf412020 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl; +package org.apache.dubbo.common.extensionloader.ext6_wrap.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt; public class Ext5Impl1 implements WrappedExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java index f054154fec..75a7a7b2d9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Impl2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl; +package org.apache.dubbo.common.extensionloader.ext6_wrap.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt; public class Ext5Impl2 implements WrappedExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java index 320ce134e1..929b9fd92d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl; +package org.apache.dubbo.common.extensionloader.ext6_wrap.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java index e86d50d7c7..ea96094233 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext6_wrap/impl/Ext5Wrapper2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl; +package org.apache.dubbo.common.extensionloader.ext6_wrap.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/InitErrorExt.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/InitErrorExt.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/InitErrorExt.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/InitErrorExt.java index 9ef4a55a57..5983803d4a 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/InitErrorExt.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/InitErrorExt.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext7; +package org.apache.dubbo.common.extensionloader.ext7; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * Test scenario for DUBBO-144: extension load failure when third-party dependency doesn't exist. If extension is not diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java index 37504a9c2b..a3a1c4d6f1 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7Impl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext7.impl; +package org.apache.dubbo.common.extensionloader.ext7.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext7.InitErrorExt; public class Ext7Impl implements InitErrorExt { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java index 04c4c4059d..f55a5a34ef 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext7/impl/Ext7InitErrorImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext7.impl; +package org.apache.dubbo.common.extensionloader.ext7.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext7.InitErrorExt; public class Ext7InitErrorImpl implements InitErrorExt { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt1.java similarity index 82% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt1.java index ea4bb6c745..9a501a223e 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt1.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add; +package org.apache.dubbo.common.extensionloader.ext8_add; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * show add extension pragmatically diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt2.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt2.java index c9baf397c4..54a99815e2 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt2.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add; +package org.apache.dubbo.common.extensionloader.ext8_add; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * show add extension pragmatically. use for test addAdaptive successful diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt3.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt3.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt3.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt3.java index edc9c85548..943c0fb82b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt3.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt3.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add; +package org.apache.dubbo.common.extensionloader.ext8_add; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * show add extension pragmatically. use for test replaceAdaptive success diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt4.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt4.java similarity index 83% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt4.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt4.java index 328fd17d68..3e35d3cbcd 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/AddExt4.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/AddExt4.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add; +package org.apache.dubbo.common.extensionloader.ext8_add; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * show add extension pragmatically. use for test replaceAdaptive fail diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java index e788b2f1d2..56e9b4fb9a 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1Impl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt1; public class AddExt1Impl1 implements AddExt1 { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java index 92aa9940bf..e68ce8446a 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdaptive.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt1; @Adaptive public class AddExt1_ManualAdaptive implements AddExt1 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java index 71bdd7530b..a145456d81 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt1; public class AddExt1_ManualAdd1 implements AddExt1 { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java index 4210386cf8..6b0e5762e1 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt1_ManualAdd2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt1; public class AddExt1_ManualAdd2 implements AddExt1 { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java similarity index 84% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java index 8dde63c417..0fabfcf307 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2Impl1.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt2; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt2; public class AddExt2Impl1 implements AddExt2 { public String echo(URL url, String s) { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java index 8cc5472cbe..5c0508f9e8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt2_ManualAdaptive.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt2; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt2; @Adaptive public class AddExt2_ManualAdaptive implements AddExt2 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java index d1b1f3f1ca..c946a9419f 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt3_ManualAdaptive.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt3; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt3; @Adaptive public class AddExt3_ManualAdaptive implements AddExt3 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java similarity index 79% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java index 3aa9c5eeb1..acb7f48491 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext8_add/impl/AddExt4_ManualAdaptive.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext8_add.impl; +package org.apache.dubbo.common.extensionloader.ext8_add.impl; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt4; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extensionloader.ext8_add.AddExt4; @Adaptive public class AddExt4_ManualAdaptive implements AddExt4 { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java similarity index 88% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java index 388e8f90a1..d5121ef0f2 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/Ext9Empty.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext9_empty; +package org.apache.dubbo.common.extensionloader.ext9_empty; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI public interface Ext9Empty { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java similarity index 86% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java index cc9dad1927..70eb8fb59c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/extensionloader/ext9_empty/impl/Ext9EmptyImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.extensionloader.ext9_empty.impl; +package org.apache.dubbo.common.extensionloader.ext9_empty.impl; -import com.alibaba.dubbo.common.extensionloader.ext9_empty.Ext9Empty; +import org.apache.dubbo.common.extensionloader.ext9_empty.Ext9Empty; public class Ext9EmptyImpl implements Ext9Empty { @Override diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/BytesTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/BytesTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/BytesTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/BytesTest.java index 83c5eb5689..a00f599f0e 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/BytesTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/BytesTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/StreamUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/StreamUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java index bf422c01eb..b4dc1b6182 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/StreamUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/StreamUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStreamTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStreamTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStreamTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStreamTest.java index 361caf807c..39ab9955e2 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayInputStreamTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayInputStreamTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java index 0227ec0d9e..f411ae908f 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeByteArrayOutputStreamTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringReaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringReaderTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringReaderTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringReaderTest.java index 1bafe191eb..2cf78d6a52 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringReaderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringReaderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringWriterTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringWriterTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java index c9f6b2eac8..4e423b73bb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/io/UnsafeStringWriterTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/io/UnsafeStringWriterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.io; +package org.apache.dubbo.common.io; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONReaderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONReaderTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONReaderTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONReaderTest.java index 72dde1de11..8607e56e43 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONReaderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONReaderTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; -import com.alibaba.dubbo.common.io.UnsafeStringReader; +import org.apache.dubbo.common.io.UnsafeStringReader; import junit.framework.TestCase; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java index 52aad493fc..21050e2a83 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONWriterTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONWriterTest.java similarity index 81% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONWriterTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONWriterTest.java index bd03125dff..9066c904ea 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/JSONWriterTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/JSONWriterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; import junit.framework.TestCase; @@ -35,15 +35,15 @@ public class JSONWriterTest extends TestCase { // write object. w.getBuffer().setLength(0); - writer.objectBegin().objectItem("type").valueString("com.alibaba.dubbo.TestService").objectItem("version").valueString("1.1.0").objectEnd(); - assertEquals(w.getBuffer().toString(), "{\"type\":\"com.alibaba.dubbo.TestService\",\"version\":\"1.1.0\"}"); + writer.objectBegin().objectItem("type").valueString("org.apache.dubbo.TestService").objectItem("version").valueString("1.1.0").objectEnd(); + assertEquals(w.getBuffer().toString(), "{\"type\":\"org.apache.dubbo.TestService\",\"version\":\"1.1.0\"}"); w.getBuffer().setLength(0); writer.objectBegin(); writer.objectItem("name").objectItem("displayName"); writer.objectItem("emptyList").arrayBegin().arrayEnd(); writer.objectItem("list").arrayBegin().valueNull().valueBoolean(false).valueInt(16).valueString("stri'''ng").arrayEnd(); - writer.objectItem("service").objectBegin().objectItem("type").valueString("com.alibaba.dubbo.TestService").objectItem("version").valueString("1.1.0").objectEnd(); + writer.objectItem("service").objectBegin().objectItem("type").valueString("org.apache.dubbo.TestService").objectItem("version").valueString("1.1.0").objectEnd(); writer.objectEnd(); } } \ No newline at end of file diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/MyException.java b/dubbo-common/src/test/java/org/apache/dubbo/common/json/MyException.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/json/MyException.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/json/MyException.java index 3e30c30f5a..3d2df874cb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/json/MyException.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/json/MyException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; public class MyException extends Exception { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerAdapterTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerAdapterTest.java similarity index 82% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerAdapterTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerAdapterTest.java index 5aff03a83c..17e53f80b4 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerAdapterTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerAdapterTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; -import com.alibaba.dubbo.common.logger.jcl.JclLogger; -import com.alibaba.dubbo.common.logger.jcl.JclLoggerAdapter; -import com.alibaba.dubbo.common.logger.jdk.JdkLogger; -import com.alibaba.dubbo.common.logger.jdk.JdkLoggerAdapter; -import com.alibaba.dubbo.common.logger.log4j.Log4jLogger; -import com.alibaba.dubbo.common.logger.log4j.Log4jLoggerAdapter; -import com.alibaba.dubbo.common.logger.slf4j.Slf4jLogger; -import com.alibaba.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; +import org.apache.dubbo.common.logger.jcl.JclLogger; +import org.apache.dubbo.common.logger.jcl.JclLoggerAdapter; +import org.apache.dubbo.common.logger.jdk.JdkLogger; +import org.apache.dubbo.common.logger.jdk.JdkLoggerAdapter; +import org.apache.dubbo.common.logger.log4j.Log4jLogger; +import org.apache.dubbo.common.logger.log4j.Log4jLoggerAdapter; +import org.apache.dubbo.common.logger.slf4j.Slf4jLogger; +import org.apache.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerFactoryTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerFactoryTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerFactoryTest.java index 65f6e4693a..1e718dd6d0 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerFactoryTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerTest.java similarity index 90% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerTest.java index 7e6cb41884..ed87b152a0 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/LoggerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/LoggerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger; +package org.apache.dubbo.common.logger; -import com.alibaba.dubbo.common.logger.jcl.JclLoggerAdapter; -import com.alibaba.dubbo.common.logger.jdk.JdkLoggerAdapter; -import com.alibaba.dubbo.common.logger.log4j.Log4jLoggerAdapter; -import com.alibaba.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; +import org.apache.dubbo.common.logger.jcl.JclLoggerAdapter; +import org.apache.dubbo.common.logger.jdk.JdkLoggerAdapter; +import org.apache.dubbo.common.logger.log4j.Log4jLoggerAdapter; +import org.apache.dubbo.common.logger.slf4j.Slf4jLoggerAdapter; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerTest.java index f0d79af0ad..ab1bae45cf 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/slf4j/Slf4jLoggerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/slf4j/Slf4jLoggerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.slf4j; +package org.apache.dubbo.common.logger.slf4j; import org.junit.Test; import org.slf4j.Marker; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/support/FailsafeLoggerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/support/FailsafeLoggerTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/support/FailsafeLoggerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/logger/support/FailsafeLoggerTest.java index 1b6cb42a45..61a72155bf 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/logger/support/FailsafeLoggerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/logger/support/FailsafeLoggerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.logger.support; +package org.apache.dubbo.common.logger.support; -import com.alibaba.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.Logger; import org.junit.Test; import static org.mockito.ArgumentMatchers.any; diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java new file mode 100644 index 0000000000..ddfc736e08 --- /dev/null +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java @@ -0,0 +1,21 @@ +/* + * 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 org.apache.dubbo.common.model; + +public enum AnimalEnum { + dog, cat, rat, cow, bull, horse; +} \ No newline at end of file diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizException.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/BizException.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizException.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/BizException.java index a4f57d37d1..51fd04b7b8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizException.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/BizException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizException extends RuntimeException { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java index a4e200b993..c3346ca7ef 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizExceptionNoDefaultConstructor extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/Person.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/Person.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java index 6383706cf7..5a551a7f36 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/Person.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.util.Arrays; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java index e7dd248678..d78c5928ea 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.io.Serializable; import java.util.Arrays; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Image.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Image.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java index 0d6a74a3d4..a59eff35be 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Image.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Image.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; public class Image implements java.io.Serializable { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Media.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Media.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java index 8a78f6d313..042a3a5273 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Media.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/Media.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java index 9664116a63..7991f50610 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java index 70bc793979..4ce79008fb 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java index dcc93cf8bd..38921670f9 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java index f1ff041e93..15f1238fe8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java similarity index 92% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java index b2bed2666e..727a155c70 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; public enum PersonStatus { ENABLED, diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java index f7da708364..41fd38a92d 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/model/person/Phone.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/StatusTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/status/StatusTest.java similarity index 94% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/status/StatusTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/status/StatusTest.java index bc8e531483..02b07f7de9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/StatusTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/status/StatusTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.status; +package org.apache.dubbo.common.status; import org.junit.Test; -import static com.alibaba.dubbo.common.status.Status.Level.OK; +import static org.apache.dubbo.common.status.Status.Level.OK; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isEmptyOrNullString; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/LoadStatusCheckerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/LoadStatusCheckerTest.java similarity index 87% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/LoadStatusCheckerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/status/support/LoadStatusCheckerTest.java index 121da3bb3b..7d30291dc6 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/LoadStatusCheckerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/LoadStatusCheckerTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.status.Status; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.status.Status; import org.junit.Test; import static org.hamcrest.Matchers.notNullValue; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/MemoryStatusCheckerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/MemoryStatusCheckerTest.java similarity index 81% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/MemoryStatusCheckerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/status/support/MemoryStatusCheckerTest.java index eb05b5cf94..249837cc59 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/MemoryStatusCheckerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/MemoryStatusCheckerTest.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.status.Status; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.status.Status; import org.junit.Test; -import static com.alibaba.dubbo.common.status.Status.Level.OK; -import static com.alibaba.dubbo.common.status.Status.Level.WARN; +import static org.apache.dubbo.common.status.Status.Level.OK; +import static org.apache.dubbo.common.status.Status.Level.WARN; import static org.hamcrest.CoreMatchers.anyOf; import static org.hamcrest.Matchers.is; import static org.junit.Assert.assertThat; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/StatusUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/StatusUtilsTest.java similarity index 96% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/StatusUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/status/support/StatusUtilsTest.java index 83f5e4531c..43347238ab 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/status/support/StatusUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/status/support/StatusUtilsTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.status.support; +package org.apache.dubbo.common.status.support; -import com.alibaba.dubbo.common.status.Status; +import org.apache.dubbo.common.status.Status; import org.junit.Test; import java.util.HashMap; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/store/support/SimpleDataStoreTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/store/support/SimpleDataStoreTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/store/support/SimpleDataStoreTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/store/support/SimpleDataStoreTest.java index 0b81a9ad67..ab2b308d67 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/store/support/SimpleDataStoreTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/store/support/SimpleDataStoreTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.store.support; +package org.apache.dubbo.common.store.support; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java index 401906ee32..631d12152b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/InternalThreadLocalTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/InternalThreadLocalTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java similarity index 96% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java index 5d80023c5d..f99b985c30 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadlocal/NamedInternalThreadFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadlocal; +package org.apache.dubbo.common.threadlocal; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java similarity index 91% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java index 27d616f6ee..5480015655 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/AbortPolicyWithReportTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support; +package org.apache.dubbo.common.threadpool.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import org.junit.Test; import java.util.concurrent.Executors; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java similarity index 90% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java index 083af0f263..1bc883e504 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/cached/CachedThreadPoolTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.cached; +package org.apache.dubbo.common.threadpool.support.cached; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.InternalThread; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.InternalThread; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java similarity index 93% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java index 67b5882f2b..87ef727f81 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolExecutorTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.utils.NamedThreadFactory; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java similarity index 90% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java index 8d3e939601..2861841fcc 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/EagerThreadPoolTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.InternalThread; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.InternalThread; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueueTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueueTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueueTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueueTest.java index 2f70398633..d20fb44c8c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/eager/TaskQueueTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/eager/TaskQueueTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.eager; +package org.apache.dubbo.common.threadpool.support.eager; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java similarity index 88% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java index 9d285f6511..f416300a1c 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/fixed/FixedThreadPoolTest.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.fixed; +package org.apache.dubbo.common.threadpool.support.fixed; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.InternalThread; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; -import com.alibaba.dubbo.common.threadpool.support.limited.LimitedThreadPool; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.InternalThread; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.threadpool.support.limited.LimitedThreadPool; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java similarity index 90% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java index d58da069b4..9f27f33cfe 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/threadpool/support/limited/LimitedThreadPoolTest.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.threadpool.support.limited; +package org.apache.dubbo.common.threadpool.support.limited; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.InternalThread; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.InternalThread; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AssertTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/AssertTest.java similarity index 92% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AssertTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/AssertTest.java index ec390b5ad8..fdad326dc9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AssertTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/AssertTest.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; -import static com.alibaba.dubbo.common.utils.Assert.notNull; +import static org.apache.dubbo.common.utils.Assert.notNull; public class AssertTest { @Test(expected = IllegalArgumentException.class) diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AtomicPositiveIntegerTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/AtomicPositiveIntegerTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AtomicPositiveIntegerTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/AtomicPositiveIntegerTest.java index 32d014e50d..c7086006ce 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/AtomicPositiveIntegerTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/AtomicPositiveIntegerTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ClassHelperTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ClassHelperTest.java similarity index 92% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ClassHelperTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/ClassHelperTest.java index 834fcc1ad8..1ccd15339b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ClassHelperTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ClassHelperTest.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; import org.mockito.Mockito; -import static com.alibaba.dubbo.common.utils.ClassHelper.forName; -import static com.alibaba.dubbo.common.utils.ClassHelper.getCallerClassLoader; -import static com.alibaba.dubbo.common.utils.ClassHelper.getClassLoader; -import static com.alibaba.dubbo.common.utils.ClassHelper.resolvePrimitiveClassName; -import static com.alibaba.dubbo.common.utils.ClassHelper.toShortString; +import static org.apache.dubbo.common.utils.ClassHelper.forName; +import static org.apache.dubbo.common.utils.ClassHelper.getCallerClassLoader; +import static org.apache.dubbo.common.utils.ClassHelper.getClassLoader; +import static org.apache.dubbo.common.utils.ClassHelper.resolvePrimitiveClassName; +import static org.apache.dubbo.common.utils.ClassHelper.toShortString; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.sameInstance; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CollectionUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CollectionUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java index 996817e5cf..58a3212a8d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CollectionUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CollectionUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; @@ -26,10 +26,10 @@ import java.util.HashSet; import java.util.List; import java.util.Map; -import static com.alibaba.dubbo.common.utils.CollectionUtils.isEmpty; -import static com.alibaba.dubbo.common.utils.CollectionUtils.isNotEmpty; -import static com.alibaba.dubbo.common.utils.CollectionUtils.toMap; -import static com.alibaba.dubbo.common.utils.CollectionUtils.toStringMap; +import static org.apache.dubbo.common.utils.CollectionUtils.isEmpty; +import static org.apache.dubbo.common.utils.CollectionUtils.isNotEmpty; +import static org.apache.dubbo.common.utils.CollectionUtils.toMap; +import static org.apache.dubbo.common.utils.CollectionUtils.toStringMap; import static java.util.Collections.emptyList; import static java.util.Collections.singleton; import static org.hamcrest.Matchers.equalTo; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java index 4b230e9c9e..8c51e0214d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/CompatibleTypeUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/CompatibleTypeUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java similarity index 89% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java index b5e20165f1..a540d64ec7 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ConfigUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ConfigUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.threadpool.ThreadPool; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -216,13 +216,13 @@ public class ConfigUtilsTest { @Test public void testLoadPropertiesOneFileNotRootPath() throws Exception { - Properties p = ConfigUtils.loadProperties("META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool", false); + Properties p = ConfigUtils.loadProperties("META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool", false); Properties expected = new Properties(); - expected.put("fixed", "com.alibaba.dubbo.common.threadpool.support.fixed.FixedThreadPool"); - expected.put("cached", "com.alibaba.dubbo.common.threadpool.support.cached.CachedThreadPool"); - expected.put("limited", "com.alibaba.dubbo.common.threadpool.support.limited.LimitedThreadPool"); - expected.put("eager", "com.alibaba.dubbo.common.threadpool.support.eager.EagerThreadPool"); + expected.put("fixed", "org.apache.dubbo.common.threadpool.support.fixed.FixedThreadPool"); + expected.put("cached", "org.apache.dubbo.common.threadpool.support.cached.CachedThreadPool"); + expected.put("limited", "org.apache.dubbo.common.threadpool.support.limited.LimitedThreadPool"); + expected.put("eager", "org.apache.dubbo.common.threadpool.support.eager.EagerThreadPool"); assertEquals(expected, p); } @@ -232,21 +232,21 @@ public class ConfigUtilsTest { @Test public void testLoadPropertiesMultiFileNotRootPathException() throws Exception { try { - ConfigUtils.loadProperties("META-INF/services/com.alibaba.dubbo.common.status.StatusChecker", false); + ConfigUtils.loadProperties("META-INF/services/org.apache.dubbo.common.status.StatusChecker", false); Assert.fail(); } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("only 1 META-INF/services/com.alibaba.dubbo.common.status.StatusChecker file is expected, but 2 dubbo.properties files found on class path:")); + assertThat(expected.getMessage(), containsString("only 1 META-INF/services/org.apache.dubbo.common.status.StatusChecker file is expected, but 2 dubbo.properties files found on class path:")); } } @Test public void testLoadPropertiesMultiFileNotRootPath() throws Exception { - Properties p = ConfigUtils.loadProperties("META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker", true); + Properties p = ConfigUtils.loadProperties("META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker", true); Properties expected = new Properties(); - expected.put("memory", "com.alibaba.dubbo.common.status.support.MemoryStatusChecker"); - expected.put("load", "com.alibaba.dubbo.common.status.support.LoadStatusChecker"); + expected.put("memory", "org.apache.dubbo.common.status.support.MemoryStatusChecker"); + expected.put("load", "org.apache.dubbo.common.status.support.LoadStatusChecker"); expected.put("aa", "12"); assertEquals(expected, p); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/DubboAppenderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DubboAppenderTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/DubboAppenderTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/DubboAppenderTest.java index 3abede3b91..93cfc7eb3d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/DubboAppenderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/DubboAppenderTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.utils.DubboAppender; -import com.alibaba.dubbo.common.utils.Log; +import org.apache.dubbo.common.utils.DubboAppender; +import org.apache.dubbo.common.utils.Log; import org.apache.log4j.Category; import org.apache.log4j.Level; import org.apache.log4j.spi.LoggingEvent; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ExecutorUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ExecutorUtilTest.java similarity index 96% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ExecutorUtilTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/ExecutorUtilTest.java index 4fc1984bf5..9ffa1c35ab 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ExecutorUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ExecutorUtilTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/HolderTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/HolderTest.java similarity index 96% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/HolderTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/HolderTest.java index 1fba4ba9dc..1332654de8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/HolderTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/HolderTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/IOUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/IOUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java index f465ed1e55..e964b3443d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/IOUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/IOUtilsTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.After; import org.junit.Before; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/JVMUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/JVMUtilTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/JVMUtilTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/JVMUtilTest.java index ca90930ebe..d980c26335 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/JVMUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/JVMUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; public class JVMUtilTest { } diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LRUCacheTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/LRUCacheTest.java index 040344f673..d088e0c136 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LRUCacheTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LRUCacheTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogHelperTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogHelperTest.java index b3ba78321b..6a513c8d4d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogHelperTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogHelperTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.Logger; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogTest.java index 3901a93baf..3c77ca77fc 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.apache.log4j.Level; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogUtilTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogUtilTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogUtilTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogUtilTest.java index a4f7b15ab9..c1c36a7172 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/LogUtilTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/LogUtilTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.apache.log4j.Level; import org.junit.After; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/MyEnum.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MyEnum.java similarity index 92% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/MyEnum.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/MyEnum.java index 21702ae4e8..8a6649a949 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/MyEnum.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/MyEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; /** * MyEnum diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NamedThreadFactoryTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/NamedThreadFactoryTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NamedThreadFactoryTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/NamedThreadFactoryTest.java index 74d28e64cf..f0253543d3 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NamedThreadFactoryTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/NamedThreadFactoryTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NetUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java similarity index 96% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NetUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java index ea8739e421..e998df71eb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/NetUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/NetUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ParametersTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ParametersTest.java similarity index 85% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ParametersTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/ParametersTest.java index 2593d83c08..9d5fc05533 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ParametersTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ParametersTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import junit.framework.TestCase; @@ -22,13 +22,13 @@ import java.util.HashMap; import java.util.Map; public class ParametersTest extends TestCase { - final String ServiceName = "com.alibaba.dubbo.rpc.service.GenericService"; + final String ServiceName = "org.apache.dubbo.rpc.service.GenericService"; final String ServiceVersion = "1.0.15"; final String LoadBalance = "lcr"; public void testMap2Parameters() throws Exception { Map map = new HashMap(); - map.put("name", "com.alibaba.dubbo.rpc.service.GenericService"); + map.put("name", "org.apache.dubbo.rpc.service.GenericService"); map.put("version", "1.0.15"); map.put("lb", "lcr"); map.put("max.active", "500"); @@ -38,7 +38,7 @@ public class ParametersTest extends TestCase { } public void testString2Parameters() throws Exception { - String qs = "name=com.alibaba.dubbo.rpc.service.GenericService&version=1.0.15&lb=lcr"; + String qs = "name=org.apache.dubbo.rpc.service.GenericService&version=1.0.15&lb=lcr"; Map map = StringUtils.parseQueryString(qs); assertEquals(map.get("name"), ServiceName); assertEquals(map.get("version"), ServiceVersion); diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java similarity index 95% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java index 6984c4b02d..2feda7e3dd 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/PojoUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/PojoUtilsTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.model.Person; -import com.alibaba.dubbo.common.model.SerializablePerson; -import com.alibaba.dubbo.common.model.person.BigPerson; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonInfo; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.model.Person; +import org.apache.dubbo.common.model.SerializablePerson; +import org.apache.dubbo.common.model.person.BigPerson; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonInfo; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ReflectUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ReflectUtilsTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ReflectUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/ReflectUtilsTest.java index 88daeb3e07..ddca7ac6a8 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/ReflectUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/ReflectUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StackTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/StackTest.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StackTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/StackTest.java index a827a201b2..921d217572 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StackTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/StackTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StringUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/StringUtilsTest.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StringUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/StringUtilsTest.java index 56f1a980e2..fa95bfb834 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/StringUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/StringUtilsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java similarity index 97% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java index bbe5039ffe..bdb2a9d94b 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/utils/UrlUtilsTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/utils/UrlUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.utils; +package org.apache.dubbo.common.utils; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import org.junit.Test; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/version/VersionTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java similarity index 94% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/version/VersionTest.java rename to dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java index 139216b095..d03e69855e 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/version/VersionTest.java +++ b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.version; +package org.apache.dubbo.common.version; -import com.alibaba.dubbo.common.Version; +import org.apache.dubbo.common.Version; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 deleted file mode 100644 index 8ff89345cb..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 +++ /dev/null @@ -1,4 +0,0 @@ -group=com.alibaba.dubbo.common.extensionloader.activate.impl.GroupActivateExtImpl -value=com.alibaba.dubbo.common.extensionloader.activate.impl.ValueActivateExtImpl -order1=com.alibaba.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl1 -order2=com.alibaba.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt deleted file mode 100644 index c700dbd7c2..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.adaptive.HasAdaptiveExt +++ /dev/null @@ -1,2 +0,0 @@ -adaptive=com.alibaba.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExt_ManualAdaptive -impl1=com.alibaba.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExtImpl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt deleted file mode 100644 index 9f176b744c..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.compatible.CompatibleExt +++ /dev/null @@ -1,2 +0,0 @@ -com.alibaba.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl1 -impl2=com.alibaba.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt deleted file mode 100644 index f91b958af6..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext1.SimpleExt +++ /dev/null @@ -1,4 +0,0 @@ -# Comment 1 -impl1=com.alibaba.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl1#Hello World -impl2=com.alibaba.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl2 # Comment 2 - impl3=com.alibaba.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl3 # with head space \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 deleted file mode 100644 index e275f40c54..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext2.Ext2 +++ /dev/null @@ -1,3 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl2 -impl3=com.alibaba.dubbo.common.extensionloader.ext2.impl.Ext2Impl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt deleted file mode 100644 index 08dc3d7296..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext3.UseProtocolKeyExt +++ /dev/null @@ -1,3 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl2 -impl3=com.alibaba.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt deleted file mode 100644 index 97aa3838b8..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext4.NoUrlParamExt +++ /dev/null @@ -1,2 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext4.impl.Ext4Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt deleted file mode 100644 index a416f9d753..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt +++ /dev/null @@ -1,2 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext5.impl.Ext5Impl2 diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 deleted file mode 100644 index 885aef5227..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_inject.Ext6 +++ /dev/null @@ -1,2 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt deleted file mode 100644 index e0897cd99f..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext6_wrap.WrappedExt +++ /dev/null @@ -1,4 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Impl1 -impl2=com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Impl2 -wrapper1=com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper1 -wrapper2=com.alibaba.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt deleted file mode 100644 index 549094e3bc..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext7.InitErrorExt +++ /dev/null @@ -1,2 +0,0 @@ -error=com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7InitErrorImpl -ok=com.alibaba.dubbo.common.extensionloader.ext7.impl.Ext7Impl diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1 deleted file mode 100644 index 02ee0c0f5c..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext8_add.AddExt1 +++ /dev/null @@ -1 +0,0 @@ -impl1=com.alibaba.dubbo.common.extensionloader.ext8_add.impl.AddExt1Impl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter b/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter deleted file mode 100644 index 9f11f5048a..0000000000 --- a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter +++ /dev/null @@ -1 +0,0 @@ -slf4j=com.alibaba.dubbo.common.logger.slf4j.Slf4jLoggerAdapter \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 new file mode 100644 index 0000000000..855cecd451 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 @@ -0,0 +1,4 @@ +group=org.apache.dubbo.common.extensionloader.activate.impl.GroupActivateExtImpl +value=org.apache.dubbo.common.extensionloader.activate.impl.ValueActivateExtImpl +order1=org.apache.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl1 +order2=org.apache.dubbo.common.extensionloader.activate.impl.OrderActivateExtImpl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt new file mode 100644 index 0000000000..ab02a908ae --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.adaptive.HasAdaptiveExt @@ -0,0 +1,2 @@ +adaptive=org.apache.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExt_ManualAdaptive +impl1=org.apache.dubbo.common.extensionloader.adaptive.impl.HasAdaptiveExtImpl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.compatible.CompatibleExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.compatible.CompatibleExt new file mode 100644 index 0000000000..8d7687ec60 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.compatible.CompatibleExt @@ -0,0 +1,2 @@ +org.apache.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl1 +impl2=org.apache.dubbo.common.extensionloader.compatible.impl.CompatibleExtImpl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext1.SimpleExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext1.SimpleExt new file mode 100644 index 0000000000..4814121119 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext1.SimpleExt @@ -0,0 +1,4 @@ +# Comment 1 +impl1=org.apache.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl1#Hello World +impl2=org.apache.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl2 # Comment 2 + impl3=org.apache.dubbo.common.extensionloader.ext1.impl.SimpleExtImpl3 # with head space \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext2.Ext2 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext2.Ext2 new file mode 100644 index 0000000000..510089fe94 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext2.Ext2 @@ -0,0 +1,3 @@ +impl1=org.apache.dubbo.common.extensionloader.ext2.impl.Ext2Impl1 +impl2=org.apache.dubbo.common.extensionloader.ext2.impl.Ext2Impl2 +impl3=org.apache.dubbo.common.extensionloader.ext2.impl.Ext2Impl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt new file mode 100644 index 0000000000..b4a2849524 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext3.UseProtocolKeyExt @@ -0,0 +1,3 @@ +impl1=org.apache.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl1 +impl2=org.apache.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl2 +impl3=org.apache.dubbo.common.extensionloader.ext3.impl.UseProtocolKeyExtImpl3 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt new file mode 100644 index 0000000000..ccd55fecaa --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext4.NoUrlParamExt @@ -0,0 +1,2 @@ +impl1=org.apache.dubbo.common.extensionloader.ext4.impl.Ext4Impl1 +impl2=org.apache.dubbo.common.extensionloader.ext4.impl.Ext4Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt new file mode 100644 index 0000000000..f03dd45e79 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext5.NoAdaptiveMethodExt @@ -0,0 +1,2 @@ +impl1=org.apache.dubbo.common.extensionloader.ext5.impl.Ext5Impl1 +impl2=org.apache.dubbo.common.extensionloader.ext5.impl.Ext5Impl2 diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_inject.Ext6 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_inject.Ext6 new file mode 100644 index 0000000000..6c077ce3cd --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_inject.Ext6 @@ -0,0 +1,2 @@ +impl1=org.apache.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl1 +impl2=org.apache.dubbo.common.extensionloader.ext6_inject.impl.Ext6Impl2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt new file mode 100644 index 0000000000..8a859a17e9 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext6_wrap.WrappedExt @@ -0,0 +1,4 @@ +impl1=org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Impl1 +impl2=org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Impl2 +wrapper1=org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper1 +wrapper2=org.apache.dubbo.common.extensionloader.ext6_wrap.impl.Ext5Wrapper2 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext7.InitErrorExt b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext7.InitErrorExt new file mode 100644 index 0000000000..99af6afa5d --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext7.InitErrorExt @@ -0,0 +1,2 @@ +error=org.apache.dubbo.common.extensionloader.ext7.impl.Ext7InitErrorImpl +ok=org.apache.dubbo.common.extensionloader.ext7.impl.Ext7Impl diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext8_add.AddExt1 b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext8_add.AddExt1 new file mode 100644 index 0000000000..6187d33a3c --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext8_add.AddExt1 @@ -0,0 +1 @@ +impl1=org.apache.dubbo.common.extensionloader.ext8_add.impl.AddExt1Impl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext9_empty.Ext9Empty b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext9_empty.Ext9Empty similarity index 100% rename from dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.extensionloader.ext9_empty.Ext9Empty rename to dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.extensionloader.ext9_empty.Ext9Empty diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter new file mode 100644 index 0000000000..a1db7887c4 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter @@ -0,0 +1 @@ +slf4j=org.apache.dubbo.common.logger.slf4j.Slf4jLoggerAdapter \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker similarity index 100% rename from dubbo-common/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker rename to dubbo-common/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker diff --git a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 b/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 deleted file mode 100644 index 2e16c111ac..0000000000 --- a/dubbo-common/src/test/resources/META-INF/services/com.alibaba.dubbo.common.extensionloader.activate.ActivateExt1 +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.dubbo.common.extensionloader.activate.impl.ActivateExt1Impl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/META-INF/services/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 b/dubbo-common/src/test/resources/META-INF/services/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 new file mode 100644 index 0000000000..8613051541 --- /dev/null +++ b/dubbo-common/src/test/resources/META-INF/services/org.apache.dubbo.common.extensionloader.activate.ActivateExt1 @@ -0,0 +1 @@ +org.apache.dubbo.common.extensionloader.activate.impl.ActivateExt1Impl1 \ No newline at end of file diff --git a/dubbo-common/src/test/resources/json.flex b/dubbo-common/src/test/resources/json.flex index c6d4015aaf..fdf19d228c 100644 --- a/dubbo-common/src/test/resources/json.flex +++ b/dubbo-common/src/test/resources/json.flex @@ -1,4 +1,4 @@ -package com.alibaba.dubbo.common.json; +package org.apache.dubbo.common.json; %% %{ diff --git a/dubbo-common/src/test/resources/log4j.xml b/dubbo-common/src/test/resources/log4j.xml index 9f18a809b6..f5da181b5e 100644 --- a/dubbo-common/src/test/resources/log4j.xml +++ b/dubbo-common/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-common/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc b/dubbo-common/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc similarity index 100% rename from dubbo-common/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc rename to dubbo-common/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java index ffc62d5008..a4b037b62a 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractConfig.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.CollectionUtils; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.config.support.Parameter; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java index 168bb10d2e..f27d1df5d9 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractInterfaceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractInterfaceConfig.java @@ -14,27 +14,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.monitor.MonitorFactory; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.support.MockInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.support.MockInvoker; import java.util.ArrayList; import java.util.HashMap; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java index 266c5db867..a4acce86c9 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractMethodConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractMethodConfig.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.Map; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractReferenceConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java index f5ebd6bfa6..08f3ad5e97 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractReferenceConfig.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.support.ProtocolUtils; /** * AbstractConsumerConfig * * @export - * @see com.alibaba.dubbo.config.ReferenceConfig + * @see org.apache.dubbo.config.ReferenceConfig */ public abstract class AbstractReferenceConfig extends AbstractInterfaceConfig { diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java index 68903988da..f23341fff1 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/AbstractServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/AbstractServiceConfig.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.rpc.ExporterListener; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.rpc.ExporterListener; import java.util.Arrays; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java index 9238a11508..a3d46a0895 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ApplicationConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ApplicationConfig.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.compiler.support.AdaptiveCompiler; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.compiler.support.AdaptiveCompiler; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.support.Parameter; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ArgumentConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ArgumentConfig.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ArgumentConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ArgumentConfig.java index e752726a0c..bdb80de28c 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ArgumentConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ArgumentConfig.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.config.support.Parameter; import java.io.Serializable; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ConsumerConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConsumerConfig.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ConsumerConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConsumerConfig.java index fcf96deaa5..812d676f69 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ConsumerConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ConsumerConfig.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; /** * ConsumerConfig diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/DubboShutdownHook.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java similarity index 90% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/DubboShutdownHook.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java index 0da42da8c7..90ed2376cd 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/DubboShutdownHook.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/DubboShutdownHook.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; -import com.alibaba.dubbo.rpc.Protocol; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.rpc.Protocol; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MethodConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MethodConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java index 28230fd9e4..ac00b9428a 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MethodConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MethodConfig.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.support.Parameter; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ModuleConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ModuleConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java index a4e0ee9801..622817d288 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ModuleConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ModuleConfig.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.config.support.Parameter; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java index 835daedabc..55155afb55 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/MonitorConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/MonitorConfig.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.config.support.Parameter; import java.util.Map; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java similarity index 90% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java index b901beddd9..c2e4210181 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProtocolConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProtocolConfig.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.Dispatcher; -import com.alibaba.dubbo.remoting.Transporter; -import com.alibaba.dubbo.remoting.exchange.Exchanger; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.rpc.Protocol; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Dispatcher; +import org.apache.dubbo.remoting.Transporter; +import org.apache.dubbo.remoting.exchange.Exchanger; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.rpc.Protocol; import java.util.Map; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProviderConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java similarity index 89% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProviderConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java index 991ec53a8e..7d69395ad6 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ProviderConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ProviderConfig.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.remoting.Dispatcher; -import com.alibaba.dubbo.remoting.Transporter; -import com.alibaba.dubbo.remoting.exchange.Exchanger; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.remoting.Dispatcher; +import org.apache.dubbo.remoting.Transporter; +import org.apache.dubbo.remoting.exchange.Exchanger; +import org.apache.dubbo.remoting.telnet.TelnetHandler; import java.util.Arrays; @@ -31,8 +31,8 @@ import java.util.Arrays; * ProviderConfig * * @export - * @see com.alibaba.dubbo.config.ProtocolConfig - * @see com.alibaba.dubbo.config.ServiceConfig + * @see org.apache.dubbo.config.ProtocolConfig + * @see org.apache.dubbo.config.ServiceConfig */ public class ProviderConfig extends AbstractServiceConfig { diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java index 9f9bc76312..da86ea0017 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java @@ -14,33 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.config.AsyncFor; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.model.ApplicationModel; -import com.alibaba.dubbo.config.model.ConsumerModel; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.StaticContext; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.cluster.support.AvailableCluster; -import com.alibaba.dubbo.rpc.cluster.support.ClusterUtils; -import com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol; -import com.alibaba.dubbo.rpc.service.GenericService; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.config.AsyncFor; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.model.ApplicationModel; +import org.apache.dubbo.config.model.ConsumerModel; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.StaticContext; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.cluster.support.AvailableCluster; +import org.apache.dubbo.rpc.cluster.support.ClusterUtils; +import org.apache.dubbo.rpc.protocol.injvm.InjvmProtocol; +import org.apache.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.io.File; import java.io.FileInputStream; @@ -54,7 +54,7 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidLocalHost; +import static org.apache.dubbo.common.utils.NetUtils.isInvalidLocalHost; /** * ReferenceConfig diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/RegistryConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/RegistryConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java index e5684f38be..a9a8145e29 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/RegistryConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/RegistryConfig.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.support.Parameter; import java.util.Map; @@ -146,7 +146,7 @@ public class RegistryConfig extends AbstractConfig { /** * @return wait - * @see com.alibaba.dubbo.config.ProviderConfig#getWait() + * @see org.apache.dubbo.config.ProviderConfig#getWait() * @deprecated */ @Deprecated @@ -156,7 +156,7 @@ public class RegistryConfig extends AbstractConfig { /** * @param wait - * @see com.alibaba.dubbo.config.ProviderConfig#setWait(Integer) + * @see org.apache.dubbo.config.ProviderConfig#setWait(Integer) * @deprecated */ @Deprecated diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java index ec6dcd982c..099c28350e 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/ServiceConfig.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ServiceConfig.java @@ -14,30 +14,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ClassHelper; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.invoker.DelegateProviderMetaDataInvoker; -import com.alibaba.dubbo.config.model.ApplicationModel; -import com.alibaba.dubbo.config.model.ProviderModel; -import com.alibaba.dubbo.config.support.Parameter; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.ServiceClassHolder; -import com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory; -import com.alibaba.dubbo.rpc.service.GenericService; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ClassHelper; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.invoker.DelegateProviderMetaDataInvoker; +import org.apache.dubbo.config.model.ApplicationModel; +import org.apache.dubbo.config.model.ProviderModel; +import org.apache.dubbo.config.support.Parameter; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.ServiceClassHolder; +import org.apache.dubbo.rpc.cluster.ConfiguratorFactory; +import org.apache.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.lang.reflect.Method; import java.net.InetAddress; @@ -56,11 +56,11 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import static com.alibaba.dubbo.common.utils.NetUtils.LOCALHOST; -import static com.alibaba.dubbo.common.utils.NetUtils.getAvailablePort; -import static com.alibaba.dubbo.common.utils.NetUtils.getLocalHost; -import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidLocalHost; -import static com.alibaba.dubbo.common.utils.NetUtils.isInvalidPort; +import static org.apache.dubbo.common.utils.NetUtils.LOCALHOST; +import static org.apache.dubbo.common.utils.NetUtils.getAvailablePort; +import static org.apache.dubbo.common.utils.NetUtils.getLocalHost; +import static org.apache.dubbo.common.utils.NetUtils.isInvalidLocalHost; +import static org.apache.dubbo.common.utils.NetUtils.isInvalidPort; /** * ServiceConfig diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java index 27cec649d7..2dc164dbad 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Reference.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Reference.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.annotation; +package org.apache.dubbo.config.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Service.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Service.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Service.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Service.java index 322bce37a0..bff300e0d4 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/annotation/Service.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/annotation/Service.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.annotation; +package org.apache.dubbo.config.annotation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java similarity index 85% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java index 0157f4c74e..8bf96b3f49 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvoker.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.invoker; +package org.apache.dubbo.config.invoker; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; public class DelegateProviderMetaDataInvoker implements Invoker { protected final Invoker invoker; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ApplicationModel.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ApplicationModel.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ApplicationModel.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ApplicationModel.java index 47160291ff..d728fb441f 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ApplicationModel.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ApplicationModel.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.model; +package org.apache.dubbo.config.model; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.rpc.Invoker; import java.util.ArrayList; import java.util.Collections; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerMethodModel.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerMethodModel.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerMethodModel.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerMethodModel.java index c325284712..6a476027f4 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerMethodModel.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerMethodModel.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.model; +package org.apache.dubbo.config.model; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.ReferenceConfig; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.ReferenceConfig; import java.lang.reflect.Method; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerModel.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerModel.java similarity index 96% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerModel.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerModel.java index 776d903a4b..57d6086599 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ConsumerModel.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ConsumerModel.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.model; +package org.apache.dubbo.config.model; -import com.alibaba.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.ReferenceConfig; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderMethodModel.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderMethodModel.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderMethodModel.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderMethodModel.java index 524718d3dc..24ba3e61ae 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderMethodModel.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderMethodModel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.model; +package org.apache.dubbo.config.model; import java.lang.reflect.Method; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderModel.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderModel.java similarity index 97% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderModel.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderModel.java index 1dbe988f39..2519b704d5 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/model/ProviderModel.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/model/ProviderModel.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.model; +package org.apache.dubbo.config.model; -import com.alibaba.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.ServiceConfig; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/support/Parameter.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/support/Parameter.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java index 9a392d305e..0183a228a9 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/support/Parameter.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/support/Parameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.support; +package org.apache.dubbo.config.support; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/utils/ReferenceConfigCache.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java similarity index 96% rename from dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/utils/ReferenceConfigCache.java rename to dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java index ece1ddc367..d387432cc9 100644 --- a/dubbo-config/dubbo-config-api/src/main/java/com/alibaba/dubbo/config/utils/ReferenceConfigCache.java +++ b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/utils/ReferenceConfigCache.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.utils; +package org.apache.dubbo.config.utils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.config.ReferenceConfig; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.config.ReferenceConfig; import java.util.HashSet; import java.util.Set; @@ -37,7 +37,7 @@ public class ReferenceConfigCache { /** * Create the key with the Group, Interface and version attribute of {@link ReferenceConfig}. *

    - * key example: group1/com.alibaba.foo.FooService:1.0.0. + * key example: group1/org.apache.dubbo.foo.FooService:1.0.0. */ public static final KeyGenerator DEFAULT_KEY_GENERATOR = new KeyGenerator() { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java index 5366b90910..60b33df390 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractConfigTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.config.api.Greeting; -import com.alibaba.dubbo.config.support.Parameter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.config.api.Greeting; +import org.apache.dubbo.config.support.Parameter; import junit.framework.TestCase; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractInterfaceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractInterfaceConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java index f34c31ffbe..e42aa4ae5f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractInterfaceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractInterfaceConfigTest.java @@ -14,31 +14,35 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.config.api.Greeting; -import com.alibaba.dubbo.config.mock.GreetingLocal1; -import com.alibaba.dubbo.config.mock.GreetingLocal2; -import com.alibaba.dubbo.config.mock.GreetingLocal3; -import com.alibaba.dubbo.config.mock.GreetingMock1; -import com.alibaba.dubbo.config.mock.GreetingMock2; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.registry.RegistryService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.IOUtils; +import org.apache.dubbo.config.api.Greeting; +import org.apache.dubbo.config.mock.GreetingLocal1; +import org.apache.dubbo.config.mock.GreetingLocal2; +import org.apache.dubbo.config.mock.GreetingLocal3; +import org.apache.dubbo.config.mock.GreetingMock1; +import org.apache.dubbo.config.mock.GreetingMock2; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.registry.RegistryService; import junit.framework.TestCase; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.ClassRule; +import org.junit.Ignore; import org.junit.Test; import org.junit.rules.TemporaryFolder; import java.io.BufferedOutputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; +import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Properties; @@ -81,12 +85,19 @@ public class AbstractInterfaceConfigTest { public void checkApplication1() throws Exception { try { ConfigUtils.setProperties(null); + System.clearProperty(Constants.SHUTDOWN_WAIT_KEY); + System.clearProperty(Constants.SHUTDOWN_WAIT_SECONDS_KEY); + + System.out.println("1 system properties: \n" + System.getProperties()); + System.out.println("2 properties file content:\n" + Arrays.toString(IOUtils.readLines(dubboProperties))); writeDubboProperties(Constants.SHUTDOWN_WAIT_KEY, "100"); System.setProperty("dubbo.application.name", "demo"); InterfaceConfig interfaceConfig = new InterfaceConfig(); interfaceConfig.checkApplication(); ApplicationConfig appConfig = interfaceConfig.getApplication(); TestCase.assertEquals("demo", appConfig.getName()); + System.out.println("3 properties file content:\n" + Arrays.toString(IOUtils.readLines(dubboProperties))); + System.out.println("4 system properties: \n" + System.getProperties()); TestCase.assertEquals("100", System.getProperty(Constants.SHUTDOWN_WAIT_KEY)); System.clearProperty(Constants.SHUTDOWN_WAIT_KEY); diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java index 2a1a890f67..41549e3ef9 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractMethodConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractMethodConfigTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractReferenceConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractReferenceConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractReferenceConfigTest.java index 02f42653c8..a53217cc41 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractReferenceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractReferenceConfigTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.junit.Test; import java.util.HashMap; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractServiceConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java index 92c789d5e6..3f79541296 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/AbstractServiceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/AbstractServiceConfigTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.junit.Test; import java.util.Collections; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ApplicationConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ApplicationConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java index f60bb85698..1cc5a22f7b 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ApplicationConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ApplicationConfigTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.junit.Test; import java.util.Collections; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ArgumentConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ArgumentConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ArgumentConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ArgumentConfigTest.java index 4e1276f3a5..26051f92fe 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ArgumentConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ArgumentConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ConsumerConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ConsumerConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java index 4eb2d4979d..a0b8ed75d1 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ConsumerConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ConsumerConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/GenericServiceTest.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/GenericServiceTest.java index 64bc6adbd6..6e746dbf43 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/GenericServiceTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/GenericServiceTest.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.beanutil.JavaBeanAccessor; -import com.alibaba.dubbo.common.beanutil.JavaBeanDescriptor; -import com.alibaba.dubbo.common.beanutil.JavaBeanSerializeUtil; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.config.api.DemoException; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.api.User; -import com.alibaba.dubbo.config.provider.impl.DemoServiceImpl; -import com.alibaba.dubbo.rpc.service.GenericException; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.beanutil.JavaBeanAccessor; +import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; +import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.config.api.DemoException; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.api.User; +import org.apache.dubbo.config.provider.impl.DemoServiceImpl; +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.service.GenericService; import org.junit.Assert; import org.junit.Test; @@ -119,7 +119,7 @@ public class GenericServiceTest { try { List> users = new ArrayList>(); Map user = new HashMap(); - user.put("class", "com.alibaba.dubbo.config.api.User"); + user.put("class", "org.apache.dubbo.config.api.User"); user.put("name", "actual.provider"); users.add(user); users = (List>) genericService.$invoke("getUsers", new String[]{List.class.getName()}, new Object[]{users}); diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MethodConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MethodConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java index d3ca181465..2ca7ecc8df 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MethodConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MethodConfigTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ModuleConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ModuleConfigTest.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ModuleConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ModuleConfigTest.java index 0d006296e7..c535e997c3 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ModuleConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ModuleConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.hamcrest.Matchers; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MonitorConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MonitorConfigTest.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MonitorConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MonitorConfigTest.java index 49756af6ce..c666072e9d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/MonitorConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/MonitorConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java similarity index 98% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java index 797471c6a9..754525629e 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProtocolConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProtocolConfigTest.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.config.mock.MockProtocol2; -import com.alibaba.dubbo.rpc.Protocol; +import org.apache.dubbo.config.mock.MockProtocol2; +import org.apache.dubbo.rpc.Protocol; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProviderConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProviderConfigTest.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProviderConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProviderConfigTest.java index ce8b1b11aa..18c630ace4 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ProviderConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ProviderConfigTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java index 59c78e4f5d..1bac760c20 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ReferenceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ReferenceConfigTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.provider.impl.DemoServiceImpl; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.provider.impl.DemoServiceImpl; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java index 1d9bbe2038..75c99b1433 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/RegistryConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/RegistryConfigTest.java @@ -15,9 +15,9 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; import org.junit.Test; import java.util.Collections; @@ -65,10 +65,14 @@ public class RegistryConfigTest { @Test public void testWait() throws Exception { - RegistryConfig registry = new RegistryConfig(); - registry.setWait(10); - assertThat(registry.getWait(), is(10)); - assertThat(System.getProperty(Constants.SHUTDOWN_WAIT_KEY), equalTo("10")); + try { + RegistryConfig registry = new RegistryConfig(); + registry.setWait(10); + assertThat(registry.getWait(), is(10)); + assertThat(System.getProperty(Constants.SHUTDOWN_WAIT_KEY), equalTo("10")); + } finally { + System.clearProperty(Constants.SHUTDOWN_TIMEOUT_KEY); + } } @Test diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java similarity index 89% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java index ed5a2e33d7..5da2b46354 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/ServiceConfigTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/ServiceConfigTest.java @@ -15,21 +15,21 @@ * limitations under the License. */ -package com.alibaba.dubbo.config; +package org.apache.dubbo.config; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.api.Greeting; -import com.alibaba.dubbo.config.mock.TestProxyFactory; -import com.alibaba.dubbo.config.provider.impl.DemoServiceImpl; -import com.alibaba.dubbo.config.mock.MockProtocol2; -import com.alibaba.dubbo.config.mock.MockRegistryFactory2; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.api.Greeting; +import org.apache.dubbo.config.mock.TestProxyFactory; +import org.apache.dubbo.config.provider.impl.DemoServiceImpl; +import org.apache.dubbo.config.mock.MockProtocol2; +import org.apache.dubbo.config.mock.MockRegistryFactory2; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.service.GenericService; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; @@ -37,9 +37,9 @@ import org.mockito.Mockito; import java.util.Collections; -import static com.alibaba.dubbo.common.Constants.GENERIC_SERIALIZATION_BEAN; -import static com.alibaba.dubbo.common.Constants.GENERIC_SERIALIZATION_DEFAULT; -import static com.alibaba.dubbo.common.Constants.GENERIC_SERIALIZATION_NATIVE_JAVA; +import static org.apache.dubbo.common.Constants.GENERIC_SERIALIZATION_BEAN; +import static org.apache.dubbo.common.Constants.GENERIC_SERIALIZATION_DEFAULT; +import static org.apache.dubbo.common.Constants.GENERIC_SERIALIZATION_NATIVE_JAVA; import static org.hamcrest.CoreMatchers.containsString; import static org.hamcrest.CoreMatchers.equalTo; import static org.hamcrest.CoreMatchers.is; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Box.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Box.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Box.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Box.java index e115857898..e63f924865 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Box.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Box.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.api; +package org.apache.dubbo.config.api; public interface Box { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoException.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoException.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoException.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoException.java index 370a14d5ce..269dc2ba0d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoException.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.api; +package org.apache.dubbo.config.api; /** * DemoException diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoService.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoService.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoService.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoService.java index 655d192927..249858fd05 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/DemoService.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.api; +package org.apache.dubbo.config.api; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Greeting.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Greeting.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Greeting.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Greeting.java index 0ceca89d9f..c2afa98875 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/Greeting.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/Greeting.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.api; +package org.apache.dubbo.config.api; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI public interface Greeting { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/User.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/User.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/User.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/User.java index 332042f200..f4941b3dfb 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/api/User.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/api/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.api; +package org.apache.dubbo.config.api; import java.io.Serializable; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheService.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheService.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheService.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheService.java index af7a4bed7a..c6a2f65f28 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheService.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.cache; +package org.apache.dubbo.config.cache; /** * ValidationService diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheServiceImpl.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheServiceImpl.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheServiceImpl.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheServiceImpl.java index 6485907d4f..a0304c0e41 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheServiceImpl.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.cache; +package org.apache.dubbo.config.cache; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java similarity index 82% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java index ebda6ba532..0cdcabdd71 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/cache/CacheTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/cache/CacheTest.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.cache; +package org.apache.dubbo.config.cache; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.CacheFactory; -import com.alibaba.dubbo.cache.support.threadlocal.ThreadLocalCache; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.MethodConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.CacheFactory; +import org.apache.dubbo.cache.support.threadlocal.ThreadLocalCache; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.MethodConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcInvocation; import junit.framework.TestCase; import org.junit.Test; @@ -108,7 +108,7 @@ public class CacheTest extends TestCase { Map parameters = new HashMap(); parameters.put("findCache.cache", "threadlocal"); - URL url = new URL("dubbo", "127.0.0.1", 29582, "com.alibaba.dubbo.config.cache.CacheService", parameters); + URL url = new URL("dubbo", "127.0.0.1", 29582, "org.apache.dubbo.config.cache.CacheService", parameters); Invocation invocation = new RpcInvocation("findCache", new Class[]{String.class}, new String[]{"0"}, null, null); diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionByAnnotation.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionByAnnotation.java similarity index 89% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionByAnnotation.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionByAnnotation.java index 1c91ecb7fa..8a661dce41 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionByAnnotation.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionByAnnotation.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.consumer; +package org.apache.dubbo.config.consumer; -import com.alibaba.dubbo.config.api.DemoService; +import org.apache.dubbo.config.api.DemoService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionBySetter.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionBySetter.java similarity index 89% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionBySetter.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionBySetter.java index 8a46b30614..897d523412 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoActionBySetter.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoActionBySetter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.consumer; +package org.apache.dubbo.config.consumer; -import com.alibaba.dubbo.config.api.DemoService; +import org.apache.dubbo.config.api.DemoService; /** * DemoAction diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoInterceptor.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoInterceptor.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoInterceptor.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoInterceptor.java index abd4162de8..96e2285e06 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/consumer/DemoInterceptor.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/consumer/DemoInterceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.consumer; +package org.apache.dubbo.config.consumer; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java similarity index 90% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java index 2e390329a1..af21751b78 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/invoker/DelegateProviderMetaDataInvokerTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.invoker; +package org.apache.dubbo.config.invoker; -import com.alibaba.dubbo.config.api.Greeting; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.config.api.Greeting; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; import org.junit.Before; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal1.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal1.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal1.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal1.java index 9c024b0c1a..f3d5ee572b 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal1.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; public class GreetingLocal1 { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal2.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal2.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal2.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal2.java index a3ed63d030..8cae40684f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal2.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal2.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.config.api.Greeting; +import org.apache.dubbo.config.api.Greeting; public class GreetingLocal2 implements Greeting { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal3.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal3.java similarity index 92% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal3.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal3.java index e6d20220bc..9b14ac6e9e 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingLocal3.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingLocal3.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.config.api.Greeting; +import org.apache.dubbo.config.api.Greeting; public class GreetingLocal3 implements Greeting { private Greeting greeting; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock1.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock1.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock1.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock1.java index b24008ca97..8bfe6e6c07 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock1.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock1.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; public class GreetingMock1 { } diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock2.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock2.java similarity index 91% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock2.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock2.java index f296b126d8..429bff442a 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/GreetingMock2.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/GreetingMock2.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.config.api.Greeting; +import org.apache.dubbo.config.api.Greeting; public class GreetingMock2 implements Greeting { private GreetingMock2() { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCluster.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCluster.java similarity index 81% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCluster.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCluster.java index 34553ed61c..39bf97437d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCluster.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCluster.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Directory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Directory; public class MockCluster implements Cluster { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCodec.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCodec.java similarity index 90% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCodec.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCodec.java index a818f4b758..c1aac425e5 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockCodec.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockCodec.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockDispatcher.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockDispatcher.java similarity index 84% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockDispatcher.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockDispatcher.java index 7f3f91bc23..32fffca968 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockDispatcher.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockDispatcher.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; public class MockDispatcher implements Dispatcher { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExchanger.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExchanger.java similarity index 75% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExchanger.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExchanger.java index f4fe17f816..fccfd2387f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExchanger.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExchanger.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchanger; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchanger; public class MockExchanger implements Exchanger { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExporterListener.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExporterListener.java similarity index 86% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExporterListener.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExporterListener.java index 7a56719eca..c374395f0e 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockExporterListener.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockExporterListener.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.ExporterListener; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.ExporterListener; +import org.apache.dubbo.rpc.RpcException; public class MockExporterListener implements ExporterListener { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockFilter.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockFilter.java similarity index 80% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockFilter.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockFilter.java index 6a9fbbf15e..d51f12318f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockFilter.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockFilter.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; public class MockFilter implements Filter { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockInvokerListener.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockInvokerListener.java similarity index 86% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockInvokerListener.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockInvokerListener.java index 2c6d065a97..c929e5443f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockInvokerListener.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockInvokerListener.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.RpcException; public class MockInvokerListener implements InvokerListener { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockLoadBalance.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockLoadBalance.java similarity index 80% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockLoadBalance.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockLoadBalance.java index ee7851c034..377f328a3d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockLoadBalance.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockLoadBalance.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.LoadBalance; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol.java similarity index 75% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol.java index ea03f94307..f4cb8ce2d4 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; public class MockProtocol implements Protocol { /* (non-Javadoc) - * @see com.alibaba.dubbo.rpc.Protocol#getDefaultPort() + * @see org.apache.dubbo.rpc.Protocol#getDefaultPort() */ @Override public int getDefaultPort() { @@ -36,14 +36,14 @@ public class MockProtocol implements Protocol { } /* (non-Javadoc) - * @see com.alibaba.dubbo.rpc.Protocol#export(com.alibaba.dubbo.rpc.Invoker) + * @see org.apache.dubbo.rpc.Protocol#export(org.apache.dubbo.rpc.Invoker) */ public Exporter export(Invoker invoker) throws RpcException { return null; } /* (non-Javadoc) - * @see com.alibaba.dubbo.rpc.Protocol#refer(java.lang.Class, com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.rpc.Protocol#refer(java.lang.Class, org.apache.dubbo.common.URL) */ public Invoker refer(Class type, URL url) throws RpcException { @@ -76,7 +76,7 @@ public class MockProtocol implements Protocol { } /* (non-Javadoc) - * @see com.alibaba.dubbo.rpc.Protocol#destroy() + * @see org.apache.dubbo.rpc.Protocol#destroy() */ @Override public void destroy() { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol2.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol2.java similarity index 85% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol2.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol2.java index d25c428ec1..91653d4dfb 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProtocol2.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProtocol2.java @@ -15,13 +15,13 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; public class MockProtocol2 implements Protocol { public static Protocol delegate; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProxyFactory.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProxyFactory.java similarity index 86% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProxyFactory.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProxyFactory.java index cd78366c00..49f05d841e 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockProxyFactory.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockProxyFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; public class MockProxyFactory implements ProxyFactory { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistry.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistry.java similarity index 68% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistry.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistry.java index 4737d20d21..255262d3cb 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistry.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistry.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; import java.util.ArrayList; import java.util.List; @@ -36,14 +36,14 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.common.Node#getUrl() + * @see org.apache.dubbo.common.Node#getUrl() */ public URL getUrl() { return null; } /* - * @see com.alibaba.dubbo.common.Node#isAvailable() + * @see org.apache.dubbo.common.Node#isAvailable() */ @Override public boolean isAvailable() { @@ -51,7 +51,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.common.Node#destroy() + * @see org.apache.dubbo.common.Node#destroy() */ @Override public void destroy() { @@ -59,7 +59,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.registry.RegistryService#register(com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.registry.RegistryService#register(org.apache.dubbo.common.URL) */ @Override public void register(URL url) { @@ -67,7 +67,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.registry.RegistryService#unregister(com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.registry.RegistryService#unregister(org.apache.dubbo.common.URL) */ @Override public void unregister(URL url) { @@ -75,7 +75,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.registry.RegistryService#subscribe(com.alibaba.dubbo.common.URL, com.alibaba.dubbo.registry.NotifyListener) + * @see org.apache.dubbo.registry.RegistryService#subscribe(org.apache.dubbo.common.URL, org.apache.dubbo.registry.NotifyListener) */ @Override public void subscribe(URL url, NotifyListener listener) { @@ -90,7 +90,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.registry.RegistryService#unsubscribe(com.alibaba.dubbo.common.URL, com.alibaba.dubbo.registry.NotifyListener) + * @see org.apache.dubbo.registry.RegistryService#unsubscribe(org.apache.dubbo.common.URL, org.apache.dubbo.registry.NotifyListener) */ @Override public void unsubscribe(URL url, NotifyListener listener) { @@ -98,7 +98,7 @@ public class MockRegistry implements Registry { } /* - * @see com.alibaba.dubbo.registry.RegistryService#lookup(com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.registry.RegistryService#lookup(org.apache.dubbo.common.URL) */ @Override public List lookup(URL url) { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory.java similarity index 79% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory.java index 922fb0f5a6..92e23b1d7e 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; /** * TODO Comment of MockRegistryFactory @@ -26,7 +26,7 @@ import com.alibaba.dubbo.registry.RegistryFactory; public class MockRegistryFactory implements RegistryFactory { /* - * @see com.alibaba.dubbo.registry.RegistryFactory#getRegistry(com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.registry.RegistryFactory#getRegistry(org.apache.dubbo.common.URL) */ @Override public Registry getRegistry(URL url) { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory2.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory2.java similarity index 85% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory2.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory2.java index 9cda53b80d..2ab3da8faa 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockRegistryFactory2.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockRegistryFactory2.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; public class MockRegistryFactory2 implements RegistryFactory { public static Registry registry; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockStatusChecker.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockStatusChecker.java similarity index 86% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockStatusChecker.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockStatusChecker.java index c77498a4d5..e144c7bc2c 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockStatusChecker.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockStatusChecker.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; public class MockStatusChecker implements StatusChecker { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTelnetHandler.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTelnetHandler.java similarity index 83% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTelnetHandler.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTelnetHandler.java index 3f982e845a..a08160fa79 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTelnetHandler.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTelnetHandler.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; public class MockTelnetHandler implements TelnetHandler { @Override diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockThreadPool.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockThreadPool.java similarity index 88% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockThreadPool.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockThreadPool.java index 18b2084927..a399884552 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockThreadPool.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockThreadPool.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadpool.ThreadPool; import java.util.concurrent.Executor; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTransporter.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTransporter.java similarity index 80% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTransporter.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTransporter.java index 108c40f170..08d005d690 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/MockTransporter.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/MockTransporter.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporter; import org.mockito.Mockito; public class MockTransporter implements Transporter { diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/TestProxyFactory.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/TestProxyFactory.java similarity index 83% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/TestProxyFactory.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/TestProxyFactory.java index d70ecf7640..fe22bd13ff 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/mock/TestProxyFactory.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/mock/TestProxyFactory.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.mock; +package org.apache.dubbo.config.mock; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.proxy.jdk.JdkProxyFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.proxy.jdk.JdkProxyFactory; public class TestProxyFactory extends JdkProxyFactory { public static int count = 0; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/provider/impl/DemoServiceImpl.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/provider/impl/DemoServiceImpl.java similarity index 82% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/provider/impl/DemoServiceImpl.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/provider/impl/DemoServiceImpl.java index 4ffc1dee80..6df10d82b2 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/provider/impl/DemoServiceImpl.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/provider/impl/DemoServiceImpl.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.provider.impl; +package org.apache.dubbo.config.provider.impl; -import com.alibaba.dubbo.config.api.Box; -import com.alibaba.dubbo.config.api.DemoException; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.api.User; +import org.apache.dubbo.config.api.Box; +import org.apache.dubbo.config.api.DemoException; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.api.User; import java.util.List; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/ExporterSideConfigUrlTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/ExporterSideConfigUrlTest.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/ExporterSideConfigUrlTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/ExporterSideConfigUrlTest.java index 9df0759fed..c66a40d503 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/ExporterSideConfigUrlTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/ExporterSideConfigUrlTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.url; +package org.apache.dubbo.config.url; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import org.junit.After; import org.junit.Before; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/InvokerSideConfigUrlTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/InvokerSideConfigUrlTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java index b9bfab24ff..e01933ad1f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/InvokerSideConfigUrlTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/InvokerSideConfigUrlTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.url; +package org.apache.dubbo.config.url; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ConsumerConfig; -import com.alibaba.dubbo.config.MethodConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.mock.MockRegistry; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ConsumerConfig; +import org.apache.dubbo.config.MethodConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.mock.MockRegistry; import org.junit.After; import org.junit.Before; @@ -187,7 +187,7 @@ public class InvokerSideConfigUrlTest extends UrlTestBase { regConfForReference.setAddress("127.0.0.1:9090"); regConfForReference.setProtocol("mockregistry"); appConfForReference.setName("ConfigTests"); - refConf.setInterface("com.alibaba.dubbo.config.api.DemoService"); + refConf.setInterface("org.apache.dubbo.config.api.DemoService"); refConf.setApplication(appConfForReference); consumerConf.setApplication(appConfForConsumer); diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/RpcConfigGetSetProxy.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/RpcConfigGetSetProxy.java similarity index 95% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/RpcConfigGetSetProxy.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/RpcConfigGetSetProxy.java index 9d0b6413e5..d883ec25f1 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/RpcConfigGetSetProxy.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/RpcConfigGetSetProxy.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.url; +package org.apache.dubbo.config.url; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.AbstractConfig; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.AbstractConfig; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/UrlTestBase.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/UrlTestBase.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java index 8c6511134b..b342685c90 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/url/UrlTestBase.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/url/UrlTestBase.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.url; +package org.apache.dubbo.config.url; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.MethodConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ProviderConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.config.api.DemoService; -import com.alibaba.dubbo.config.provider.impl.DemoServiceImpl; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.MethodConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ProviderConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.api.DemoService; +import org.apache.dubbo.config.provider.impl.DemoServiceImpl; import java.util.Arrays; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/MockReferenceConfig.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/MockReferenceConfig.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/MockReferenceConfig.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/MockReferenceConfig.java index cad6453d8a..68df6cd55f 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/MockReferenceConfig.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/MockReferenceConfig.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.utils; +package org.apache.dubbo.config.utils; -import com.alibaba.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.ReferenceConfig; import java.util.concurrent.atomic.AtomicLong; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/ReferenceConfigCacheTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ReferenceConfigCacheTest.java similarity index 99% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/ReferenceConfigCacheTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ReferenceConfigCacheTest.java index 1be5bbc6cf..8216609b81 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/utils/ReferenceConfigCacheTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/utils/ReferenceConfigCacheTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.utils; +package org.apache.dubbo.config.utils; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationParameter.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationParameter.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationParameter.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationParameter.java index f5b7296e3b..65f77dec02 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationParameter.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationParameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.validation; +package org.apache.dubbo.config.validation; import javax.validation.constraints.Future; import javax.validation.constraints.Max; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationService.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationService.java index a85afba782..0af7a2b4e5 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationService.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationService.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.validation; +package org.apache.dubbo.config.validation; -import com.alibaba.dubbo.validation.MethodValidated; +import org.apache.dubbo.validation.MethodValidated; import javax.validation.constraints.Min; import javax.validation.constraints.NotNull; diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationServiceImpl.java similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationServiceImpl.java index 42720668ff..e37197c9af 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationServiceImpl.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.validation; +package org.apache.dubbo.config.validation; /** * ValidationServiceImpl diff --git a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationTest.java similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java rename to dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationTest.java index 64d618fac4..45d8c2733d 100644 --- a/dubbo-config/dubbo-config-api/src/test/java/com/alibaba/dubbo/config/validation/ValidationTest.java +++ b/dubbo-config/dubbo-config-api/src/test/java/org/apache/dubbo/config/validation/ValidationTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.validation; +package org.apache.dubbo.config.validation; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.service.GenericException; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.service.GenericService; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index e03669547b..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1,2 +0,0 @@ -mockregistry=com.alibaba.dubbo.config.mock.MockRegistryFactory -mockprotocol2=com.alibaba.dubbo.config.mock.MockRegistryFactory2 diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler deleted file mode 100644 index 5b021778ac..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.telnet.TelnetHandler +++ /dev/null @@ -1,18 +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. -# -mocktelnethandler=com.alibaba.dubbo.config.mock.MockTelnetHandler - diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ExporterListener b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ExporterListener deleted file mode 100644 index 6d072faffc..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ExporterListener +++ /dev/null @@ -1,18 +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. -# - -mockexporterlistener=com.alibaba.dubbo.config.mock.MockExporterListener \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index f39afb6131..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -mockfilter=com.alibaba.dubbo.config.mock.MockFilter \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener deleted file mode 100644 index b8d6724427..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.InvokerListener +++ /dev/null @@ -1 +0,0 @@ -mockinvokerlistener=com.alibaba.dubbo.config.mock.MockInvokerListener \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 2cb5bdb2b0..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1,2 +0,0 @@ -mockprotocol=com.alibaba.dubbo.config.mock.MockProtocol -mockprotocol2=com.alibaba.dubbo.config.mock.MockProtocol2 \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory deleted file mode 100644 index d1af147787..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.ProxyFactory +++ /dev/null @@ -1,2 +0,0 @@ -mockproxyfactory=com.alibaba.dubbo.config.mock.MockProxyFactory -testproxyfactory=com.alibaba.dubbo.config.mock.TestProxyFactory \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster deleted file mode 100644 index 04e227cfa8..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.Cluster +++ /dev/null @@ -1 +0,0 @@ -mockcluster=com.alibaba.dubbo.config.mock.MockCluster \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance deleted file mode 100644 index 65c98e2cef..0000000000 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.rpc.cluster.LoadBalance +++ /dev/null @@ -1 +0,0 @@ -mockloadbalance=com.alibaba.dubbo.config.mock.MockLoadBalance \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.status.StatusChecker similarity index 92% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.status.StatusChecker index 8928497c31..d7d3b44600 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Transporter +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.status.StatusChecker @@ -15,4 +15,4 @@ # limitations under the License. # -mocktransporter=com.alibaba.dubbo.config.mock.MockTransporter \ No newline at end of file +mockstatuschecker=org.apache.dubbo.config.mock.MockStatusChecker \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Dispatcher b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.threadpool.ThreadPool similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Dispatcher rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.threadpool.ThreadPool index 40c3bf732f..f4f5d34d32 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Dispatcher +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.common.threadpool.ThreadPool @@ -15,4 +15,4 @@ # limitations under the License. # -mockdispatcher=com.alibaba.dubbo.config.mock.MockDispatcher \ No newline at end of file +mockthreadpool=org.apache.dubbo.config.mock.MockThreadPool \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.registry.RegistryFactory b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..371c74dde8 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1,2 @@ +mockregistry=org.apache.dubbo.config.mock.MockRegistryFactory +mockprotocol2=org.apache.dubbo.config.mock.MockRegistryFactory2 diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Codec similarity index 94% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Codec index 26dcb6179b..94f766863f 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.Codec +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Codec @@ -15,4 +15,4 @@ # limitations under the License. # -mockcodec=com.alibaba.dubbo.config.mock.MockCodec \ No newline at end of file +mockcodec=org.apache.dubbo.config.mock.MockCodec \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Dispatcher similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Dispatcher index c93baf9327..febb4f8e2a 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.threadpool.ThreadPool +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Dispatcher @@ -15,4 +15,4 @@ # limitations under the License. # -mockthreadpool=com.alibaba.dubbo.config.mock.MockThreadPool \ No newline at end of file +mockdispatcher=org.apache.dubbo.config.mock.MockDispatcher \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Transporter b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Transporter new file mode 100644 index 0000000000..ef9ec51063 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.Transporter @@ -0,0 +1,18 @@ +# +# 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. +# + +mocktransporter=org.apache.dubbo.config.mock.MockTransporter \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.exchange.Exchanger similarity index 93% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.exchange.Exchanger index 57281fbea6..f8d3c3b9e5 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.remoting.exchange.Exchanger +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.exchange.Exchanger @@ -15,4 +15,4 @@ # limitations under the License. # -mockexchanger=com.alibaba.dubbo.config.mock.MockExchanger \ No newline at end of file +mockexchanger=org.apache.dubbo.config.mock.MockExchanger \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.telnet.TelnetHandler similarity index 92% rename from dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker rename to dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.telnet.TelnetHandler index 97ad4faf2b..76dfd94078 100644 --- a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/com.alibaba.dubbo.common.status.StatusChecker +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.remoting.telnet.TelnetHandler @@ -14,5 +14,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # +mocktelnethandler=org.apache.dubbo.config.mock.MockTelnetHandler -mockstatuschecker=com.alibaba.dubbo.config.mock.MockStatusChecker \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ExporterListener b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ExporterListener new file mode 100644 index 0000000000..f9c818dcc4 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ExporterListener @@ -0,0 +1,18 @@ +# +# 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. +# + +mockexporterlistener=org.apache.dubbo.config.mock.MockExporterListener \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Filter b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..1938f9617d --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +mockfilter=org.apache.dubbo.config.mock.MockFilter \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.InvokerListener b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.InvokerListener new file mode 100644 index 0000000000..9e6d0428e6 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.InvokerListener @@ -0,0 +1 @@ +mockinvokerlistener=org.apache.dubbo.config.mock.MockInvokerListener \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Protocol b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..6c044979e8 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.Protocol @@ -0,0 +1,2 @@ +mockprotocol=org.apache.dubbo.config.mock.MockProtocol +mockprotocol2=org.apache.dubbo.config.mock.MockProtocol2 \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ProxyFactory b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ProxyFactory new file mode 100644 index 0000000000..ded1b88142 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.ProxyFactory @@ -0,0 +1,2 @@ +mockproxyfactory=org.apache.dubbo.config.mock.MockProxyFactory +testproxyfactory=org.apache.dubbo.config.mock.TestProxyFactory \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.Cluster b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.Cluster new file mode 100644 index 0000000000..066d136143 --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.Cluster @@ -0,0 +1 @@ +mockcluster=org.apache.dubbo.config.mock.MockCluster \ No newline at end of file diff --git a/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.LoadBalance b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.LoadBalance new file mode 100644 index 0000000000..23b508787e --- /dev/null +++ b/dubbo-config/dubbo-config-api/src/test/resources/META-INF/services/org.apache.dubbo.rpc.cluster.LoadBalance @@ -0,0 +1 @@ +mockloadbalance=org.apache.dubbo.config.mock.MockLoadBalance \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java rename to dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java index 6da7ba8b90..00a3b32db6 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/AnnotationBean.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/AnnotationBean.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.config.AbstractConfig; -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.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.ServiceConfig; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.config.AbstractConfig; +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.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ServiceConfig; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.annotation.Service; import org.springframework.beans.BeansException; import org.springframework.beans.factory.DisposableBean; diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java rename to dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java index 00a6becdd5..e6a2a1fddb 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ReferenceBean.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ReferenceBean.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -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.ReferenceConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.extension.SpringExtensionFactory; -import com.alibaba.dubbo.config.support.Parameter; +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.ReferenceConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.extension.SpringExtensionFactory; +import org.apache.dubbo.config.support.Parameter; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java similarity index 94% rename from dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java rename to dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java index b38684b2c7..231827cd53 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/ServiceBean.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/ServiceBean.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.config.ApplicationConfig; -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.ServiceConfig; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.spring.extension.SpringExtensionFactory; +import org.apache.dubbo.config.ApplicationConfig; +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.ServiceConfig; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.spring.extension.SpringExtensionFactory; import org.springframework.aop.support.AopUtils; import org.springframework.beans.factory.BeanFactoryUtils; import org.springframework.beans.factory.BeanNameAware; diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java similarity index 90% rename from dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java rename to dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java index fc8d3f4610..431b130e70 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/org/apache/dubbo/config/spring/beans/factory/annotation/AbstractAnnotationConfigBeanBuilder.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.beans.factory.annotation; +package org.apache.dubbo.config.spring.beans.factory.annotation; -import com.alibaba.dubbo.config.AbstractInterfaceConfig; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ModuleConfig; -import com.alibaba.dubbo.config.MonitorConfig; -import com.alibaba.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.AbstractInterfaceConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.MonitorConfig; +import org.apache.dubbo.config.RegistryConfig; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.springframework.context.ApplicationContext; @@ -29,8 +29,8 @@ import org.springframework.util.Assert; import java.lang.annotation.Annotation; import java.util.List; -import static com.alibaba.dubbo.config.spring.util.BeanFactoryUtils.getBeans; -import static com.alibaba.dubbo.config.spring.util.BeanFactoryUtils.getOptionalBean; +import static org.apache.dubbo.config.spring.util.BeanFactoryUtils.getBeans; +import static org.apache.dubbo.config.spring.util.BeanFactoryUtils.getOptionalBean; /** * Abstract Configurable {@link Annotation} Bean Builder @@ -174,7 +174,7 @@ abstract class AbstractAnnotationConfigBeanBuilder")); } @@ -194,10 +194,10 @@ public class ConfigTest { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/multi-protocol-register.xml"); ctx.start(); try { - List urls = registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + List urls = registryService.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); assertNotNull(urls); assertEquals(1, urls.size()); - assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20824/com.alibaba.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); + assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20824/org.apache.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); } finally { ctx.stop(); ctx.close(); @@ -214,12 +214,12 @@ public class ConfigTest { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/multi-registry.xml"); ctx.start(); try { - List urls1 = registryService1.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + List urls1 = registryService1.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); assertNull(urls1); - List urls2 = registryService2.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + List urls2 = registryService2.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); assertNotNull(urls2); assertEquals(1, urls2.size()); - assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20880/com.alibaba.dubbo.config.spring.api.DemoService", urls2.get(0).toIdentityString()); + assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20880/org.apache.dubbo.config.spring.api.DemoService", urls2.get(0).toIdentityString()); } finally { ctx.stop(); ctx.close(); @@ -235,16 +235,16 @@ public class ConfigTest { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/delay-fixed-time.xml"); ctx.start(); try { - List urls = registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + List urls = registryService.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); assertNull(urls); int i = 0; while ((i++) < 60 && urls == null) { - urls = registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + urls = registryService.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); Thread.sleep(10); } assertNotNull(urls); assertEquals(1, urls.size()); - assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20883/com.alibaba.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); + assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20883/org.apache.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); } finally { ctx.stop(); ctx.close(); @@ -259,10 +259,10 @@ public class ConfigTest { ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext(ConfigTest.class.getPackage().getName().replace('.', '/') + "/delay-on-initialized.xml"); //ctx.start(); try { - List urls = registryService.getRegistered().get("com.alibaba.dubbo.config.spring.api.DemoService"); + List urls = registryService.getRegistered().get("org.apache.dubbo.config.spring.api.DemoService"); assertNotNull(urls); assertEquals(1, urls.size()); - assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20883/com.alibaba.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); + assertEquals("dubbo://" + NetUtils.getLocalHost() + ":20883/org.apache.dubbo.config.spring.api.DemoService", urls.get(0).toIdentityString()); } finally { ctx.stop(); ctx.close(); diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/GenericDemoService.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/GenericDemoService.java similarity index 87% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/GenericDemoService.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/GenericDemoService.java index 7227899c9b..2343738a9d 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/GenericDemoService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/GenericDemoService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.rpc.service.GenericException; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.service.GenericService; public class GenericDemoService implements GenericService { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java similarity index 93% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java index 11f70558e5..467baf50be 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/ServiceBeanTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/ServiceBeanTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryExporter.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryExporter.java similarity index 83% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryExporter.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryExporter.java index c71275d00e..39878595e0 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryExporter.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryExporter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; import java.io.IOException; import java.net.ServerSocket; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryService.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryService.java similarity index 87% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryService.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryService.java index b62c705c93..eebd354e77 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/SimpleRegistryService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/SimpleRegistryService.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring; +package org.apache.dubbo.config.spring; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.rpc.RpcContext; import java.util.List; import java.util.Map; @@ -76,7 +76,7 @@ public class SimpleRegistryService extends AbstractRegistryService { register(service, new URL("dubbo", NetUtils.getLocalHost(), RpcContext.getContext().getLocalPort(), - com.alibaba.dubbo.registry.RegistryService.class.getName(), + org.apache.dubbo.registry.RegistryService.class.getName(), url.getParameters())); List rs = registries; if (rs != null && rs.size() > 0) { @@ -133,7 +133,7 @@ public class SimpleRegistryService extends AbstractRegistryService { super.unsubscribe(service, new URL("subscribe", RpcContext.getContext().getRemoteHost(), RpcContext.getContext().getRemotePort(), - com.alibaba.dubbo.registry.RegistryService.class.getName(), getSubscribed(service)), entry.getValue()); + org.apache.dubbo.registry.RegistryService.class.getName(), getSubscribed(service)), entry.getValue()); } } } diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionByAnnotation.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionByAnnotation.java similarity index 88% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionByAnnotation.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionByAnnotation.java index 8c662863e6..f39ff2e681 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionByAnnotation.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionByAnnotation.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.action; +package org.apache.dubbo.config.spring.action; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.DemoService; import org.springframework.beans.factory.annotation.Autowired; /** diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionBySetter.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionBySetter.java similarity index 88% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionBySetter.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionBySetter.java index 750da92015..17cb634186 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoActionBySetter.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoActionBySetter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.action; +package org.apache.dubbo.config.spring.action; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.DemoService; /** * DemoAction diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoInterceptor.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoInterceptor.java similarity index 93% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoInterceptor.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoInterceptor.java index b0df7e48c2..d9d9b19a9b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/action/DemoInterceptor.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/action/DemoInterceptor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.action; +package org.apache.dubbo.config.spring.action; import org.aopalliance.intercept.MethodInterceptor; import org.aopalliance.intercept.MethodInvocation; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/consumer/AnnotationAction.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/consumer/AnnotationAction.java similarity index 84% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/consumer/AnnotationAction.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/consumer/AnnotationAction.java index 37700a04c0..be6844532b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/consumer/AnnotationAction.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/consumer/AnnotationAction.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.annotation.consumer; +package org.apache.dubbo.config.spring.annotation.consumer; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.api.DemoService; import org.springframework.stereotype.Controller; /** diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java similarity index 80% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java index 327f4d91ba..1408e07fcb 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/annotation/provider/AnnotationServiceImpl.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.annotation.provider; +package org.apache.dubbo.config.spring.annotation.provider; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoService; /** * DemoServiceImpl diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/Box.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/Box.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/Box.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/Box.java index 3e47f306b7..facb6d6706 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/Box.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/Box.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.api; +package org.apache.dubbo.config.spring.api; public interface Box { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoService.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoService.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoService.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoService.java index cfc079681c..0f2a0c2075 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.api; +package org.apache.dubbo.config.spring.api; /** * DemoService diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoServiceSon.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoServiceSon.java similarity index 95% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoServiceSon.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoServiceSon.java index 544d2e6bfa..1a2d4382ca 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/DemoServiceSon.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/DemoServiceSon.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.api; +package org.apache.dubbo.config.spring.api; /** * DemoService diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/HelloService.java similarity index 95% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/HelloService.java index 1feb2bd522..3cc5416096 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/api/HelloService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/api/HelloService.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.config.spring.api; +package org.apache.dubbo.config.spring.api; public interface HelloService { String sayHello(String name); diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java similarity index 93% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java index 545316feb2..d5889fa7b3 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/AnnotationPropertyValuesAdapterTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.beans.factory.annotation; +package org.apache.dubbo.config.spring.beans.factory.annotation; -import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.ReferenceBean; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.common.utils.CollectionUtils; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.ReferenceBean; +import org.apache.dubbo.config.spring.api.DemoService; import org.junit.Assert; import org.junit.Test; import org.springframework.core.annotation.AnnotationUtils; @@ -89,7 +89,7 @@ public class AnnotationPropertyValuesAdapterTest { // System.out.println(referenceBean); Assert.assertEquals(DemoService.class, referenceBean.getInterfaceClass()); - Assert.assertEquals("com.alibaba.dubbo.config.spring.api.DemoService", referenceBean.getInterface()); + Assert.assertEquals("org.apache.dubbo.config.spring.api.DemoService", referenceBean.getInterface()); Assert.assertEquals("1.0.0", referenceBean.getVersion()); Assert.assertEquals("group", referenceBean.getGroup()); Assert.assertEquals("dubbo://localhost:12345", referenceBean.getUrl()); @@ -142,7 +142,7 @@ public class AnnotationPropertyValuesAdapterTest { private static class TestBean { @Reference( - interfaceClass = DemoService.class, interfaceName = "com.alibaba.dubbo.config.spring.api.DemoService", version = "${version}", group = "group", + interfaceClass = DemoService.class, interfaceName = "org.apache.dubbo.config.spring.api.DemoService", version = "${version}", group = "group", url = "${url} ", client = "client", generic = true, injvm = true, check = false, init = true, lazy = true, stubevent = true, reconnect = "reconnect", sticky = true, proxy = "javassist", stub = "stub", diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java similarity index 89% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java index 05a49807d4..ec6e49a99e 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/DubboConfigBindingBeanPostProcessorTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.beans.factory.annotation; +package org.apache.dubbo.config.spring.beans.factory.annotation; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.spring.context.properties.DefaultDubboConfigBinder; -import com.alibaba.dubbo.config.spring.context.properties.DubboConfigBinder; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.spring.context.properties.DefaultDubboConfigBinder; +import org.apache.dubbo.config.spring.context.properties.DubboConfigBinder; import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java index a1b5807cbf..e45b025563 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ReferenceAnnotationBeanPostProcessorTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.beans.factory.annotation; +package org.apache.dubbo.config.spring.beans.factory.annotation; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.ReferenceBean; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.ReferenceBean; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; import org.junit.After; import org.junit.Assert; import org.junit.Before; @@ -35,7 +35,7 @@ import org.springframework.context.annotation.ImportResource; import java.util.Collection; 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.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.CoreMatchers.nullValue; @@ -53,7 +53,7 @@ public class ReferenceAnnotationBeanPostProcessorTest { @BeforeClass public static void prepare() { System.setProperty("provider.version", "1.2"); - System.setProperty("package1", "com.alibaba.dubbo.config.spring.annotation.provider"); + System.setProperty("package1", "org.apache.dubbo.config.spring.annotation.provider"); System.setProperty("packagesToScan", "${package1}"); System.setProperty("consumer.version", "1.2"); System.setProperty("consumer.url", "dubbo://127.0.0.1:12345"); @@ -136,7 +136,7 @@ public class ReferenceAnnotationBeanPostProcessorTest { InjectionMetadata.InjectedElement injectedElement = entry.getKey(); - Assert.assertEquals("com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor$ReferenceFieldElement", + Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor$ReferenceFieldElement", injectedElement.getClass().getName()); ReferenceBean referenceBean = entry.getValue(); @@ -166,7 +166,7 @@ public class ReferenceAnnotationBeanPostProcessorTest { InjectionMetadata.InjectedElement injectedElement = entry.getKey(); - Assert.assertEquals("com.alibaba.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor$ReferenceMethodElement", + Assert.assertEquals("org.apache.dubbo.config.spring.beans.factory.annotation.ReferenceAnnotationBeanPostProcessor$ReferenceMethodElement", injectedElement.getClass().getName()); ReferenceBean referenceBean = entry.getValue(); diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java index c096441814..35de555c30 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/beans/factory/annotation/ServiceAnnotationBeanPostProcessorTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.beans.factory.annotation; +package org.apache.dubbo.config.spring.beans.factory.annotation; -import com.alibaba.dubbo.config.spring.ServiceBean; -import com.alibaba.dubbo.config.spring.api.HelloService; +import org.apache.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.config.spring.api.HelloService; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,7 +43,7 @@ import java.util.Map; @ContextConfiguration( classes = {ServiceAnnotationBeanPostProcessorTest.TestConfiguration.class}) @TestPropertySource(properties = { - "package1 = com.alibaba.dubbo.config.spring.context.annotation", + "package1 = org.apache.dubbo.config.spring.context.annotation", "packagesToScan = ${package1}", "provider.version = 1.2" }) @@ -77,7 +77,7 @@ public class ServiceAnnotationBeanPostProcessorTest { @ImportResource("META-INF/spring/dubbo-annotation-provider.xml") @PropertySource("META-INF/default.properties") - @ComponentScan("com.alibaba.dubbo.config.spring.context.annotation.provider") + @ComponentScan("org.apache.dubbo.config.spring.context.annotation.provider") public static class TestConfiguration { @Bean diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java similarity index 89% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java index 5b5478b8f3..17968c8993 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboComponentScanRegistrarTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.context.annotation.consumer.ConsumerConfiguration; -import com.alibaba.dubbo.config.spring.context.annotation.provider.DemoServiceImpl; -import com.alibaba.dubbo.config.spring.context.annotation.provider.ProviderConfiguration; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.context.annotation.consumer.ConsumerConfiguration; +import org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl; +import org.apache.dubbo.config.spring.context.annotation.provider.ProviderConfiguration; import org.junit.Assert; import org.junit.Test; import org.springframework.aop.support.AopUtils; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java similarity index 96% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java index 712789acdd..a5e8e68282 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingRegistrarTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -import com.alibaba.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ApplicationConfig; import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java similarity index 94% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java index c02a21dd1e..93c50d720f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigBindingsRegistrarTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -import com.alibaba.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ApplicationConfig; import org.junit.Assert; import org.junit.Test; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java similarity index 93% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java index 26a38f71e8..a1242337c6 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/DubboConfigConfigurationTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ModuleConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ModuleConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.RegistryConfig; import org.junit.After; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java similarity index 90% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java index 1673be10ce..1b85aa2190 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboConfigTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -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; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java similarity index 89% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java index c5018da252..834c773072 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/EnableDubboTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/EnableDubboTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation; +package org.apache.dubbo.config.spring.context.annotation; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.context.annotation.consumer.test.TestConsumerConfiguration; -import com.alibaba.dubbo.config.spring.context.annotation.provider.DemoServiceImpl; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.context.annotation.consumer.test.TestConsumerConfiguration; +import org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl; import org.junit.Assert; import org.junit.Test; import org.springframework.aop.support.AopUtils; @@ -133,8 +133,8 @@ public class EnableDubboTest { } - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.config.spring.context.annotation.provider") - @ComponentScan(basePackages = "com.alibaba.dubbo.config.spring.context.annotation.provider") + @EnableDubbo(scanBasePackages = "org.apache.dubbo.config.spring.context.annotation.provider") + @ComponentScan(basePackages = "org.apache.dubbo.config.spring.context.annotation.provider") @PropertySource("META-INF/dubbb-provider.properties") @EnableTransactionManagement public static class TestProviderConfiguration { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java index 3e6b46377b..4fb941fd8c 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/ConsumerConfiguration.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.consumer; +package org.apache.dubbo.config.spring.context.annotation.consumer; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.PropertySource; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java index 4edf2fc6bd..866964d4fd 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/consumer/test/TestConsumerConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.consumer.test; +package org.apache.dubbo.config.spring.context.annotation.consumer.test; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.context.annotation.EnableDubbo; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.PropertySource; import org.springframework.transaction.annotation.EnableTransactionManagement; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java similarity index 82% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java index fd70e821c0..bb5c7fd4c1 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.provider; +package org.apache.dubbo.config.spring.context.annotation.provider; -import com.alibaba.dubbo.config.spring.api.HelloService; +import org.apache.dubbo.config.spring.api.HelloService; import org.springframework.stereotype.Service; /** * Default {@link HelloService} annotation with Spring's {@link Service} - * and Dubbo's {@link com.alibaba.dubbo.config.annotation.Service} + * and Dubbo's {@link org.apache.dubbo.config.annotation.Service} * * @since TODO */ @Service -@com.alibaba.dubbo.config.annotation.Service +@org.apache.dubbo.config.annotation.Service public class DefaultHelloService implements HelloService { @Override diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java similarity index 87% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java index 9961aa27a8..1b21369f0f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/DemoServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.provider; +package org.apache.dubbo.config.spring.context.annotation.provider; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -27,7 +27,7 @@ import org.springframework.transaction.annotation.Transactional; * * @since 2.5.8 */ -@com.alibaba.dubbo.config.annotation.Service( +@org.apache.dubbo.config.annotation.Service( version = "2.5.7", application = "${demo.service.application}", protocol = "${demo.service.protocol}", diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java index 9d0fdbb19b..1c4b405a90 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/HelloServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.provider; +package org.apache.dubbo.config.spring.context.annotation.provider; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.config.spring.api.HelloService; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.config.spring.api.HelloService; /** * {@link HelloService} Implementation just annotating Dubbo's {@link Service} diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java similarity index 89% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java index ef2eeca888..0bafd9dac6 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/annotation/provider/ProviderConfiguration.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.annotation.provider; +package org.apache.dubbo.config.spring.context.annotation.provider; -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ProtocolConfig; -import com.alibaba.dubbo.config.RegistryConfig; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.config.ApplicationConfig; +import org.apache.dubbo.config.ProtocolConfig; +import org.apache.dubbo.config.RegistryConfig; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Primary; import org.springframework.context.annotation.PropertySource; @@ -29,7 +29,7 @@ import org.springframework.transaction.TransactionException; import org.springframework.transaction.TransactionStatus; import org.springframework.transaction.annotation.EnableTransactionManagement; -@DubboComponentScan(basePackages = "com.alibaba.dubbo.config.spring.context.annotation.provider") +@DubboComponentScan(basePackages = "org.apache.dubbo.config.spring.context.annotation.provider") @PropertySource("META-INF/default.properties") @EnableTransactionManagement public class ProviderConfiguration { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java index f0ec69f505..f6e741d17f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/context/properties/DefaultDubboConfigBinderTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.context.properties; +package org.apache.dubbo.config.spring.context.properties; -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; import org.junit.runner.RunWith; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java similarity index 96% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java index 51be7c3f2f..58efd7ad5c 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToMapConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.convert.converter; +package org.apache.dubbo.config.spring.convert.converter; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java similarity index 95% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java index 67e8247923..83fd804f22 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/convert/converter/StringArrayToStringConverterTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.convert.converter; +package org.apache.dubbo.config.spring.convert.converter; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/BeanForContext2.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/BeanForContext2.java similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/BeanForContext2.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/BeanForContext2.java index cc272d8477..e6583bf882 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/BeanForContext2.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/BeanForContext2.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.extension; +package org.apache.dubbo.config.spring.extension; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.impl.DemoServiceImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/SpringExtensionFactoryTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactoryTest.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/SpringExtensionFactoryTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactoryTest.java index 657d921251..73ca2eb730 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/extension/SpringExtensionFactoryTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/extension/SpringExtensionFactoryTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.extension; +package org.apache.dubbo.config.spring.extension; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.api.HelloService; -import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl; -import com.alibaba.dubbo.config.spring.impl.HelloServiceImpl; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.HelloService; +import org.apache.dubbo.config.spring.impl.DemoServiceImpl; +import org.apache.dubbo.config.spring.impl.HelloServiceImpl; import org.junit.After; import org.junit.Assert; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDao.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDao.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDao.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDao.java index 6f1449226c..ef04347e70 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDao.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDao.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.filter; +package org.apache.dubbo.config.spring.filter; /** * MockDao diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDaoImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDaoImpl.java similarity index 92% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDaoImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDaoImpl.java index 6d9f9730c2..bf02871e0a 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockDaoImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockDaoImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.filter; +package org.apache.dubbo.config.spring.filter; /** * MockDaoImpl diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockFilter.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockFilter.java similarity index 80% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockFilter.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockFilter.java index e4fc142a7c..486672887b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/filter/MockFilter.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/filter/MockFilter.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.filter; +package org.apache.dubbo.config.spring.filter; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.LoadBalance; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.LoadBalance; /** * MockFilter diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl.java similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl.java index 357d7dcc6a..148650e557 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoService; /** * DemoServiceImpl diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java index 3197a6609b..d503f75a82 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceImpl_LongWaiting.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoService; /** * DemoServiceImpl diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceSonImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceSonImpl.java similarity index 88% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceSonImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceSonImpl.java index e4df4cb910..6207d8ff8f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/DemoServiceSonImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/DemoServiceSonImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoServiceSon; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoServiceSon; public class DemoServiceSonImpl implements DemoServiceSon { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/HelloServiceImpl.java similarity index 90% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/HelloServiceImpl.java index f724a0872f..b4eacb4bd7 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/HelloServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/HelloServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.HelloService; +import org.apache.dubbo.config.spring.api.HelloService; public class HelloServiceImpl implements HelloService { diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBox.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBox.java similarity index 90% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBox.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBox.java index 196ce70ea1..eaba882ca0 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBox.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBox.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.Box; public class UnserializableBox implements Box { private static final long serialVersionUID = -4141012025649711421L; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java index 60cfa48d0b..11e910815b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/impl/UnserializableBoxDemoServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.impl; +package org.apache.dubbo.config.spring.impl; -import com.alibaba.dubbo.config.spring.api.Box; -import com.alibaba.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.api.Box; +import org.apache.dubbo.config.spring.api.DemoService; /** * DemoServiceImpl diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListenerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java similarity index 96% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListenerTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java index fdfe87ae1a..9b953d5ba7 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/initializer/DubboApplicationListenerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/initializer/DubboApplicationListenerTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.initializer; +package org.apache.dubbo.config.spring.initializer; -import com.alibaba.dubbo.config.DubboShutdownHook; +import org.apache.dubbo.config.DubboShutdownHook; import org.apache.dubbo.bootstrap.DubboBootstrap; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistry.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistry.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistry.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistry.java index 559a4e893b..bf6a7865f4 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistry.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistry.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.registry; +package org.apache.dubbo.config.spring.registry; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistryFactory.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistryFactory.java similarity index 88% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistryFactory.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistryFactory.java index f6082bfcb7..8d8eb7774d 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/registry/MockRegistryFactory.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/registry/MockRegistryFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.registry; +package org.apache.dubbo.config.spring.registry; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; import java.util.Collection; import java.util.HashMap; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java index 7b8665247f..05f0ec5b00 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/schema/DubboNamespaceHandlerTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.schema; +package org.apache.dubbo.config.spring.schema; -import com.alibaba.dubbo.config.ApplicationConfig; -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.spring.ConfigTest; -import com.alibaba.dubbo.config.spring.ServiceBean; -import com.alibaba.dubbo.config.spring.api.DemoService; -import com.alibaba.dubbo.config.spring.impl.DemoServiceImpl; +import org.apache.dubbo.config.ApplicationConfig; +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.spring.ConfigTest; +import org.apache.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.config.spring.api.DemoService; +import org.apache.dubbo.config.spring.impl.DemoServiceImpl; import org.junit.Test; import org.springframework.beans.factory.BeanCreationException; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -109,7 +109,7 @@ public class DubboNamespaceHandlerTest { Map providerConfigMap = ctx.getBeansOfType(ProviderConfig.class); - assertThat(providerConfigMap.get("com.alibaba.dubbo.config.ProviderConfig").getTimeout(), is(2000)); + assertThat(providerConfigMap.get("org.apache.dubbo.config.ProviderConfig").getTimeout(), is(2000)); } @Test diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusCheckerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java similarity index 96% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusCheckerTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java index 27ef3802d0..ee098cd7a2 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/DataSourceStatusCheckerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/DataSourceStatusCheckerTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.status; +package org.apache.dubbo.config.spring.status; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.config.spring.ServiceBean; import org.junit.Before; import org.junit.Test; import org.mockito.Answers; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/SpringStatusCheckerTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/SpringStatusCheckerTest.java similarity index 95% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/SpringStatusCheckerTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/SpringStatusCheckerTest.java index 1a57925c18..af151ca531 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/status/SpringStatusCheckerTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/status/SpringStatusCheckerTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.status; +package org.apache.dubbo.config.spring.status; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.config.spring.ServiceBean; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.config.spring.ServiceBean; import org.junit.Before; import org.junit.Test; import org.mockito.Mock; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/BeanFactoryUtilsTest.java similarity index 98% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/BeanFactoryUtilsTest.java index 70b013b52d..c33e9f3f14 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/BeanFactoryUtilsTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/BeanFactoryUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.util; +package org.apache.dubbo.config.spring.util; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/PropertySourcesUtilsTest.java similarity index 98% rename from dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java rename to dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/PropertySourcesUtilsTest.java index 2840ecf145..40481317ac 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/util/PropertySourcesUtilsTest.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/org/apache/dubbo/config/spring/util/PropertySourcesUtilsTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.config.spring.util; +package org.apache.dubbo.config.spring.util; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties index 0376ee82bf..6318375fb3 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbb-provider.properties @@ -1,7 +1,7 @@ # Dubbo Provider Properties as an alternative for # Spring XML Bean definition : META-INF/spring/dubbo-annotation-provider.xml -## Service Providers' Placeholders for com.alibaba.dubbo.config.spring.context.annotation.provider.DemoServiceImpl +## Service Providers' Placeholders for org.apache.dubbo.config.spring.context.annotation.provider.DemoServiceImpl demo.service.application = dubbo-annotation-provider demo.service.protocol = dubbo diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index a6fed7ef81..0000000000 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -mock=com.alibaba.dubbo.config.spring.registry.MockRegistryFactory \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index d979449c6f..0000000000 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -mymock=com.alibaba.dubbo.config.spring.filter.MockFilter \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..9c2176fd9e --- /dev/null +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1 @@ +mock=org.apache.dubbo.config.spring.registry.MockRegistryFactory \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..1adf5237ef --- /dev/null +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +mymock=org.apache.dubbo.config.spring.filter.MockFilter \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml index c3362fef2e..2de22f72fa 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-provider.xml @@ -31,8 +31,8 @@ + package="org.apache.dubbo.config.spring.context.annotation.provider , + org.apache.dubbo.config.spring.context.annotation.provider"/> diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml index 9604d4cd5e..dad39b9d73 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-provider.xml @@ -29,6 +29,6 @@ - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml index 546faffb83..63be60179c 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/log4j.xml @@ -23,7 +23,7 @@ - + diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-consumer.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml index 1f32ee2682..2a4a2c0357 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-consumer.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-consumer.xml @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-provider.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-provider.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-provider.xml index f7abac9fb3..290534f076 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-provider.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-provider.xml @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-consumer.xml similarity index 90% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-consumer.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-consumer.xml index be72b7a066..fb95cf91bb 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-consumer.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-consumer.xml @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-provider.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-provider.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-provider.xml index f7abac9fb3..290534f076 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/annotation-version-provider.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/annotation-version-provider.xml @@ -23,6 +23,6 @@ - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-byname.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-byname.xml similarity index 83% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-byname.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-byname.xml index 464a859509..20db016722 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-byname.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-byname.xml @@ -24,7 +24,7 @@ default-autowire="byName"> - + @@ -53,12 +53,12 @@ - - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-bytype.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-bytype.xml similarity index 83% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-bytype.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-bytype.xml index b0d4af6bf3..37aa81f1f8 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/aop-autowire-bytype.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/aop-autowire-bytype.xml @@ -24,7 +24,7 @@ default-autowire="byName"> - + @@ -53,11 +53,11 @@ - - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/consumer-notification.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/consumer-notification.xml similarity index 93% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/consumer-notification.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/consumer-notification.xml index f6b7ccc8d7..54eaf3a415 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/consumer-notification.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/consumer-notification.xml @@ -25,7 +25,7 @@ - + diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/customize-parameter.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/customize-parameter.xml similarity index 90% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/customize-parameter.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/customize-parameter.xml index 94ecbebdd5..3e603bc317 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/customize-parameter.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/customize-parameter.xml @@ -28,9 +28,9 @@ - + + interface="org.apache.dubbo.config.spring.api.DemoService"/> diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml similarity index 84% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml index 0fc5cb2ae3..1137f8c11a 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-fixed-time.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-fixed-time.xml @@ -27,8 +27,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml index 2efac44341..a83d89a111 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/delay-on-initialized.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/delay-on-initialized.xml @@ -31,8 +31,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-UnserializableBox.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-UnserializableBox.xml similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-UnserializableBox.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-UnserializableBox.xml index b3af6c5a9e..9cbceab174 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-UnserializableBox.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-UnserializableBox.xml @@ -31,8 +31,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-long-waiting.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-long-waiting.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-long-waiting.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-long-waiting.xml index e30af3418f..109f226f48 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-long-waiting.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-long-waiting.xml @@ -31,9 +31,9 @@ - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-no-methods-interface.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-no-methods-interface.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-no-methods-interface.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-no-methods-interface.xml index 87d10fea32..44a4bbc7f4 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider-no-methods-interface.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider-no-methods-interface.xml @@ -28,8 +28,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider.xml index 0749d27783..a811151e60 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/demo-provider.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/demo-provider.xml @@ -30,8 +30,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/generic-export.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/generic-export.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/generic-export.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/generic-export.xml index 85d684926b..481fecdbcd 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/generic-export.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/generic-export.xml @@ -31,9 +31,9 @@ - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-getUrls.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-getUrls.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-getUrls.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-getUrls.xml index 991416155d..674e787eb5 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-getUrls.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-getUrls.xml @@ -25,7 +25,7 @@ - diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-retry-false.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-retry-false.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-retry-false.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-retry-false.xml index 102940f88f..398923e895 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference-retry-false.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference-retry-false.xml @@ -25,7 +25,7 @@ - diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml similarity index 91% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml index cc01e19c5c..a6786c1b8b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/init-reference.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/init-reference.xml @@ -25,7 +25,7 @@ - \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-monitor.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-monitor.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-monitor.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-monitor.xml index badcc2ab95..1ef53b5bea 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-monitor.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-monitor.xml @@ -29,11 +29,11 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-default.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-default.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-default.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-default.xml index b85e892834..2898ed804f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-default.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-default.xml @@ -33,8 +33,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-error.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-error.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-error.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-error.xml index 3431f9483f..4f2f4059d6 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-error.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-error.xml @@ -33,8 +33,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-register.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-register.xml similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-register.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-register.xml index 66be4ac3af..8cbe70ff7f 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol-register.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol-register.xml @@ -33,8 +33,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol.xml similarity index 85% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol.xml index 376036a976..c3b8107406 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-protocol.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-protocol.xml @@ -33,8 +33,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-registry.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-registry.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-registry.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-registry.xml index 05afda816b..17992d12ae 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/multi-registry.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/multi-registry.xml @@ -35,8 +35,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-multi-protocol.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml similarity index 87% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-multi-protocol.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml index d35ef9ccdd..80fd28f9d7 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-multi-protocol.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-multi-protocol.xml @@ -34,8 +34,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-protocol.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-protocol.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-protocol.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-protocol.xml index dc84cb8c25..511b8c9904 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/override-protocol.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/override-protocol.xml @@ -31,8 +31,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-multi.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml similarity index 78% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-multi.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml index 6a2d2e9e33..673cab155b 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-multi.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-multi.xml @@ -29,17 +29,17 @@ - + - - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-nested-service.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-nested-service.xml similarity index 79% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-nested-service.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-nested-service.xml index ae57146a9e..9e8c0618a8 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-nested-service.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-nested-service.xml @@ -29,14 +29,14 @@ - + - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-module.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-module.xml similarity index 82% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-module.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-module.xml index faaee83a58..504d8edf10 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-module.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-module.xml @@ -29,15 +29,15 @@ - + - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-monitor.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-monitor.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-monitor.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-monitor.xml index 86c860ecd7..b99e240873 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/provider-with-monitor.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/provider-with-monitor.xml @@ -29,9 +29,9 @@ - + - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/service-class.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/service-class.xml similarity index 87% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/service-class.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/service-class.xml index 7b2cb0f500..548e360e80 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/service-class.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/service-class.xml @@ -28,8 +28,8 @@ - + diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/spring-extension-inject.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/spring-extension-inject.xml similarity index 81% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/spring-extension-inject.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/spring-extension-inject.xml index c541276f24..d51bc04b01 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/spring-extension-inject.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/spring-extension-inject.xml @@ -27,12 +27,12 @@ - + - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override-default.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override-default.xml similarity index 84% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override-default.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override-default.xml index a46eca1b85..8fc74a71d6 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override-default.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override-default.xml @@ -22,9 +22,9 @@ "> - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override.xml similarity index 89% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override.xml index afa36db16b..55568781da 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/system-properties-override.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/system-properties-override.xml @@ -31,9 +31,9 @@ - - + \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/xml-override-properties.xml b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/xml-override-properties.xml similarity index 86% rename from dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/xml-override-properties.xml rename to dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/xml-override-properties.xml index befe9b43bd..b915ac27a4 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/com/alibaba/dubbo/config/spring/xml-override-properties.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/org/apache/dubbo/config/spring/xml-override-properties.xml @@ -31,9 +31,9 @@ - - + \ No newline at end of file diff --git a/dubbo-container/dubbo-container-api/pom.xml b/dubbo-container/dubbo-container-api/pom.xml index 6d0bfc176a..76c9893872 100644 --- a/dubbo-container/dubbo-container-api/pom.xml +++ b/dubbo-container/dubbo-container-api/pom.xml @@ -44,7 +44,7 @@ true - com.alibaba.dubbo.container.Main + org.apache.dubbo.container.Main diff --git a/dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Container.java b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java similarity index 89% rename from dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Container.java rename to dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java index e8a7274963..ec552959fa 100644 --- a/dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Container.java +++ b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Container.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container; +package org.apache.dubbo.container; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; /** * Container. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Main.java b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java similarity index 90% rename from dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Main.java rename to dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java index 36eb9ae47d..80646ae7bb 100644 --- a/dubbo-container/dubbo-container-api/src/main/java/com/alibaba/dubbo/container/Main.java +++ b/dubbo-container/dubbo-container-api/src/main/java/org/apache/dubbo/container/Main.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container; +package org.apache.dubbo.container; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConfigUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat index 8b1de2a6a5..8a6ed9c723 100644 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat +++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.bat @@ -15,15 +15,15 @@ if "%JAVA_VERSION%" GEQ %JAVA_8_VERSION% set VM_ARGS=%VM_ARGS_METASPACE_SIZE% if ""%1"" == ""debug"" goto debug if ""%1"" == ""jmx"" goto jmx -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -classpath ..\conf;%LIB_JARS% com.alibaba.dubbo.container.Main +java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main goto end :debug -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -classpath ..\conf;%LIB_JARS% com.alibaba.dubbo.container.Main +java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main goto end :jmx -java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -classpath ..\conf;%LIB_JARS% com.alibaba.dubbo.container.Main +java -Xms64m -Xmx1024m -XX:%VM_ARGS%=64M -Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.ssl=false -Dcom.sun.management.jmxremote.authenticate=false -classpath ..\conf;%LIB_JARS% org.apache.dubbo.container.Main :end pause \ No newline at end of file diff --git a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh index bbe013b1e2..595b7695d4 100755 --- a/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh +++ b/dubbo-container/dubbo-container-api/src/main/resources/META-INF/assembly/bin/start.sh @@ -82,7 +82,7 @@ else fi echo -e "Starting the $SERVER_NAME ...\c" -nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS com.alibaba.dubbo.container.Main > $STDOUT_FILE 2>&1 & +nohup java $JAVA_OPTS $JAVA_MEM_OPTS $JAVA_DEBUG_OPTS $JAVA_JMX_OPTS -classpath $CONF_DIR:$LIB_JARS org.apache.dubbo.container.Main > $STDOUT_FILE 2>&1 & COUNT=0 while [ $COUNT -lt 1 ]; do diff --git a/dubbo-container/dubbo-container-log4j/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java b/dubbo-container/dubbo-container-log4j/src/main/java/org/apache/dubbo/container/log4j/Log4jContainer.java similarity index 94% rename from dubbo-container/dubbo-container-log4j/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java rename to dubbo-container/dubbo-container-log4j/src/main/java/org/apache/dubbo/container/log4j/Log4jContainer.java index 378e958714..3938e427aa 100644 --- a/dubbo-container/dubbo-container-log4j/src/main/java/com/alibaba/dubbo/container/log4j/Log4jContainer.java +++ b/dubbo-container/dubbo-container-log4j/src/main/java/org/apache/dubbo/container/log4j/Log4jContainer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.log4j; +package org.apache.dubbo.container.log4j; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.container.Container; import org.apache.log4j.Appender; import org.apache.log4j.FileAppender; diff --git a/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container b/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container deleted file mode 100644 index 2b2fc2d475..0000000000 --- a/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container +++ /dev/null @@ -1 +0,0 @@ -log4j=com.alibaba.dubbo.container.log4j.Log4jContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container b/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container new file mode 100644 index 0000000000..0b4c162a6a --- /dev/null +++ b/dubbo-container/dubbo-container-log4j/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container @@ -0,0 +1 @@ +log4j=org.apache.dubbo.container.log4j.Log4jContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-log4j/src/test/java/com/alibaba/dubbo/container/log4j/Log4jContainerTest.java b/dubbo-container/dubbo-container-log4j/src/test/java/org/apache/dubbo/container/log4j/Log4jContainerTest.java similarity index 85% rename from dubbo-container/dubbo-container-log4j/src/test/java/com/alibaba/dubbo/container/log4j/Log4jContainerTest.java rename to dubbo-container/dubbo-container-log4j/src/test/java/org/apache/dubbo/container/log4j/Log4jContainerTest.java index 90d355b7e3..b34d643930 100644 --- a/dubbo-container/dubbo-container-log4j/src/test/java/com/alibaba/dubbo/container/log4j/Log4jContainerTest.java +++ b/dubbo-container/dubbo-container-log4j/src/test/java/org/apache/dubbo/container/log4j/Log4jContainerTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.log4j; +package org.apache.dubbo.container.log4j; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.container.Container; import org.junit.Test; diff --git a/dubbo-container/dubbo-container-logback/src/main/java/com/alibaba/dubbo/container/logback/LogbackContainer.java b/dubbo-container/dubbo-container-logback/src/main/java/org/apache/dubbo/container/logback/LogbackContainer.java similarity index 95% rename from dubbo-container/dubbo-container-logback/src/main/java/com/alibaba/dubbo/container/logback/LogbackContainer.java rename to dubbo-container/dubbo-container-logback/src/main/java/org/apache/dubbo/container/logback/LogbackContainer.java index d4ae533e7c..080b8ae6bc 100644 --- a/dubbo-container/dubbo-container-logback/src/main/java/com/alibaba/dubbo/container/logback/LogbackContainer.java +++ b/dubbo-container/dubbo-container-logback/src/main/java/org/apache/dubbo/container/logback/LogbackContainer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.logback; +package org.apache.dubbo.container.logback; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.container.Container; import ch.qos.logback.classic.Level; import ch.qos.logback.classic.Logger; diff --git a/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container b/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container deleted file mode 100644 index 80c0143fb7..0000000000 --- a/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container +++ /dev/null @@ -1 +0,0 @@ -logback=com.alibaba.dubbo.container.logback.LogbackContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container b/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container new file mode 100644 index 0000000000..04c4eaa39a --- /dev/null +++ b/dubbo-container/dubbo-container-logback/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container @@ -0,0 +1 @@ +logback=org.apache.dubbo.container.logback.LogbackContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-logback/src/test/java/com/alibaba/dubbo/container/logback/LogbackContainerTest.java b/dubbo-container/dubbo-container-logback/src/test/java/org/apache/dubbo/container/logback/LogbackContainerTest.java similarity index 85% rename from dubbo-container/dubbo-container-logback/src/test/java/com/alibaba/dubbo/container/logback/LogbackContainerTest.java rename to dubbo-container/dubbo-container-logback/src/test/java/org/apache/dubbo/container/logback/LogbackContainerTest.java index f0a8f3a709..abf90f5df8 100644 --- a/dubbo-container/dubbo-container-logback/src/test/java/com/alibaba/dubbo/container/logback/LogbackContainerTest.java +++ b/dubbo-container/dubbo-container-logback/src/test/java/org/apache/dubbo/container/logback/LogbackContainerTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.logback; +package org.apache.dubbo.container.logback; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.container.Container; import org.junit.Test; diff --git a/dubbo-container/dubbo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java b/dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java similarity index 84% rename from dubbo-container/dubbo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java rename to dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java index d4c03c6799..9aa9ca5c83 100644 --- a/dubbo-container/dubbo-container-spring/src/main/java/com/alibaba/dubbo/container/spring/SpringContainer.java +++ b/dubbo-container/dubbo-container-spring/src/main/java/org/apache/dubbo/container/spring/SpringContainer.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.spring; +package org.apache.dubbo.container.spring; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.config.spring.initializer.DubboApplicationListener; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.config.spring.initializer.DubboApplicationListener; +import org.apache.dubbo.container.Container; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container b/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container deleted file mode 100644 index 95141b18f9..0000000000 --- a/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.container.Container +++ /dev/null @@ -1 +0,0 @@ -spring=com.alibaba.dubbo.container.spring.SpringContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container b/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container new file mode 100644 index 0000000000..84eed43295 --- /dev/null +++ b/dubbo-container/dubbo-container-spring/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.container.Container @@ -0,0 +1 @@ +spring=org.apache.dubbo.container.spring.SpringContainer \ No newline at end of file diff --git a/dubbo-container/dubbo-container-spring/src/test/java/com/alibaba/dubbo/container/spring/SpringContainerTest.java b/dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java similarity index 87% rename from dubbo-container/dubbo-container-spring/src/test/java/com/alibaba/dubbo/container/spring/SpringContainerTest.java rename to dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java index c3c8a6804d..3822da718b 100644 --- a/dubbo-container/dubbo-container-spring/src/test/java/com/alibaba/dubbo/container/spring/SpringContainerTest.java +++ b/dubbo-container/dubbo-container-spring/src/test/java/org/apache/dubbo/container/spring/SpringContainerTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.container.spring; +package org.apache.dubbo.container.spring; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.container.Container; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.container.Container; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml b/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml index 9b704c6639..282519cea4 100644 --- a/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml +++ b/dubbo-container/dubbo-container-spring/src/test/resources/META-INF/spring/test.xml @@ -19,6 +19,6 @@ xmlns="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.3.xsd"> - + \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoService.java b/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoService.java similarity index 94% rename from dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoService.java rename to dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoService.java index 6369c9785a..1172c9be0f 100644 --- a/dubbo-demo/dubbo-demo-api/src/main/java/com/alibaba/dubbo/demo/DemoService.java +++ b/dubbo-demo/dubbo-demo-api/src/main/java/org/apache/dubbo/demo/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.demo; +package org.apache.dubbo.demo; public interface DemoService { diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java b/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java similarity index 95% rename from dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java rename to dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java index d6a8335710..384ff2db7f 100644 --- a/dubbo-demo/dubbo-demo-consumer/src/main/java/com/alibaba/dubbo/demo/consumer/Consumer.java +++ b/dubbo-demo/dubbo-demo-consumer/src/main/java/org/apache/dubbo/demo/consumer/Consumer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.demo.consumer; +package org.apache.dubbo.demo.consumer; -import com.alibaba.dubbo.demo.DemoService; +import org.apache.dubbo.demo.DemoService; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml index a3ddebcc2e..a56a10ee7e 100644 --- a/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml +++ b/dubbo-demo/dubbo-demo-consumer/src/main/resources/META-INF/spring/dubbo-demo-consumer.xml @@ -30,6 +30,6 @@ - + \ No newline at end of file diff --git a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java b/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java similarity index 88% rename from dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java rename to dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java index c501196397..004f48d98b 100644 --- a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/DemoServiceImpl.java +++ b/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/DemoServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.demo.provider; +package org.apache.dubbo.demo.provider; -import com.alibaba.dubbo.demo.DemoService; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.demo.DemoService; +import org.apache.dubbo.rpc.RpcContext; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java b/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java similarity index 97% rename from dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java rename to dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java index e5069ec62b..6c15ad22ee 100644 --- a/dubbo-demo/dubbo-demo-provider/src/main/java/com/alibaba/dubbo/demo/provider/Provider.java +++ b/dubbo-demo/dubbo-demo-provider/src/main/java/org/apache/dubbo/demo/provider/Provider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.demo.provider; +package org.apache.dubbo.demo.provider; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml index 727954bce0..c2ab4a21e0 100644 --- a/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml +++ b/dubbo-demo/dubbo-demo-provider/src/main/resources/META-INF/spring/dubbo-demo-provider.xml @@ -31,9 +31,9 @@ - + - + \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/Cache.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java similarity index 93% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/Cache.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java index d4116307f1..4ba84eb31e 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/Cache.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/Cache.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache; +package org.apache.dubbo.cache; /** * Cache diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/CacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java similarity index 79% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/CacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java index df31f7da9f..2fabd94a5f 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/CacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/CacheFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache; +package org.apache.dubbo.cache; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.rpc.Invocation; /** * CacheFactory diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/filter/CacheFilter.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java similarity index 76% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/filter/CacheFilter.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java index e034cbbc96..f7e362ba58 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/filter/CacheFilter.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/filter/CacheFilter.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.filter; +package org.apache.dubbo.cache.filter; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.CacheFactory; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.CacheFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; /** * CacheFilter diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/AbstractCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java similarity index 83% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/AbstractCacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java index e4cc98af29..ad95e770e0 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/AbstractCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/AbstractCacheFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support; +package org.apache.dubbo.cache.support; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.CacheFactory; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.CacheFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCache.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java similarity index 92% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCache.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java index 570d98a60d..9fd61f5950 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCache.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCache.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.expiring; +package org.apache.dubbo.cache.support.expiring; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.common.URL; import java.util.Map; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java similarity index 84% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java index e8e27f2bdc..381a04ee24 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.expiring; +package org.apache.dubbo.cache.support.expiring; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.common.URL; /** * ExpiringCacheFactory diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringMap.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java similarity index 99% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringMap.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java index 8f05412cdb..c3cb373bc0 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/expiring/ExpiringMap.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/expiring/ExpiringMap.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.expiring; +package org.apache.dubbo.cache.support.expiring; import java.util.Collection; import java.util.List; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCache.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java similarity index 91% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCache.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java index 314c6500fa..2a28204573 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCache.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCache.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.jcache; +package org.apache.dubbo.cache.support.jcache; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import javax.cache.Cache; import javax.cache.CacheException; @@ -32,7 +32,7 @@ import java.util.concurrent.TimeUnit; /** * JCache */ -public class JCache implements com.alibaba.dubbo.cache.Cache { +public class JCache implements org.apache.dubbo.cache.Cache { private final Cache store; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java similarity index 81% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java index 737d192f54..bd1e9d5c61 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/jcache/JCacheFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.jcache; +package org.apache.dubbo.cache.support.jcache; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.common.URL; /** * JCacheFactory diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCache.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java similarity index 85% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCache.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java index 4fe5248fb6..11a00ac60c 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCache.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCache.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.lru; +package org.apache.dubbo.cache.support.lru; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.LRUCache; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.LRUCache; import java.util.Map; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java similarity index 82% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java index 2c7b28d319..775cdd0237 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/lru/LruCacheFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.lru; +package org.apache.dubbo.cache.support.lru; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.common.URL; /** * LruCacheFactory diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCache.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java similarity index 89% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCache.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java index bf8fbab1eb..4b557bebbb 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCache.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCache.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.threadlocal; +package org.apache.dubbo.cache.support.threadlocal; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.common.URL; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java similarity index 82% rename from dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java rename to dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java index 693d33eb09..e456f2696b 100644 --- a/dubbo-filter/dubbo-filter-cache/src/main/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java +++ b/dubbo-filter/dubbo-filter-cache/src/main/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.threadlocal; +package org.apache.dubbo.cache.support.threadlocal; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.common.URL; /** * ThreadLocalCacheFactory diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.cache.CacheFactory b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.cache.CacheFactory deleted file mode 100644 index 65185d83c6..0000000000 --- a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.cache.CacheFactory +++ /dev/null @@ -1,4 +0,0 @@ -threadlocal=com.alibaba.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory -lru=com.alibaba.dubbo.cache.support.lru.LruCacheFactory -jcache=com.alibaba.dubbo.cache.support.jcache.JCacheFactory -expiring=com.alibaba.dubbo.cache.support.expiring.ExpiringCacheFactory \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index ec25092d12..0000000000 --- a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -cache=com.alibaba.dubbo.cache.filter.CacheFilter \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory new file mode 100644 index 0000000000..c849461da1 --- /dev/null +++ b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory @@ -0,0 +1,4 @@ +threadlocal=org.apache.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory +lru=org.apache.dubbo.cache.support.lru.LruCacheFactory +jcache=org.apache.dubbo.cache.support.jcache.JCacheFactory +expiring=org.apache.dubbo.cache.support.expiring.ExpiringCacheFactory \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..8d6259b306 --- /dev/null +++ b/dubbo-filter/dubbo-filter-cache/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +cache=org.apache.dubbo.cache.filter.CacheFilter \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/filter/CacheFilterTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java similarity index 90% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/filter/CacheFilterTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java index 582f0227ce..c51bce79b9 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/filter/CacheFilterTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/filter/CacheFilterTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.filter; +package org.apache.dubbo.cache.filter; -import com.alibaba.dubbo.cache.CacheFactory; -import com.alibaba.dubbo.cache.support.expiring.ExpiringCacheFactory; -import com.alibaba.dubbo.cache.support.jcache.JCacheFactory; -import com.alibaba.dubbo.cache.support.lru.LruCacheFactory; -import com.alibaba.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.cache.CacheFactory; +import org.apache.dubbo.cache.support.expiring.ExpiringCacheFactory; +import org.apache.dubbo.cache.support.jcache.JCacheFactory; +import org.apache.dubbo.cache.support.lru.LruCacheFactory; +import org.apache.dubbo.cache.support.threadlocal.ThreadLocalCacheFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/AbstractCacheFactoryTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java similarity index 84% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/AbstractCacheFactoryTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java index 6f0297fe8d..f93a453eeb 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/AbstractCacheFactoryTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/AbstractCacheFactoryTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support; +package org.apache.dubbo.cache.support; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcInvocation; public abstract class AbstractCacheFactoryTest { diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java similarity index 85% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java index cbb7bc527d..0deb996ad5 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/expiring/ExpiringCacheFactoryTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.expiring; +package org.apache.dubbo.cache.support.expiring; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.cache.support.AbstractCacheFactoryTest; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.cache.support.AbstractCacheFactoryTest; import org.junit.Test; import static org.hamcrest.core.Is.is; diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactoryTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java similarity index 83% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactoryTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java index 7a4aea84f8..bd701bd60c 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/jcache/JCacheFactoryTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/jcache/JCacheFactoryTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.jcache; +package org.apache.dubbo.cache.support.jcache; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.cache.support.AbstractCacheFactoryTest; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.cache.support.AbstractCacheFactoryTest; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcInvocation; import org.junit.Test; import static org.hamcrest.core.Is.is; diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactoryTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java similarity index 85% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactoryTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java index 5f828820b0..f266b42f8b 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/lru/LruCacheFactoryTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/lru/LruCacheFactoryTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.lru; +package org.apache.dubbo.cache.support.lru; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.cache.support.AbstractCacheFactoryTest; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.cache.support.AbstractCacheFactoryTest; import org.junit.Test; import static org.hamcrest.core.Is.is; diff --git a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java similarity index 85% rename from dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java rename to dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java index eac77781e3..542fdc5551 100644 --- a/dubbo-filter/dubbo-filter-cache/src/test/java/com/alibaba/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java +++ b/dubbo-filter/dubbo-filter-cache/src/test/java/org/apache/dubbo/cache/support/threadlocal/ThreadLocalCacheFactoryTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.cache.support.threadlocal; +package org.apache.dubbo.cache.support.threadlocal; -import com.alibaba.dubbo.cache.Cache; -import com.alibaba.dubbo.cache.support.AbstractCacheFactory; -import com.alibaba.dubbo.cache.support.AbstractCacheFactoryTest; +import org.apache.dubbo.cache.Cache; +import org.apache.dubbo.cache.support.AbstractCacheFactory; +import org.apache.dubbo.cache.support.AbstractCacheFactoryTest; import org.junit.Test; import static org.hamcrest.core.Is.is; diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java similarity index 97% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java index 9ce72a5eff..ca41a520d1 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/MethodValidated.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/MethodValidated.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation; +package org.apache.dubbo.validation; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java similarity index 79% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validation.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java index 8933307888..1cf10225fb 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validation.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validation.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation; +package org.apache.dubbo.validation; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * Validation diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java similarity index 93% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validator.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java index 85515bf619..cea93d85fe 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/Validator.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/Validator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation; +package org.apache.dubbo.validation; /** * Validator diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/filter/ValidationFilter.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java similarity index 76% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/filter/ValidationFilter.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java index 1fe717cf40..e22908067e 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/filter/ValidationFilter.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/filter/ValidationFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.filter; +package org.apache.dubbo.validation.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.validation.Validation; -import com.alibaba.dubbo.validation.Validator; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.validation.Validation; +import org.apache.dubbo.validation.Validator; /** * ValidationFilter diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/AbstractValidation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java similarity index 86% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/AbstractValidation.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java index 4ffad494bd..0f1f629512 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/AbstractValidation.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/AbstractValidation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support; +package org.apache.dubbo.validation.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.validation.Validation; -import com.alibaba.dubbo.validation.Validator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.validation.Validation; +import org.apache.dubbo.validation.Validator; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidation.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java similarity index 80% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidation.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java index ecbfec68f7..8e04ba5f22 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidation.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation; +package org.apache.dubbo.validation.support.jvalidation; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.validation.Validator; -import com.alibaba.dubbo.validation.support.AbstractValidation; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.validation.Validator; +import org.apache.dubbo.validation.support.AbstractValidation; /** * JValidation diff --git a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java similarity index 95% rename from dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java rename to dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java index 507c4e4239..328c54c749 100644 --- a/dubbo-filter/dubbo-filter-validation/src/main/java/com/alibaba/dubbo/validation/support/jvalidation/JValidator.java +++ b/dubbo-filter/dubbo-filter-validation/src/main/java/org/apache/dubbo/validation/support/jvalidation/JValidator.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation; +package org.apache.dubbo.validation.support.jvalidation; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.bytecode.ClassGenerator; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.validation.MethodValidated; -import com.alibaba.dubbo.validation.Validator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.bytecode.ClassGenerator; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.validation.MethodValidated; +import org.apache.dubbo.validation.Validator; import javassist.ClassPool; import javassist.CtClass; diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 2e3e5b3575..0000000000 --- a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -validation=com.alibaba.dubbo.validation.filter.ValidationFilter \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.validation.Validation b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.validation.Validation deleted file mode 100644 index 7f344d42ee..0000000000 --- a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.validation.Validation +++ /dev/null @@ -1 +0,0 @@ -jvalidation=com.alibaba.dubbo.validation.support.jvalidation.JValidation \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..65bf329f39 --- /dev/null +++ b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +validation=org.apache.dubbo.validation.filter.ValidationFilter \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation new file mode 100644 index 0000000000..ae3dc967a7 --- /dev/null +++ b/dubbo-filter/dubbo-filter-validation/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.validation.Validation @@ -0,0 +1 @@ +jvalidation=org.apache.dubbo.validation.support.jvalidation.JValidation \ No newline at end of file diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/filter/ValidationFilterTest.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java similarity index 96% rename from dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/filter/ValidationFilterTest.java rename to dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java index c1a0ae1ade..fe0f10cab7 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/filter/ValidationFilterTest.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/filter/ValidationFilterTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.filter; +package org.apache.dubbo.validation.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.*; -import com.alibaba.dubbo.validation.Validation; -import com.alibaba.dubbo.validation.Validator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.*; +import org.apache.dubbo.validation.Validation; +import org.apache.dubbo.validation.Validator; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidationTest.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java similarity index 75% rename from dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidationTest.java rename to dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java index 81708043f0..4a7cda6301 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidationTest.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidationTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation; +package org.apache.dubbo.validation.support.jvalidation; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.validation.Validation; -import com.alibaba.dubbo.validation.Validator; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.validation.Validation; +import org.apache.dubbo.validation.Validator; import org.junit.Test; import javax.validation.ValidationException; @@ -30,15 +30,15 @@ public class JValidationTest { @Test(expected = ValidationException.class) public void testReturnTypeWithInvalidValidationProvider() throws Exception { Validation jValidation = new JValidation(); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.JValidation?" + - "jvalidation=com.alibaba.dubbo.validation.Validation"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.JValidation?" + + "jvalidation=org.apache.dubbo.validation.Validation"); jValidation.getValidator(url); } @Test public void testReturnTypeWithDefaultValidatorProvider() throws Exception { Validation jValidation = new JValidation(); - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.JValidation"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.JValidation"); Validator validator = jValidation.getValidator(url); assertThat(validator instanceof JValidator, is(true)); } diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidatorTest.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java similarity index 74% rename from dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidatorTest.java rename to dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java index 6669a19015..1bff36e863 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/JValidatorTest.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/JValidatorTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation; +package org.apache.dubbo.validation.support.jvalidation; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.validation.support.jvalidation.mock.ValidationParameter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.validation.support.jvalidation.mock.ValidationParameter; import org.junit.Test; import javax.validation.ConstraintViolationException; @@ -25,28 +25,28 @@ import javax.validation.ConstraintViolationException; public class JValidatorTest { @Test(expected = NoSuchMethodException.class) public void testItWithNonExistMethod() throws Exception { - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); JValidator jValidator = new JValidator(url); jValidator.validate("nonExistingMethod", new Class[]{String.class}, new Object[]{"arg1"}); } @Test public void testItWithExistMethod() throws Exception { - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); JValidator jValidator = new JValidator(url); jValidator.validate("someMethod1", new Class[]{String.class}, new Object[]{"anything"}); } @Test(expected = ConstraintViolationException.class) public void testItWhenItViolatedConstraint() throws Exception { - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); JValidator jValidator = new JValidator(url); jValidator.validate("someMethod2", new Class[]{ValidationParameter.class}, new Object[]{new ValidationParameter()}); } @Test public void testItWhenItMeetsConstraint() throws Exception { - URL url = URL.valueOf("test://test:11/com.alibaba.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); + URL url = URL.valueOf("test://test:11/org.apache.dubbo.validation.support.jvalidation.mock.JValidatorTestTarget"); JValidator jValidator = new JValidator(url); jValidator.validate("someMethod2", new Class[]{ValidationParameter.class}, new Object[]{new ValidationParameter("NotBeNull")}); } diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java similarity index 90% rename from dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java rename to dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java index 5939396e47..2b33579c68 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/JValidatorTestTarget.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation.mock; +package org.apache.dubbo.validation.support.jvalidation.mock; -import com.alibaba.dubbo.validation.MethodValidated; +import org.apache.dubbo.validation.MethodValidated; import javax.validation.constraints.NotNull; diff --git a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/ValidationParameter.java b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java similarity index 94% rename from dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/ValidationParameter.java rename to dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java index f4c0619e3b..0b54a047ae 100644 --- a/dubbo-filter/dubbo-filter-validation/src/test/java/com/alibaba/dubbo/validation/support/jvalidation/mock/ValidationParameter.java +++ b/dubbo-filter/dubbo-filter-validation/src/test/java/org/apache/dubbo/validation/support/jvalidation/mock/ValidationParameter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.validation.support.jvalidation.mock; +package org.apache.dubbo.validation.support.jvalidation.mock; import javax.validation.constraints.NotNull; diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/Monitor.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/Monitor.java similarity index 82% rename from dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/Monitor.java rename to dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/Monitor.java index d37293c822..910029f32a 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/Monitor.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/Monitor.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor; +package org.apache.dubbo.monitor; -import com.alibaba.dubbo.common.Node; +import org.apache.dubbo.common.Node; /** * Monitor. (SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.monitor.MonitorFactory#getMonitor(com.alibaba.dubbo.common.URL) + * @see org.apache.dubbo.monitor.MonitorFactory#getMonitor(org.apache.dubbo.common.URL) */ public interface Monitor extends Node, MonitorService { diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java similarity index 83% rename from dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java rename to dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java index cfbf5221f7..1024fc81f7 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor; +package org.apache.dubbo.monitor; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * MonitorFactory. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorService.java similarity index 93% rename from dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java rename to dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorService.java index b4e0fdcff2..e6b9050126 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/MonitorService.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/MonitorService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor; +package org.apache.dubbo.monitor; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import java.util.List; diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/AbstractMonitorFactory.java similarity index 87% rename from dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java rename to dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/AbstractMonitorFactory.java index 0a60951eae..737e2e406c 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/AbstractMonitorFactory.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.support; +package org.apache.dubbo.monitor.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.concurrent.ListenableFuture; -import com.alibaba.dubbo.common.concurrent.ListenableFutureTask; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorFactory; -import com.alibaba.dubbo.monitor.MonitorService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.concurrent.ListenableFuture; +import org.apache.dubbo.common.concurrent.ListenableFutureTask; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.monitor.MonitorService; import java.util.Collection; import java.util.Collections; diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java similarity index 87% rename from dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java rename to dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java index 221c869b7f..a82fe5440e 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/main/java/com/alibaba/dubbo/monitor/support/MonitorFilter.java +++ b/dubbo-monitor/dubbo-monitor-api/src/main/java/org/apache/dubbo/monitor/support/MonitorFilter.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.support; +package org.apache.dubbo.monitor.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorFactory; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.support.RpcUtils; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 832b9cdc49..0000000000 --- a/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1 +0,0 @@ -monitor=com.alibaba.dubbo.monitor.support.MonitorFilter \ No newline at end of file diff --git a/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..1fd771694f --- /dev/null +++ b/dubbo-monitor/dubbo-monitor-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1 @@ +monitor=org.apache.dubbo.monitor.support.MonitorFilter \ No newline at end of file diff --git a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/AbstractMonitorFactoryTest.java similarity index 93% rename from dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java rename to dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/AbstractMonitorFactoryTest.java index 64847af251..65f80f9932 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/AbstractMonitorFactoryTest.java +++ b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/AbstractMonitorFactoryTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.support; +package org.apache.dubbo.monitor.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorFactory; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java similarity index 91% rename from dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java rename to dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java index 3450eb438e..ae9a509178 100644 --- a/dubbo-monitor/dubbo-monitor-api/src/test/java/com/alibaba/dubbo/monitor/support/MonitorFilterTest.java +++ b/dubbo-monitor/dubbo-monitor-api/src/test/java/org/apache/dubbo/monitor/support/MonitorFilterTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.support; +package org.apache.dubbo.monitor.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorFactory; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; import org.junit.Assert; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java similarity index 93% rename from dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java rename to dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java index 964cae339e..6dd4415655 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitor.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitor.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.rpc.Invoker; import java.util.List; import java.util.Map; diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactory.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java similarity index 81% rename from dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactory.java rename to dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java index 1a5ea26709..e563741630 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactory.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.monitor.support.AbstractMonitorFactory; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.monitor.support.AbstractMonitorFactory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; /** * DefaultMonitorFactory diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/Statistics.java b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/Statistics.java similarity index 94% rename from dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/Statistics.java rename to dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/Statistics.java index 3cd4f49f5f..cf9138ec7f 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/main/java/com/alibaba/dubbo/monitor/dubbo/Statistics.java +++ b/dubbo-monitor/dubbo-monitor-default/src/main/java/org/apache/dubbo/monitor/dubbo/Statistics.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.monitor.MonitorService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.monitor.MonitorService; import java.io.Serializable; diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.monitor.MonitorFactory b/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.monitor.MonitorFactory deleted file mode 100644 index 3f759a1f5b..0000000000 --- a/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.monitor.MonitorFactory +++ /dev/null @@ -1 +0,0 @@ -dubbo=com.alibaba.dubbo.monitor.dubbo.DubboMonitorFactory \ No newline at end of file diff --git a/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory b/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory new file mode 100644 index 0000000000..62701cc4c5 --- /dev/null +++ b/dubbo-monitor/dubbo-monitor-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory @@ -0,0 +1 @@ +dubbo=org.apache.dubbo.monitor.dubbo.DubboMonitorFactory \ No newline at end of file diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java similarity index 89% rename from dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java rename to dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java index 759a0d97eb..bb3c5bb556 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorFactoryTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import org.junit.Before; import org.junit.Test; import org.mockito.ArgumentCaptor; diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorTest.java similarity index 92% rename from dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java rename to dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorTest.java index 8d5ec578cb..08493d7d92 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/DubboMonitorTest.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/DubboMonitorTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.monitor.Monitor; -import com.alibaba.dubbo.monitor.MonitorFactory; -import com.alibaba.dubbo.monitor.MonitorService; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.monitor.Monitor; +import org.apache.dubbo.monitor.MonitorFactory; +import org.apache.dubbo.monitor.MonitorService; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import org.hamcrest.CustomMatcher; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MockMonitorService.java similarity index 87% rename from dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java rename to dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MockMonitorService.java index 41d3d0945f..77be5359e3 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/MockMonitorService.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/MockMonitorService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.monitor.MonitorService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.monitor.MonitorService; import java.util.Arrays; import java.util.List; diff --git a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/StatisticsTest.java b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/StatisticsTest.java similarity index 97% rename from dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/StatisticsTest.java rename to dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/StatisticsTest.java index 1a644e15c0..cd182c043e 100644 --- a/dubbo-monitor/dubbo-monitor-default/src/test/java/com/alibaba/dubbo/monitor/dubbo/StatisticsTest.java +++ b/dubbo-monitor/dubbo-monitor-default/src/test/java/org/apache/dubbo/monitor/dubbo/StatisticsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.monitor.dubbo; +package org.apache.dubbo.monitor.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.monitor.MonitorService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.monitor.MonitorService; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java similarity index 91% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java index 731abb9e0a..ac9a3fede8 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/BaseCommand.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/BaseCommand.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI public interface BaseCommand { diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java index 995ed0223b..744a8c6dac 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContext.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; import io.netty.channel.Channel; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java index 1f28ab3fd6..7f3ce9a13c 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandContextFactory.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandContextFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; public class CommandContextFactory { public static CommandContext newInstance(String commandName){ diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandExecutor.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandExecutor.java index 15663a348d..d60115c51a 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/CommandExecutor.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/CommandExecutor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; public interface CommandExecutor { /** diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java similarity index 93% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java index 9603705cd4..342f256de1 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/DefaultCommandExecutor.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/DefaultCommandExecutor.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; -import com.alibaba.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.extension.ExtensionLoader; public class DefaultCommandExecutor implements CommandExecutor { @Override diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/NoSuchCommandException.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/NoSuchCommandException.java index 4b4437504a..1d7396bdb4 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/NoSuchCommandException.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/NoSuchCommandException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command; +package org.apache.dubbo.qos.command; public class NoSuchCommandException extends Exception { public NoSuchCommandException(String msg) { diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/annotation/Cmd.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/annotation/Cmd.java index 3fc63a7a53..dfeb9b8cfa 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/annotation/Cmd.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/annotation/Cmd.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.annotation; +package org.apache.dubbo.qos.command.annotation; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java similarity index 95% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java index 4e96df6cfe..5a16a136e0 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/HttpCommandDecoder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/HttpCommandDecoder.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.decoder; +package org.apache.dubbo.qos.command.decoder; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.CommandContextFactory; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.CommandContextFactory; import io.netty.handler.codec.http.HttpMethod; import io.netty.handler.codec.http.HttpRequest; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java similarity index 87% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java index e8ff7e4bc2..8dfd039a1d 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/decoder/TelnetCommandDecoder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/decoder/TelnetCommandDecoder.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.decoder; +package org.apache.dubbo.qos.command.decoder; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.CommandContextFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.CommandContextFactory; public class TelnetCommandDecoder { diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Help.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Help.java similarity index 91% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Help.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Help.java index fd490f8693..ba370ccd85 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Help.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Help.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.impl; +package org.apache.dubbo.qos.command.impl; -import com.alibaba.dubbo.qos.command.BaseCommand; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.annotation.Cmd; -import com.alibaba.dubbo.qos.command.util.CommandHelper; -import com.alibaba.dubbo.qos.textui.TTable; +import org.apache.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.annotation.Cmd; +import org.apache.dubbo.qos.command.util.CommandHelper; +import org.apache.dubbo.qos.textui.TTable; import java.util.Collections; import java.util.Comparator; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Ls.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java similarity index 86% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Ls.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java index 5a9a69b0af..94fb0e96f7 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Ls.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Ls.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.impl; +package org.apache.dubbo.qos.command.impl; -import com.alibaba.dubbo.config.model.ApplicationModel; -import com.alibaba.dubbo.config.model.ConsumerModel; -import com.alibaba.dubbo.config.model.ProviderModel; -import com.alibaba.dubbo.qos.command.BaseCommand; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.annotation.Cmd; -import com.alibaba.dubbo.qos.textui.TTable; -import com.alibaba.dubbo.registry.support.ConsumerInvokerWrapper; -import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; -import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; +import org.apache.dubbo.config.model.ApplicationModel; +import org.apache.dubbo.config.model.ConsumerModel; +import org.apache.dubbo.config.model.ProviderModel; +import org.apache.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.annotation.Cmd; +import org.apache.dubbo.qos.textui.TTable; +import org.apache.dubbo.registry.support.ConsumerInvokerWrapper; +import org.apache.dubbo.registry.support.ProviderConsumerRegTable; +import org.apache.dubbo.registry.support.ProviderInvokerWrapper; import java.util.Collection; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Offline.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java similarity index 78% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Offline.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java index 76995b0c50..59ac30d47e 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Offline.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Offline.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.impl; +package org.apache.dubbo.qos.command.impl; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.model.ApplicationModel; -import com.alibaba.dubbo.config.model.ProviderModel; -import com.alibaba.dubbo.qos.command.BaseCommand; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.annotation.Cmd; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; -import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.model.ApplicationModel; +import org.apache.dubbo.config.model.ProviderModel; +import org.apache.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.annotation.Cmd; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.support.ProviderConsumerRegTable; +import org.apache.dubbo.registry.support.ProviderInvokerWrapper; import java.util.List; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Online.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java similarity index 78% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Online.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java index 80e8142645..20714d4c20 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Online.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Online.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.impl; +package org.apache.dubbo.qos.command.impl; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.config.model.ApplicationModel; -import com.alibaba.dubbo.config.model.ProviderModel; -import com.alibaba.dubbo.qos.command.BaseCommand; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.annotation.Cmd; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; -import com.alibaba.dubbo.registry.support.ProviderInvokerWrapper; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.config.model.ApplicationModel; +import org.apache.dubbo.config.model.ProviderModel; +import org.apache.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.annotation.Cmd; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.support.ProviderConsumerRegTable; +import org.apache.dubbo.registry.support.ProviderInvokerWrapper; import java.util.List; import java.util.Set; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Quit.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java similarity index 80% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Quit.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java index 9236b95593..9539db9dea 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/impl/Quit.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/Quit.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.impl; +package org.apache.dubbo.qos.command.impl; -import com.alibaba.dubbo.qos.command.BaseCommand; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.annotation.Cmd; -import com.alibaba.dubbo.qos.common.QosConstants; +import org.apache.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.annotation.Cmd; +import org.apache.dubbo.qos.common.QosConstants; @Cmd(name = "quit",summary = "quit telnet console") public class Quit implements BaseCommand { diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java similarity index 92% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java index 860f7eab8e..46da57b776 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/command/util/CommandHelper.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/util/CommandHelper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.command.util; +package org.apache.dubbo.qos.command.util; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.qos.command.BaseCommand; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.qos.command.BaseCommand; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/QosConstants.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/common/QosConstants.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/QosConstants.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/common/QosConstants.java index a8eb0d9587..f4bf6e7194 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/common/QosConstants.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/common/QosConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.common; +package org.apache.dubbo.qos.common; public interface QosConstants { diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java similarity index 82% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java index 26692cc82b..05656f9ae6 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/protocol/QosProtocolWrapper.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/protocol/QosProtocolWrapper.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.protocol; +package org.apache.dubbo.qos.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.qos.server.Server; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.qos.server.Server; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; import java.util.concurrent.atomic.AtomicBoolean; -import static com.alibaba.dubbo.common.Constants.ACCEPT_FOREIGN_IP; -import static com.alibaba.dubbo.common.Constants.QOS_ENABLE; -import static com.alibaba.dubbo.common.Constants.QOS_PORT; +import static org.apache.dubbo.common.Constants.ACCEPT_FOREIGN_IP; +import static org.apache.dubbo.common.Constants.QOS_ENABLE; +import static org.apache.dubbo.common.Constants.QOS_PORT; public class QosProtocolWrapper implements Protocol { private static AtomicBoolean hasStarted = new AtomicBoolean(false); @@ -83,7 +83,7 @@ public class QosProtocolWrapper implements Protocol { int port = Integer.parseInt(url.getParameter(QOS_PORT,"22222")); boolean acceptForeignIp = Boolean.parseBoolean(url.getParameter(ACCEPT_FOREIGN_IP,"true")); - Server server = com.alibaba.dubbo.qos.server.Server.getInstance(); + Server server = org.apache.dubbo.qos.server.Server.getInstance(); server.setPort(port); server.setAcceptForeignIp(acceptForeignIp); server.start(); diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java index c5bec0cecd..e25613a160 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/DubboLogo.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/DubboLogo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server; +package org.apache.dubbo.qos.server; public class DubboLogo { public static String dubbo = diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/Server.java similarity index 95% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/Server.java index 83a1ca997b..fae0ac4dad 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/Server.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/Server.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server; +package org.apache.dubbo.qos.server; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.qos.server.handler.QosProcessHandler; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.qos.server.handler.QosProcessHandler; import io.netty.bootstrap.ServerBootstrap; import io.netty.channel.Channel; import io.netty.channel.ChannelInitializer; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/HttpProcessHandler.java similarity index 91% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/HttpProcessHandler.java index d73b21a9e8..b7fea07aca 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/HttpProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/HttpProcessHandler.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server.handler; +package org.apache.dubbo.qos.server.handler; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.CommandExecutor; -import com.alibaba.dubbo.qos.command.DefaultCommandExecutor; -import com.alibaba.dubbo.qos.command.NoSuchCommandException; -import com.alibaba.dubbo.qos.command.decoder.HttpCommandDecoder; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.CommandExecutor; +import org.apache.dubbo.qos.command.DefaultCommandExecutor; +import org.apache.dubbo.qos.command.NoSuchCommandException; +import org.apache.dubbo.qos.command.decoder.HttpCommandDecoder; import io.netty.buffer.Unpooled; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java similarity index 94% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java index ed4c478904..2194b728e0 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/LocalHostPermitHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/LocalHostPermitHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server.handler; +package org.apache.dubbo.qos.server.handler; -import com.alibaba.dubbo.qos.common.QosConstants; +import org.apache.dubbo.qos.common.QosConstants; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java index 47d65d77b1..80274173c6 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/QosProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/QosProcessHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server.handler; +package org.apache.dubbo.qos.server.handler; import io.netty.buffer.ByteBuf; import io.netty.buffer.Unpooled; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/TelnetProcessHandler.java similarity index 83% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/TelnetProcessHandler.java index 34cc4172af..f1c02094a1 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/server/handler/TelnetProcessHandler.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/server/handler/TelnetProcessHandler.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.server.handler; +package org.apache.dubbo.qos.server.handler; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.qos.command.CommandContext; -import com.alibaba.dubbo.qos.command.CommandExecutor; -import com.alibaba.dubbo.qos.command.DefaultCommandExecutor; -import com.alibaba.dubbo.qos.command.NoSuchCommandException; -import com.alibaba.dubbo.qos.command.decoder.TelnetCommandDecoder; -import com.alibaba.dubbo.qos.common.QosConstants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.qos.command.CommandContext; +import org.apache.dubbo.qos.command.CommandExecutor; +import org.apache.dubbo.qos.command.DefaultCommandExecutor; +import org.apache.dubbo.qos.command.NoSuchCommandException; +import org.apache.dubbo.qos.command.decoder.TelnetCommandDecoder; +import org.apache.dubbo.qos.common.QosConstants; import io.netty.channel.ChannelFutureListener; import io.netty.channel.ChannelHandlerContext; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TComponent.java similarity index 95% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TComponent.java index 6f1d5313c8..7f0c003ed2 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TComponent.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TComponent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; /** * render component diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TKv.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TKv.java index f61833d988..7f53a48c15 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TKv.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TKv.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.StringUtils; import java.util.Scanner; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TLadder.java similarity index 95% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TLadder.java index ded5810b3a..4ef0404d64 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TLadder.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TLadder.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import java.util.ArrayList; import java.util.List; -import static com.alibaba.dubbo.common.utils.StringUtils.repeat; +import static org.apache.dubbo.common.utils.StringUtils.repeat; /** * Ladder diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java index 3add25f4fd..74372e5c57 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTable.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTable.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.Scanner; -import static com.alibaba.dubbo.common.utils.StringUtils.EMPTY; -import static com.alibaba.dubbo.common.utils.StringUtils.length; -import static com.alibaba.dubbo.common.utils.StringUtils.repeat; -import static com.alibaba.dubbo.common.utils.StringUtils.replace; +import static org.apache.dubbo.common.utils.StringUtils.EMPTY; +import static org.apache.dubbo.common.utils.StringUtils.length; +import static org.apache.dubbo.common.utils.StringUtils.repeat; +import static org.apache.dubbo.common.utils.StringUtils.replace; import static java.lang.Math.abs; import static java.lang.Math.max; import static java.lang.String.format; diff --git a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTree.java similarity index 96% rename from dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java rename to dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTree.java index 7220d61a87..70e14e9588 100644 --- a/dubbo-plugin/dubbo-qos/src/main/java/com/alibaba/dubbo/qos/textui/TTree.java +++ b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/textui/TTree.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import java.io.StringReader; import java.util.ArrayList; import java.util.List; import java.util.Scanner; -import static com.alibaba.dubbo.common.utils.StringUtils.EMPTY; -import static com.alibaba.dubbo.common.utils.StringUtils.length; -import static com.alibaba.dubbo.common.utils.StringUtils.repeat; +import static org.apache.dubbo.common.utils.StringUtils.EMPTY; +import static org.apache.dubbo.common.utils.StringUtils.length; +import static org.apache.dubbo.common.utils.StringUtils.repeat; import static java.lang.System.currentTimeMillis; /** diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand deleted file mode 100644 index 116a29cf77..0000000000 --- a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand +++ /dev/null @@ -1,5 +0,0 @@ -online=com.alibaba.dubbo.qos.command.impl.Online -help=com.alibaba.dubbo.qos.command.impl.Help -quit=com.alibaba.dubbo.qos.command.impl.Quit -ls=com.alibaba.dubbo.qos.command.impl.Ls -offline=com.alibaba.dubbo.qos.command.impl.Offline \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 72316732d7..0000000000 --- a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -qos=com.alibaba.dubbo.qos.protocol.QosProtocolWrapper \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand new file mode 100644 index 0000000000..d74a141256 --- /dev/null +++ b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand @@ -0,0 +1,5 @@ +online=org.apache.dubbo.qos.command.impl.Online +help=org.apache.dubbo.qos.command.impl.Help +quit=org.apache.dubbo.qos.command.impl.Quit +ls=org.apache.dubbo.qos.command.impl.Ls +offline=org.apache.dubbo.qos.command.impl.Offline \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..eab582ba4e --- /dev/null +++ b/dubbo-plugin/dubbo-qos/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +qos=org.apache.dubbo.qos.protocol.QosProtocolWrapper \ No newline at end of file diff --git a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TKvTest.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java rename to dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TKvTest.java index b23595b885..e5d629b743 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TKvTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TKvTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import org.junit.Test; diff --git a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TLadderTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TLadderTest.java similarity index 97% rename from dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TLadderTest.java rename to dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TLadderTest.java index 36f1101156..dab25e09c0 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TLadderTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TLadderTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import org.junit.Test; diff --git a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTableTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTableTest.java similarity index 98% rename from dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTableTest.java rename to dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTableTest.java index 597b77b6e8..888b3f56ad 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTableTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTableTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import org.junit.Test; diff --git a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTreeTest.java b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTreeTest.java similarity index 97% rename from dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTreeTest.java rename to dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTreeTest.java index ac89477e92..61e84ba685 100644 --- a/dubbo-plugin/dubbo-qos/src/test/java/com/alibaba/dubbo/qos/textui/TTreeTest.java +++ b/dubbo-plugin/dubbo-qos/src/test/java/org/apache/dubbo/qos/textui/TTreeTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.qos.textui; +package org.apache.dubbo.qos.textui; import org.junit.Test; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/NotifyListener.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/NotifyListener.java similarity index 89% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/NotifyListener.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/NotifyListener.java index 964aab0630..0e41cc90c0 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/NotifyListener.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/NotifyListener.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; import java.util.List; /** * NotifyListener. (API, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.registry.RegistryService#subscribe(URL, NotifyListener) + * @see org.apache.dubbo.registry.RegistryService#subscribe(URL, NotifyListener) */ public interface NotifyListener { @@ -37,7 +37,7 @@ public interface NotifyListener { * 4. If a data type is empty, need to notify a empty protocol with category parameter identification of url data.
    * 5. The order of notifications to be guaranteed by the notifications(That is, the implementation of the registry). Such as: single thread push, queue serialization, and version comparison.
    * - * @param urls The list of registered information , is always not empty. The meaning is the same as the return value of {@link com.alibaba.dubbo.registry.RegistryService#lookup(URL)}. + * @param urls The list of registered information , is always not empty. The meaning is the same as the return value of {@link org.apache.dubbo.registry.RegistryService#lookup(URL)}. */ void notify(List urls); diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/Registry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/Registry.java similarity index 77% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/Registry.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/Registry.java index 94b519df0d..835c27a291 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/Registry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/Registry.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; -import com.alibaba.dubbo.common.Node; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Node; +import org.apache.dubbo.common.URL; /** * Registry. (SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.registry.RegistryFactory#getRegistry(URL) - * @see com.alibaba.dubbo.registry.support.AbstractRegistry + * @see org.apache.dubbo.registry.RegistryFactory#getRegistry(URL) + * @see org.apache.dubbo.registry.support.AbstractRegistry */ public interface Registry extends Node, RegistryService { } \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryFactory.java similarity index 85% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryFactory.java index b7eca34b19..5db2e77d59 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryFactory.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * RegistryFactory. (SPI, Singleton, ThreadSafe) * - * @see com.alibaba.dubbo.registry.support.AbstractRegistryFactory + * @see org.apache.dubbo.registry.support.AbstractRegistryFactory */ @SPI("dubbo") public interface RegistryFactory { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryService.java similarity index 81% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryService.java index 2494d1e2d6..53a5c102eb 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/RegistryService.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/RegistryService.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; import java.util.List; /** * RegistryService. (SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.registry.Registry - * @see com.alibaba.dubbo.registry.RegistryFactory#getRegistry(URL) + * @see org.apache.dubbo.registry.Registry + * @see org.apache.dubbo.registry.RegistryFactory#getRegistry(URL) */ public interface RegistryService { @@ -38,7 +38,7 @@ public interface RegistryService { * 4. When the registry is restarted, network jitter, data can not be lost, including automatically deleting data from the broken line.
    * 5. Allow URLs which have the same URL but different parameters to coexist,they can't cover each other.
    * - * @param url Registration information , is not allowed to be empty, e.g: dubbo://10.20.153.10/com.alibaba.foo.BarService?version=1.0.0&application=kylin + * @param url Registration information , is not allowed to be empty, e.g: dubbo://10.20.153.10/org.apache.dubbo.foo.BarService?version=1.0.0&application=kylin */ void register(URL url); @@ -49,7 +49,7 @@ public interface RegistryService { * 1. If it is the persistent stored data of dynamic=false, the registration data can not be found, then the IllegalStateException is thrown, otherwise it is ignored.
    * 2. Unregister according to the full url match.
    * - * @param url Registration information , is not allowed to be empty, e.g: dubbo://10.20.153.10/com.alibaba.foo.BarService?version=1.0.0&application=kylin + * @param url Registration information , is not allowed to be empty, e.g: dubbo://10.20.153.10/org.apache.dubbo.foo.BarService?version=1.0.0&application=kylin */ void unregister(URL url); @@ -59,13 +59,13 @@ public interface RegistryService { * Subscribing need to support contracts:
    * 1. When the URL sets the check=false parameter. When the registration fails, the exception is not thrown and retried in the background.
    * 2. When URL sets category=routers, it only notifies the specified classification data. Multiple classifications are separated by commas, and allows asterisk to match, which indicates that all categorical data are subscribed.
    - * 3. Allow interface, group, version, and classifier as a conditional query, e.g.: interface=com.alibaba.foo.BarService&version=1.0.0
    + * 3. Allow interface, group, version, and classifier as a conditional query, e.g.: interface=org.apache.dubbo.foo.BarService&version=1.0.0
    * 4. And the query conditions allow the asterisk to be matched, subscribe to all versions of all the packets of all interfaces, e.g. :interface=*&group=*&version=*&classifier=*
    * 5. When the registry is restarted and network jitter, it is necessary to automatically restore the subscription request.
    * 6. Allow URLs which have the same URL but different parameters to coexist,they can't cover each other.
    * 7. The subscription process must be blocked, when the first notice is finished and then returned.
    * - * @param url Subscription condition, not allowed to be empty, e.g. consumer://10.20.153.10/com.alibaba.foo.BarService?version=1.0.0&application=kylin + * @param url Subscription condition, not allowed to be empty, e.g. consumer://10.20.153.10/org.apache.dubbo.foo.BarService?version=1.0.0&application=kylin * @param listener A listener of the change event, not allowed to be empty */ void subscribe(URL url, NotifyListener listener); @@ -77,7 +77,7 @@ public interface RegistryService { * 1. If don't subscribe, ignore it directly.
    * 2. Unsubscribe by full URL match.
    * - * @param url Subscription condition, not allowed to be empty, e.g. consumer://10.20.153.10/com.alibaba.foo.BarService?version=1.0.0&application=kylin + * @param url Subscription condition, not allowed to be empty, e.g. consumer://10.20.153.10/org.apache.dubbo.foo.BarService?version=1.0.0&application=kylin * @param listener A listener of the change event, not allowed to be empty */ void unsubscribe(URL url, NotifyListener listener); @@ -85,9 +85,9 @@ public interface RegistryService { /** * Query the registered data that matches the conditions. Corresponding to the push mode of the subscription, this is the pull mode and returns only one result. * - * @param url Query condition, is not allowed to be empty, e.g. consumer://10.20.153.10/com.alibaba.foo.BarService?version=1.0.0&application=kylin - * @return The registered information list, which may be empty, the meaning is the same as the parameters of {@link com.alibaba.dubbo.registry.NotifyListener#notify(List)}. - * @see com.alibaba.dubbo.registry.NotifyListener#notify(List) + * @param url Query condition, is not allowed to be empty, e.g. consumer://10.20.153.10/org.apache.dubbo.foo.BarService?version=1.0.0&application=kylin + * @return The registered information list, which may be empty, the meaning is the same as the parameters of {@link org.apache.dubbo.registry.NotifyListener#notify(List)}. + * @see org.apache.dubbo.registry.NotifyListener#notify(List) */ List lookup(URL url); diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java similarity index 93% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java index 4bd0908a1e..f444971838 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryDirectory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryDirectory.java @@ -14,33 +14,33 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.integration; +package org.apache.dubbo.registry.integration; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Configurator; -import com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.RouterFactory; -import com.alibaba.dubbo.rpc.cluster.directory.AbstractDirectory; -import com.alibaba.dubbo.rpc.cluster.directory.StaticDirectory; -import com.alibaba.dubbo.rpc.cluster.support.ClusterUtils; -import com.alibaba.dubbo.rpc.protocol.InvokerWrapper; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Configurator; +import org.apache.dubbo.rpc.cluster.ConfiguratorFactory; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.RouterFactory; +import org.apache.dubbo.rpc.cluster.directory.AbstractDirectory; +import org.apache.dubbo.rpc.cluster.directory.StaticDirectory; +import org.apache.dubbo.rpc.cluster.support.ClusterUtils; +import org.apache.dubbo.rpc.protocol.InvokerWrapper; +import org.apache.dubbo.rpc.support.RpcUtils; import java.util.ArrayList; import java.util.Collection; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java similarity index 90% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java index e077eed20c..b1e4c3d349 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/integration/RegistryProtocol.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java @@ -14,30 +14,30 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.integration; +package org.apache.dubbo.registry.integration; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.registry.support.ProviderConsumerRegTable; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.cluster.Cluster; -import com.alibaba.dubbo.rpc.cluster.Configurator; -import com.alibaba.dubbo.rpc.protocol.InvokerWrapper; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.registry.support.ProviderConsumerRegTable; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.rpc.cluster.Configurator; +import org.apache.dubbo.rpc.protocol.InvokerWrapper; import java.util.ArrayList; import java.util.HashMap; @@ -47,11 +47,11 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import static com.alibaba.dubbo.common.Constants.ACCEPT_FOREIGN_IP; -import static com.alibaba.dubbo.common.Constants.INTERFACES; -import static com.alibaba.dubbo.common.Constants.QOS_ENABLE; -import static com.alibaba.dubbo.common.Constants.QOS_PORT; -import static com.alibaba.dubbo.common.Constants.VALIDATION_KEY; +import static org.apache.dubbo.common.Constants.ACCEPT_FOREIGN_IP; +import static org.apache.dubbo.common.Constants.INTERFACES; +import static org.apache.dubbo.common.Constants.QOS_ENABLE; +import static org.apache.dubbo.common.Constants.QOS_PORT; +import static org.apache.dubbo.common.Constants.VALIDATION_KEY; /** * RegistryProtocol @@ -363,7 +363,7 @@ public class RegistryProtocol implements Protocol { } /** - * @param urls The list of registered information , is always not empty, The meaning is the same as the return value of {@link com.alibaba.dubbo.registry.RegistryService#lookup(URL)}. + * @param urls The list of registered information , is always not empty, The meaning is the same as the return value of {@link org.apache.dubbo.registry.RegistryService#lookup(URL)}. */ @Override public synchronized void notify(List urls) { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/status/RegistryStatusChecker.java similarity index 82% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/status/RegistryStatusChecker.java index e0772d6c31..4e64cf7ca9 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/status/RegistryStatusChecker.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/status/RegistryStatusChecker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.status; +package org.apache.dubbo.registry.status; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; import java.util.Collection; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java similarity index 94% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java index 8ece0a6b4d..406b8a81a3 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistry.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; import java.io.File; import java.io.FileInputStream; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactory.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java similarity index 86% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactory.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java index 5bf35f7f62..4c83ea315f 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/AbstractRegistryFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.RegistryService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.RegistryService; import java.util.Collection; import java.util.Collections; @@ -33,7 +33,7 @@ import java.util.concurrent.locks.ReentrantLock; /** * AbstractRegistryFactory. (SPI, Singleton, ThreadSafe) * - * @see com.alibaba.dubbo.registry.RegistryFactory + * @see org.apache.dubbo.registry.RegistryFactory */ public abstract class AbstractRegistryFactory implements RegistryFactory { diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ConsumerInvokerWrapper.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ConsumerInvokerWrapper.java similarity index 88% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ConsumerInvokerWrapper.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ConsumerInvokerWrapper.java index 879ea28f96..141634de25 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ConsumerInvokerWrapper.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ConsumerInvokerWrapper.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.integration.RegistryDirectory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.integration.RegistryDirectory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; /** * @date 2017/11/23 diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/FailbackRegistry.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/FailbackRegistry.java similarity index 96% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/FailbackRegistry.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/FailbackRegistry.java index e081957e68..5c456d5287 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/FailbackRegistry.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/FailbackRegistry.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.registry.NotifyListener; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.registry.NotifyListener; import java.util.HashMap; import java.util.HashSet; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderConsumerRegTable.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderConsumerRegTable.java similarity index 93% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderConsumerRegTable.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderConsumerRegTable.java index 8e5d333643..e36e734b9c 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderConsumerRegTable.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderConsumerRegTable.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.registry.integration.RegistryDirectory; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.registry.integration.RegistryDirectory; +import org.apache.dubbo.rpc.Invoker; import java.util.Collections; import java.util.Set; diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderInvokerWrapper.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderInvokerWrapper.java similarity index 90% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderInvokerWrapper.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderInvokerWrapper.java index 10d5957695..88177ab13c 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/ProviderInvokerWrapper.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/ProviderInvokerWrapper.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; /** * @date 2017/11/23 diff --git a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/SkipFailbackWrapperException.java b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/SkipFailbackWrapperException.java similarity index 96% rename from dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/SkipFailbackWrapperException.java rename to dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/SkipFailbackWrapperException.java index 836f599d0b..c0cb04861b 100644 --- a/dubbo-registry/dubbo-registry-api/src/main/java/com/alibaba/dubbo/registry/support/SkipFailbackWrapperException.java +++ b/dubbo-registry/dubbo-registry-api/src/main/java/org/apache/dubbo/registry/support/SkipFailbackWrapperException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; /** * Wrapper Exception, it is used to indicate that {@link FailbackRegistry} skips Failback. diff --git a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker deleted file mode 100644 index f519702bd1..0000000000 --- a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker +++ /dev/null @@ -1 +0,0 @@ -registry=com.alibaba.dubbo.registry.status.RegistryStatusChecker \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index e499fe3840..0000000000 --- a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -registry=com.alibaba.dubbo.registry.integration.RegistryProtocol \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker new file mode 100644 index 0000000000..4ebdb604e5 --- /dev/null +++ b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker @@ -0,0 +1 @@ +registry=org.apache.dubbo.registry.status.RegistryStatusChecker \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..c2da9112e8 --- /dev/null +++ b/dubbo-registry/dubbo-registry-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +registry=org.apache.dubbo.registry.integration.RegistryProtocol \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java similarity index 83% rename from dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceRegistryTest.java rename to dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java index ed2cef6e72..67bda752f0 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceRegistryTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; import junit.framework.TestCase; import org.junit.Test; @@ -50,7 +50,7 @@ public class PerformanceRegistryTest extends TestCase { new Thread(new Runnable() { public void run() { for (int j = 0; j < runs; j++) { - registry.register(URL.valueOf("remote://" + NetUtils.getLocalHost() + ":8080/demoService" + t + "_" + j + "?version=1.0.0&application=demo&dubbo=2.0&interface=" + "com.alibaba.dubbo.demo.DemoService" + (base + t) + "_" + (base + j))); + registry.register(URL.valueOf("remote://" + NetUtils.getLocalHost() + ":8080/demoService" + t + "_" + j + "?version=1.0.0&application=demo&dubbo=2.0&interface=" + "org.apache.dubbo.demo.DemoService" + (base + t) + "_" + (base + j))); } } }).start(); diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceUtils.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceUtils.java similarity index 96% rename from dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceUtils.java rename to dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceUtils.java index 634fccfc34..84051db489 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/PerformanceUtils.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/PerformanceUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry; +package org.apache.dubbo.registry; import java.net.NetworkInterface; import java.net.SocketException; diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactoryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryFactoryTest.java similarity index 89% rename from dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactoryTest.java rename to dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryFactoryTest.java index 327f9f54ff..616a4076c4 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/AbstractRegistryFactoryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/AbstractRegistryFactoryTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/FailbackRegistryTest.java b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java similarity index 93% rename from dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/FailbackRegistryTest.java rename to dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java index ed01fce499..5e50c31147 100644 --- a/dubbo-registry/dubbo-registry-api/src/test/java/com/alibaba/dubbo/registry/support/FailbackRegistryTest.java +++ b/dubbo-registry/dubbo-registry-api/src/test/java/org/apache/dubbo/registry/support/FailbackRegistryTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.support; +package org.apache.dubbo.registry.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.CollectionUtils; -import com.alibaba.dubbo.registry.NotifyListener; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.CollectionUtils; +import org.apache.dubbo.registry.NotifyListener; import org.junit.Before; import org.junit.Test; @@ -46,14 +46,14 @@ public class FailbackRegistryTest { */ @Before public void setUp() throws Exception { - service = "com.alibaba.dubbo.test.DemoService"; + service = "org.apache.dubbo.test.DemoService"; serviceUrl = URL.valueOf("remote://127.0.0.1/demoservice?method=get"); registryUrl = URL.valueOf("http://1.2.3.4:9090/registry?check=false&file=N/A").addParameter(Constants.REGISTRY_RETRY_PERIOD_KEY, String.valueOf(FAILED_PERIOD)); } /** * Test method for - * {@link com.alibaba.dubbo.registry.support.FailbackRegistry#retry()}. + * {@link org.apache.dubbo.registry.support.FailbackRegistry#retry()}. * * @throws Exception */ diff --git a/dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistry.java b/dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistry.java similarity index 87% rename from dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistry.java rename to dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistry.java index bf8056e627..60b4636d5b 100644 --- a/dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistry.java +++ b/dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistry.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.registry.support.FailbackRegistry; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.registry.support.FailbackRegistry; +import org.apache.dubbo.rpc.Invoker; import java.util.List; import java.util.concurrent.Executors; diff --git a/dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java b/dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistryFactory.java similarity index 84% rename from dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java rename to dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistryFactory.java index 6a2d5ca88d..574ba776b3 100644 --- a/dubbo-registry/dubbo-registry-default/src/main/java/com/alibaba/dubbo/registry/dubbo/DubboRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-default/src/main/java/org/apache/dubbo/registry/dubbo/DubboRegistryFactory.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.registry.integration.RegistryDirectory; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.cluster.Cluster; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.registry.integration.RegistryDirectory; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.cluster.Cluster; import java.util.ArrayList; import java.util.Arrays; diff --git a/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index 55d739de33..0000000000 --- a/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -dubbo=com.alibaba.dubbo.registry.dubbo.DubboRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..a2c6f12ea0 --- /dev/null +++ b/dubbo-registry/dubbo-registry-default/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1 @@ +dubbo=org.apache.dubbo.registry.dubbo.DubboRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/AbstractRegistryService.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/AbstractRegistryService.java similarity index 93% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/AbstractRegistryService.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/AbstractRegistryService.java index 67665b3433..b4c8926a3d 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/AbstractRegistryService.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/AbstractRegistryService.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.RegistryService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.RegistryService; import java.util.ArrayList; import java.util.Collections; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/DemoService.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DemoService.java similarity index 93% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/DemoService.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DemoService.java index e1a710689d..f47febb970 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/DemoService.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; /** * TestService diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockChannel.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockChannel.java similarity index 89% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockChannel.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockChannel.java index 581a4ff997..fa061b9969 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockChannel.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockChannel.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ResponseFuture; import java.net.InetSocketAddress; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockedClient.java similarity index 89% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockedClient.java index f1a2e53f08..f1341ef71f 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/MockedClient.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/MockedClient.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ResponseCallback; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ResponseCallback; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.Replier; import java.net.InetSocketAddress; import java.util.Map; @@ -283,7 +283,7 @@ public class MockedClient implements ExchangeClient { } @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { } } diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java similarity index 95% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java index 3463407f92..95459b282b 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryDirectoryTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryDirectoryTest.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.integration.RegistryDirectory; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.cluster.Router; -import com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance; -import com.alibaba.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance; -import com.alibaba.dubbo.rpc.cluster.router.script.ScriptRouter; -import com.alibaba.dubbo.rpc.cluster.router.script.ScriptRouterFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.integration.RegistryDirectory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.cluster.Router; +import org.apache.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance; +import org.apache.dubbo.rpc.cluster.loadbalance.RoundRobinLoadBalance; +import org.apache.dubbo.rpc.cluster.router.script.ScriptRouter; +import org.apache.dubbo.rpc.cluster.router.script.ScriptRouterFactory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java similarity index 84% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java index 57eb695b38..46f06774bd 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryProtocolTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryProtocolTest.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.integration.RegistryProtocol; -import com.alibaba.dubbo.registry.support.AbstractRegistry; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.cluster.support.FailfastCluster; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboInvoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.integration.RegistryProtocol; +import org.apache.dubbo.registry.support.AbstractRegistry; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.cluster.support.FailfastCluster; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboInvoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import org.junit.Assert; import org.junit.Test; @@ -52,7 +52,7 @@ public class RegistryProtocolTest { SimpleRegistryExporter.exportIfAbsent(9090); } - final String service = "com.alibaba.dubbo.registry.protocol.DemoService:1.0.0"; + final String service = "org.apache.dubbo.registry.protocol.DemoService:1.0.0"; final String serviceUrl = "dubbo://127.0.0.1:9453/" + service + "?notify=true&methods=test1,test2&side=con&side=consumer"; final URL registryUrl = URL.valueOf("registry://127.0.0.1:9090/"); final private Protocol protocol = ExtensionLoader.getExtensionLoader(Protocol.class).getAdaptiveExtension(); @@ -133,7 +133,7 @@ public class RegistryProtocolTest { RegistryProtocol rprotocol = RegistryProtocol.getRegistryProtocol(); NotifyListener listener = getListener(rprotocol); List urls = new ArrayList(); - urls.add(URL.valueOf("override://0.0.0.0/com.alibaba.dubbo.registry.protocol.HackService?timeout=100")); + urls.add(URL.valueOf("override://0.0.0.0/org.apache.dubbo.registry.protocol.HackService?timeout=100")); listener.notify(urls); assertEquals(true, exporter.getInvoker().isAvailable()); assertEquals(null, exporter.getInvoker().getUrl().getParameter("timeout")); diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryStatusCheckerTest.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java similarity index 83% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryStatusCheckerTest.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java index 52c66af4be..01b637d520 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/RegistryStatusCheckerTest.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/RegistryStatusCheckerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.registry.RegistryFactory; -import com.alibaba.dubbo.registry.status.RegistryStatusChecker; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.registry.RegistryFactory; +import org.apache.dubbo.registry.status.RegistryStatusChecker; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryExporter.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryExporter.java similarity index 83% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryExporter.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryExporter.java index b2f0f30923..b30462f7bf 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryExporter.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryExporter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; import java.io.IOException; import java.net.ServerSocket; diff --git a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryService.java b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryService.java similarity index 87% rename from dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryService.java rename to dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryService.java index 283ff3165d..93c272721c 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/java/com/alibaba/dubbo/registry/dubbo/SimpleRegistryService.java +++ b/dubbo-registry/dubbo-registry-default/src/test/java/org/apache/dubbo/registry/dubbo/SimpleRegistryService.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.dubbo; +package org.apache.dubbo.registry.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.RegistryService; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.RegistryService; +import org.apache.dubbo.rpc.RpcContext; import java.util.List; import java.util.Map; @@ -77,7 +77,7 @@ public class SimpleRegistryService extends AbstractRegistryService { register(service, new URL("dubbo", NetUtils.getLocalHost(), RpcContext.getContext().getLocalPort(), - com.alibaba.dubbo.registry.RegistryService.class.getName(), + org.apache.dubbo.registry.RegistryService.class.getName(), url.getParameters())); List rs = registries; if (rs != null && rs.size() > 0) { @@ -134,7 +134,7 @@ public class SimpleRegistryService extends AbstractRegistryService { super.unsubscribe(service, new URL("subscribe", RpcContext.getContext().getRemoteHost(), RpcContext.getContext().getRemotePort(), - com.alibaba.dubbo.registry.RegistryService.class.getName(), getSubscribed(service)), entry.getValue()); + org.apache.dubbo.registry.RegistryService.class.getName(), getSubscribed(service)), entry.getValue()); } } } diff --git a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml index 6c6cb8b89f..9e129907d3 100644 --- a/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml +++ b/dubbo-registry/dubbo-registry-default/src/test/resources/log4j.xml @@ -20,7 +20,7 @@ - + diff --git a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java similarity index 93% rename from dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java rename to dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java index bdb124bfcb..a9b3985d85 100644 --- a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistry.java +++ b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistry.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.multicast; +package org.apache.dubbo.registry.multicast; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.support.FailbackRegistry; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.support.FailbackRegistry; import java.io.IOException; import java.net.DatagramPacket; diff --git a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactory.java similarity index 81% rename from dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java rename to dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactory.java index 12fd13cbda..c7006baae7 100644 --- a/dubbo-registry/dubbo-registry-multicast/src/main/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-multicast/src/main/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.multicast; +package org.apache.dubbo.registry.multicast; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; /** * MulticastRegistryLocator diff --git a/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index 7eb7b3f38a..0000000000 --- a/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -multicast=com.alibaba.dubbo.registry.multicast.MulticastRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..cb5cd3adcf --- /dev/null +++ b/dubbo-registry/dubbo-registry-multicast/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1 @@ +multicast=org.apache.dubbo.registry.multicast.MulticastRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactoryTest.java b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java similarity index 90% rename from dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactoryTest.java rename to dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java index bc8833b9af..1f74d6ff38 100644 --- a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryFactoryTest.java +++ b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryFactoryTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.multicast; +package org.apache.dubbo.registry.multicast; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; import org.junit.Test; import static org.hamcrest.CoreMatchers.*; diff --git a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryTest.java similarity index 81% rename from dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java rename to dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryTest.java index 30fca7ef07..d448711eae 100644 --- a/dubbo-registry/dubbo-registry-multicast/src/test/java/com/alibaba/dubbo/registry/multicast/MulticastRegistryTest.java +++ b/dubbo-registry/dubbo-registry-multicast/src/test/java/org/apache/dubbo/registry/multicast/MulticastRegistryTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.multicast; +package org.apache.dubbo.registry.multicast; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; import org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -36,7 +36,7 @@ import static org.junit.Assert.assertTrue; public class MulticastRegistryTest { - private String service = "com.alibaba.dubbo.test.injvmServie"; + private String service = "org.apache.dubbo.test.injvmServie"; private URL registryUrl = URL.valueOf("multicast://239.255.255.255/"); private URL serviceUrl = URL.valueOf("dubbo://" + NetUtils.getLocalHost() + "/" + service + "?methods=test1,test2"); @@ -50,7 +50,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. */ @Test(expected = IllegalArgumentException.class) public void testUrlError() { @@ -59,7 +59,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. */ @Test(expected = IllegalStateException.class) public void testAnyHost() { @@ -68,7 +68,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)}. */ @Test public void testGetCustomPort() { @@ -79,7 +79,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#getRegistered()}. + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#getRegistered()}. */ @Test public void testRegister() { @@ -99,7 +99,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#unregister(URL)}. + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#unregister(URL)}. */ @Test public void testUnregister() { @@ -118,7 +118,7 @@ public class MulticastRegistryTest { /** * Test method for - * {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#subscribe(URL url, com.alibaba.dubbo.registry.NotifyListener)} + * {@link org.apache.dubbo.registry.multicast.MulticastRegistry#subscribe(URL url, org.apache.dubbo.registry.NotifyListener)} * . */ @Test @@ -136,7 +136,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#unsubscribe(URL, NotifyListener)} + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#unsubscribe(URL, NotifyListener)} */ @Test public void testUnsubscribe() { @@ -187,7 +187,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)} + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)} */ @Test public void testDefaultPort() { @@ -201,7 +201,7 @@ public class MulticastRegistryTest { } /** - * Test method for {@link com.alibaba.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)} + * Test method for {@link org.apache.dubbo.registry.multicast.MulticastRegistry#MulticastRegistry(URL)} */ @Test public void testCustomedPort() { diff --git a/dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistry.java b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java similarity index 95% rename from dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistry.java rename to dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java index 3c19f86899..3c396bfbaf 100644 --- a/dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistry.java +++ b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistry.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.redis; +package org.apache.dubbo.registry.redis; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.support.FailbackRegistry; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.support.FailbackRegistry; +import org.apache.dubbo.rpc.RpcException; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import redis.clients.jedis.Jedis; diff --git a/dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistryFactory.java b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistryFactory.java similarity index 81% rename from dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistryFactory.java rename to dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistryFactory.java index 7d15e72d46..0824b2244c 100644 --- a/dubbo-registry/dubbo-registry-redis/src/main/java/com/alibaba/dubbo/registry/redis/RedisRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-redis/src/main/java/org/apache/dubbo/registry/redis/RedisRegistryFactory.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.redis; +package org.apache.dubbo.registry.redis; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; /** * RedisRegistryFactory diff --git a/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index 5ff235257f..0000000000 --- a/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -redis=com.alibaba.dubbo.registry.redis.RedisRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..3214101ac3 --- /dev/null +++ b/dubbo-registry/dubbo-registry-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1 @@ +redis=org.apache.dubbo.registry.redis.RedisRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-redis/src/test/java/com/alibaba/dubbo/registry/redis/RedisRegistryTest.java b/dubbo-registry/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java similarity index 89% rename from dubbo-registry/dubbo-registry-redis/src/test/java/com/alibaba/dubbo/registry/redis/RedisRegistryTest.java rename to dubbo-registry/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java index 28c69180fe..e03c939191 100644 --- a/dubbo-registry/dubbo-registry-redis/src/test/java/com/alibaba/dubbo/registry/redis/RedisRegistryTest.java +++ b/dubbo-registry/dubbo-registry-redis/src/test/java/org/apache/dubbo/registry/redis/RedisRegistryTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.redis; +package org.apache.dubbo.registry.redis; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -29,13 +29,13 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static com.alibaba.dubbo.common.Constants.BACKUP_KEY; +import static org.apache.dubbo.common.Constants.BACKUP_KEY; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; public class RedisRegistryTest { - private String service = "com.alibaba.dubbo.test.injvmServie"; + private String service = "org.apache.dubbo.test.injvmServie"; private URL serviceUrl = URL.valueOf("redis://redis/" + service + "?notify=false&methods=test1,test2"); private RedisServer redisServer; private RedisRegistry redisRegistry; diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java similarity index 91% rename from dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java rename to dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java index 6835c2c86d..86465b6f4b 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistry.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistry.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.zookeeper; +package org.apache.dubbo.registry.zookeeper; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.support.FailbackRegistry; -import com.alibaba.dubbo.remoting.zookeeper.ChildListener; -import com.alibaba.dubbo.remoting.zookeeper.StateListener; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperClient; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.support.FailbackRegistry; +import org.apache.dubbo.remoting.zookeeper.ChildListener; +import org.apache.dubbo.remoting.zookeeper.StateListener; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; +import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; +import org.apache.dubbo.rpc.RpcException; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java similarity index 80% rename from dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java rename to dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java index 94eff83a4b..6fd33431b5 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.zookeeper; +package org.apache.dubbo.registry.zookeeper; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.support.AbstractRegistryFactory; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.support.AbstractRegistryFactory; +import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; /** * ZookeeperRegistryFactory. diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory deleted file mode 100644 index ced9ea0c45..0000000000 --- a/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory +++ /dev/null @@ -1 +0,0 @@ -zookeeper=com.alibaba.dubbo.registry.zookeeper.ZookeeperRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory b/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory new file mode 100644 index 0000000000..4db1be8322 --- /dev/null +++ b/dubbo-registry/dubbo-registry-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory @@ -0,0 +1 @@ +zookeeper=org.apache.dubbo.registry.zookeeper.ZookeeperRegistryFactory \ No newline at end of file diff --git a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryTest.java b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java similarity index 89% rename from dubbo-registry/dubbo-registry-zookeeper/src/test/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryTest.java rename to dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java index daf930fa5e..54fbdaafeb 100644 --- a/dubbo-registry/dubbo-registry-zookeeper/src/test/java/com/alibaba/dubbo/registry/zookeeper/ZookeeperRegistryTest.java +++ b/dubbo-registry/dubbo-registry-zookeeper/src/test/java/org/apache/dubbo/registry/zookeeper/ZookeeperRegistryTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.registry.zookeeper; +package org.apache.dubbo.registry.zookeeper; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.registry.NotifyListener; -import com.alibaba.dubbo.registry.Registry; -import com.alibaba.dubbo.registry.status.RegistryStatusChecker; -import com.alibaba.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.registry.NotifyListener; +import org.apache.dubbo.registry.Registry; +import org.apache.dubbo.registry.status.RegistryStatusChecker; +import org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter; import org.apache.curator.test.TestingServer; import org.junit.After; import org.junit.Assert; @@ -42,7 +42,7 @@ import static org.mockito.Mockito.mock; public class ZookeeperRegistryTest { private TestingServer zkServer; private ZookeeperRegistry zookeeperRegistry; - private String service = "com.alibaba.dubbo.test.injvmServie"; + private String service = "org.apache.dubbo.test.injvmServie"; private URL serviceUrl = URL.valueOf("zookeeper://zookeeper/" + service + "?notify=false&methods=test1,test2"); private URL anyUrl = URL.valueOf("zookeeper://zookeeper/*"); private URL registryUrl; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Channel.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Channel.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Channel.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Channel.java index 771aefee93..8c9531f858 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Channel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Channel.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.net.InetSocketAddress; @@ -23,9 +23,9 @@ import java.net.InetSocketAddress; * * * - * @see com.alibaba.dubbo.remoting.Client - * @see com.alibaba.dubbo.remoting.Server#getChannels() - * @see com.alibaba.dubbo.remoting.Server#getChannel(InetSocketAddress) + * @see org.apache.dubbo.remoting.Client + * @see org.apache.dubbo.remoting.Server#getChannels() + * @see org.apache.dubbo.remoting.Server#getChannel(InetSocketAddress) */ public interface Channel extends Endpoint { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ChannelHandler.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ChannelHandler.java index f93451422a..832e481191 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ChannelHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; /** * ChannelHandler. (API, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.remoting.Transporter#bind(com.alibaba.dubbo.common.URL, ChannelHandler) - * @see com.alibaba.dubbo.remoting.Transporter#connect(com.alibaba.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporter#bind(org.apache.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporter#connect(org.apache.dubbo.common.URL, ChannelHandler) */ @SPI public interface ChannelHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Client.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Client.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Client.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Client.java index a66e37b522..b8ccad201c 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Client.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Client.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Resetable; +import org.apache.dubbo.common.Resetable; /** * Remoting Client. (API/SPI, Prototype, ThreadSafe) *

    * Client/Server * - * @see com.alibaba.dubbo.remoting.Transporter#connect(com.alibaba.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporter#connect(org.apache.dubbo.common.URL, ChannelHandler) */ public interface Client extends Endpoint, Channel, Resetable { @@ -33,6 +33,6 @@ public interface Client extends Endpoint, Channel, Resetable { void reconnect() throws RemotingException; @Deprecated - void reset(com.alibaba.dubbo.common.Parameters parameters); + void reset(org.apache.dubbo.common.Parameters parameters); } \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec.java index 426d3fc13d..ed2261d612 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec2.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec2.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec2.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec2.java index 730d00eb3a..2adfe477ef 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Codec2.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Codec2.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Decodeable.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Decodeable.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Decodeable.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Decodeable.java index 733fe213c5..3852108c5b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Decodeable.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Decodeable.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; public interface Decodeable { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Dispatcher.java similarity index 81% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Dispatcher.java index 15b0c0039b..2fd3133a5d 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Dispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Dispatcher.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispatcher; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.remoting.transport.dispatcher.all.AllDispatcher; /** * ChannelHandlerWrapper (SPI, Singleton, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Endpoint.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Endpoint.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Endpoint.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Endpoint.java index f58885fed7..0b69e1b7c5 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Endpoint.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Endpoint.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; import java.net.InetSocketAddress; @@ -24,9 +24,9 @@ import java.net.InetSocketAddress; * Endpoint. (API/SPI, Prototype, ThreadSafe) * * - * @see com.alibaba.dubbo.remoting.Channel - * @see com.alibaba.dubbo.remoting.Client - * @see com.alibaba.dubbo.remoting.Server + * @see org.apache.dubbo.remoting.Channel + * @see org.apache.dubbo.remoting.Client + * @see org.apache.dubbo.remoting.Server */ public interface Endpoint { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ExecutionException.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ExecutionException.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ExecutionException.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ExecutionException.java index c1c72b0c50..48286ef30b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/ExecutionException.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/ExecutionException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/RemotingException.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/RemotingException.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/RemotingException.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/RemotingException.java index 7ab8dce8e4..fb288bb964 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/RemotingException.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/RemotingException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.net.InetSocketAddress; @@ -22,13 +22,13 @@ import java.net.InetSocketAddress; * RemotingException. (API, Prototype, ThreadSafe) * * @export - * @see com.alibaba.dubbo.remoting.exchange.ResponseFuture#get() - * @see com.alibaba.dubbo.remoting.exchange.ResponseFuture#get(int) - * @see com.alibaba.dubbo.remoting.Channel#send(Object, boolean) - * @see com.alibaba.dubbo.remoting.exchange.ExchangeChannel#request(Object) - * @see com.alibaba.dubbo.remoting.exchange.ExchangeChannel#request(Object, int) - * @see com.alibaba.dubbo.remoting.Transporter#bind(com.alibaba.dubbo.common.URL, ChannelHandler) - * @see com.alibaba.dubbo.remoting.Transporter#connect(com.alibaba.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.exchange.ResponseFuture#get() + * @see org.apache.dubbo.remoting.exchange.ResponseFuture#get(int) + * @see org.apache.dubbo.remoting.Channel#send(Object, boolean) + * @see org.apache.dubbo.remoting.exchange.ExchangeChannel#request(Object) + * @see org.apache.dubbo.remoting.exchange.ExchangeChannel#request(Object, int) + * @see org.apache.dubbo.remoting.Transporter#bind(org.apache.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporter#connect(org.apache.dubbo.common.URL, ChannelHandler) */ public class RemotingException extends Exception { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Server.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Server.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Server.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Server.java index 8dddb536aa..f413cb0bb8 100755 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Server.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Server.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Resetable; +import org.apache.dubbo.common.Resetable; import java.net.InetSocketAddress; import java.util.Collection; @@ -26,7 +26,7 @@ import java.util.Collection; *

    * Client/Server * - * @see com.alibaba.dubbo.remoting.Transporter#bind(com.alibaba.dubbo.common.URL, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporter#bind(org.apache.dubbo.common.URL, ChannelHandler) */ public interface Server extends Endpoint, Resetable { @@ -53,6 +53,6 @@ public interface Server extends Endpoint, Resetable { Channel getChannel(InetSocketAddress remoteAddress); @Deprecated - void reset(com.alibaba.dubbo.common.Parameters parameters); + void reset(org.apache.dubbo.common.Parameters parameters); } \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/TimeoutException.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/TimeoutException.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/TimeoutException.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/TimeoutException.java index 1eafa54324..464452e1af 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/TimeoutException.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/TimeoutException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.net.InetSocketAddress; @@ -22,8 +22,8 @@ import java.net.InetSocketAddress; * TimeoutException. (API, Prototype, ThreadSafe) * * @export - * @see com.alibaba.dubbo.remoting.exchange.ResponseFuture#get() - * @see com.alibaba.dubbo.remoting.exchange.ResponseFuture#get(int) + * @see org.apache.dubbo.remoting.exchange.ResponseFuture#get() + * @see org.apache.dubbo.remoting.exchange.ResponseFuture#get(int) */ public class TimeoutException extends RemotingException { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporter.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporter.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java index 308355a6d3..b53c75f9c2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporter.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; import javax.sound.midi.Receiver; @@ -29,7 +29,7 @@ import javax.sound.midi.Receiver; * Transport Layer * Client/Server * - * @see com.alibaba.dubbo.remoting.Transporters + * @see org.apache.dubbo.remoting.Transporters */ @SPI("netty") public interface Transporter { @@ -41,7 +41,7 @@ public interface Transporter { * @param handler * @return server * @throws RemotingException - * @see com.alibaba.dubbo.remoting.Transporters#bind(URL, Receiver, ChannelHandler) + * @see org.apache.dubbo.remoting.Transporters#bind(URL, Receiver, ChannelHandler) */ @Adaptive({Constants.SERVER_KEY, Constants.TRANSPORTER_KEY}) Server bind(URL url, ChannelHandler handler) throws RemotingException; @@ -53,7 +53,7 @@ public interface Transporter { * @param handler * @return client * @throws RemotingException - * @see com.alibaba.dubbo.remoting.Transporters#connect(URL, Receiver, ChannelListener) + * @see org.apache.dubbo.remoting.Transporters#connect(URL, Receiver, ChannelListener) */ @Adaptive({Constants.CLIENT_KEY, Constants.TRANSPORTER_KEY}) Client connect(URL url, ChannelHandler handler) throws RemotingException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporters.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporters.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporters.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporters.java index 9852255fe8..2d008af1f3 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/Transporters.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/Transporters.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerDispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.remoting.transport.ChannelHandlerDispatcher; /** * Transporter facade. (API, Static, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBuffer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/AbstractChannelBuffer.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/AbstractChannelBuffer.java index b924de2e9c..a73e3c28ba 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/AbstractChannelBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java index 54447f9c0d..b35889b0c7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffer.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffer.java index 4771d16a88..67514f0f45 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferFactory.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferFactory.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferFactory.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferFactory.java index 85fb63445b..5042260c24 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferFactory.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.nio.ByteBuffer; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferInputStream.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferInputStream.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferInputStream.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferInputStream.java index ca566be73f..4868b85429 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferInputStream.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferInputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferOutputStream.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferOutputStream.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferOutputStream.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferOutputStream.java index 60f492a71a..afc7187413 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferOutputStream.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBufferOutputStream.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.OutputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffers.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffers.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffers.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffers.java index 4aee619445..1577038fa1 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/ChannelBuffers.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/ChannelBuffers.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.nio.ByteBuffer; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferFactory.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferFactory.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferFactory.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferFactory.java index ec6707018e..0b99a6cb31 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferFactory.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.nio.ByteBuffer; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBuffer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DynamicChannelBuffer.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DynamicChannelBuffer.java index 2cb4851c98..55f7b91ddd 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/DynamicChannelBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBuffer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBuffer.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBuffer.java index 952b693b60..2d1e32ec02 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBuffer.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferFactory.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferFactory.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferFactory.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferFactory.java index 88628a0618..11e1b0afe7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferFactory.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferFactory.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.nio.ByteBuffer; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeChannel.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeChannel.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeChannel.java index 1ffdc78c07..fa6d5bf410 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeChannel.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; /** * ExchangeChannel. (API/SPI, Prototype, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeClient.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java index fd66e1144f..89846cb58c 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeClient.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeClient.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.remoting.Client; +import org.apache.dubbo.remoting.Client; /** * ExchangeClient. (API/SPI, Prototype, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeHandler.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeHandler.java index 8d8f28445d..6073b55443 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeServer.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeServer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeServer.java index 89cee7ff7b..8bce090134 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ExchangeServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ExchangeServer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Server; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchanger.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchanger.java index 53588b54f1..6f1ef5e628 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchanger.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchanger.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.support.header.HeaderExchanger; /** * Exchanger. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchangers.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchangers.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchangers.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchangers.java index 626e6f1166..073e18c7c0 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Exchangers.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Exchangers.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerDispatcher; -import com.alibaba.dubbo.remoting.exchange.support.Replier; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerDispatcher; +import org.apache.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; /** * Exchanger facade. (API, Static, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Request.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Request.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java index 69573ee196..e1f45fd56a 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Request.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Request.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.StringUtils; import java.util.concurrent.atomic.AtomicLong; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Response.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Response.java index 0422a06367..bfd72f5d7e 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/Response.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/Response.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; /** * Response diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseCallback.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseCallback.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseCallback.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseCallback.java index 288e032de2..37fe6cc6e3 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseCallback.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseCallback.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; /** * Callback diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseFuture.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseFuture.java similarity index 81% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseFuture.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseFuture.java index dae54d67af..9e641dd357 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/ResponseFuture.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/ResponseFuture.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange; +package org.apache.dubbo.remoting.exchange; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.RemotingException; /** * Future. (API/SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.remoting.exchange.ExchangeChannel#request(Object) - * @see com.alibaba.dubbo.remoting.exchange.ExchangeChannel#request(Object, int) + * @see org.apache.dubbo.remoting.exchange.ExchangeChannel#request(Object) + * @see org.apache.dubbo.remoting.exchange.ExchangeChannel#request(Object, int) */ public interface ResponseFuture { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/codec/ExchangeCodec.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/codec/ExchangeCodec.java index c1b8e09622..4b18cad95d 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/codec/ExchangeCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/codec/ExchangeCodec.java @@ -14,29 +14,29 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.codec; +package org.apache.dubbo.remoting.exchange.codec; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.io.Bytes; -import com.alibaba.dubbo.common.io.StreamUtils; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferInputStream; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferOutputStream; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.DefaultFuture; -import com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec; -import com.alibaba.dubbo.remoting.transport.CodecSupport; -import com.alibaba.dubbo.remoting.transport.ExceedPayloadLimitException; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.io.Bytes; +import org.apache.dubbo.common.io.StreamUtils; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferInputStream; +import org.apache.dubbo.remoting.buffer.ChannelBufferOutputStream; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.DefaultFuture; +import org.apache.dubbo.remoting.telnet.codec.TelnetCodec; +import org.apache.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.remoting.transport.ExceedPayloadLimitException; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java index eccc86d481..51e10dc9b5 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/DefaultFuture.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/DefaultFuture.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.TimeoutException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.ResponseCallback; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.TimeoutException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.ResponseCallback; +import org.apache.dubbo.remoting.exchange.ResponseFuture; import java.text.SimpleDateFormat; import java.util.Date; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java index 8dd1d7a3a9..5849a7fd2f 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerAdapter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.telnet.support.TelnetHandlerAdapter; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.telnet.support.TelnetHandlerAdapter; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java index 1e455884df..873e2ee67b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeHandlerDispatcher.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.TelnetHandlerAdapter; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerDispatcher; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.TelnetHandlerAdapter; +import org.apache.dubbo.remoting.transport.ChannelHandlerDispatcher; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeServerDelegate.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeServerDelegate.java index dd563c99ff..89c41c7cf2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ExchangeServerDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ExchangeServerDelegate.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; import java.net.InetSocketAddress; import java.util.Collection; @@ -60,7 +60,7 @@ public class ExchangeServerDelegate implements ExchangeServer { @Override @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/MultiMessage.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/MultiMessage.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/MultiMessage.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/MultiMessage.java index afd41f49b1..dbe3bff714 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/MultiMessage.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/MultiMessage.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; /** - * @see com.alibaba.dubbo.remoting.transport.MultiMessageHandler + * @see org.apache.dubbo.remoting.transport.MultiMessageHandler */ public final class MultiMessage implements Iterable { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/Replier.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/Replier.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/Replier.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/Replier.java index b2b2d25fb9..f7605f9ef4 100755 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/Replier.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/Replier.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; /** * Replier. (API, Prototype, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ReplierDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ReplierDispatcher.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ReplierDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ReplierDispatcher.java index 8d6bff5083..43bf8f88ea 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/ReplierDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/ReplierDispatcher.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/SimpleFuture.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/SimpleFuture.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/SimpleFuture.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/SimpleFuture.java index a851793504..95b95f4ce2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/SimpleFuture.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/SimpleFuture.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support; +package org.apache.dubbo.remoting.exchange.support; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ResponseCallback; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ResponseCallback; +import org.apache.dubbo.remoting.exchange.ResponseFuture; /** * SimpleFuture diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java index 873d4adb3d..34cef2bc4e 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeChannel.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.DefaultFuture; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.DefaultFuture; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java index d6009f53e0..feac1bff7d 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeClient.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ResponseFuture; import java.net.InetSocketAddress; import java.util.Collection; @@ -151,7 +151,7 @@ public class HeaderExchangeClient implements ExchangeClient { @Override @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java index a025ccd61f..536e2a4abd 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeHandler.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.DefaultFuture; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerDelegate; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.DefaultFuture; +import org.apache.dubbo.remoting.transport.ChannelHandlerDelegate; import java.net.InetSocketAddress; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java index 6e520e3acb..0b4aba067b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchangeServer.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Request; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Request; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -232,7 +232,7 @@ public class HeaderExchangeServer implements ExchangeServer { @Override @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchanger.java similarity index 72% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchanger.java index 06a14ded78..e2e8f1b1c9 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeaderExchanger.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeaderExchanger.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Transporters; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchanger; -import com.alibaba.dubbo.remoting.transport.DecodeHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Transporters; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchanger; +import org.apache.dubbo.remoting.transport.DecodeHandler; /** * DefaultMessenger diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTask.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTask.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTask.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTask.java index 5dd00d6a20..97bb1811ad 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTask.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTask.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.exchange.Request; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.exchange.Request; import java.util.Collection; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandler.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandler.java index 2ec9a9bb89..c222885ad4 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandler.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.AbstractChannelHandlerDelegate; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.AbstractChannelHandlerDelegate; public class HeartbeatHandler extends AbstractChannelHandlerDelegate { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/TelnetHandler.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/TelnetHandler.java index 7ce6fde2af..12e2c98980 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/TelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/TelnetHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet; +package org.apache.dubbo.remoting.telnet; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; /** * TelnetHandler diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/codec/TelnetCodec.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/codec/TelnetCodec.java index 638e4fc2e0..7b4f1ca5db 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/codec/TelnetCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/codec/TelnetCodec.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.codec; +package org.apache.dubbo.remoting.telnet.codec; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.transport.codec.TransportCodec; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.transport.codec.TransportCodec; import java.io.IOException; import java.io.UnsupportedEncodingException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/Help.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/Help.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/Help.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/Help.java index b22d0bce3c..fc68e119d5 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/Help.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/Help.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support; +package org.apache.dubbo.remoting.telnet.support; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java index 478ce0f54a..580238b033 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetHandlerAdapter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support; +package org.apache.dubbo.remoting.telnet.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; public class TelnetHandlerAdapter extends ChannelHandlerAdapter implements TelnetHandler { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetUtils.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetUtils.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java index f5e7332a4a..1d7f52eee7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/TelnetUtils.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/TelnetUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support; +package org.apache.dubbo.remoting.telnet.support; import java.util.Arrays; import java.util.List; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java similarity index 80% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java index 5876955bfe..7fc6afb825 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ClearTelnetHandler.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support.command; +package org.apache.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; /** * ClearTelnetHandler diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java index 22f78b508a..1634eb7d01 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/ExitTelnetHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support.command; +package org.apache.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; /** * ExitTelnetHandler diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java index 3eb0899d28..26335f0b41 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/HelpTelnetHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support.command; +package org.apache.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.remoting.telnet.support.TelnetUtils; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.remoting.telnet.support.TelnetUtils; import java.util.ArrayList; import java.util.List; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/LogTelnetHandler.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/LogTelnetHandler.java index c5ae9593d9..e01aa83af7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/LogTelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/LogTelnetHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support.command; +package org.apache.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; import java.io.File; import java.io.FileInputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java index 0cf08de49c..6f22da21da 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/telnet/support/command/StatusTelnetHandler.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.telnet.support.command; +package org.apache.dubbo.remoting.telnet.support.command; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.common.status.support.StatusUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.remoting.telnet.support.TelnetUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.status.support.StatusUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.remoting.telnet.support.TelnetUtils; import java.util.ArrayList; import java.util.HashMap; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannel.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannel.java index 07f2a7d9a8..58429d0000 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannel.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; /** * AbstractChannel diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java index b2c660ccdc..3a0268f963 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractChannelHandlerDelegate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; public abstract class AbstractChannelHandlerDelegate implements ChannelHandlerDelegate { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java index 67222981a6..dd75e5b311 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractClient.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractClient.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.store.DataStore; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.store.DataStore; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelHandlers; import java.net.InetSocketAddress; import java.util.concurrent.ExecutorService; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractCodec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractCodec.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractCodec.java index 76cb8ab549..5269d2c571 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractCodec.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; import java.io.IOException; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractEndpoint.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractEndpoint.java index 811c59a00d..94b6be287b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractEndpoint.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractEndpoint.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Resetable; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.transport.codec.CodecAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.Resetable; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.transport.codec.CodecAdapter; /** * AbstractEndpoint @@ -93,7 +93,7 @@ public abstract class AbstractEndpoint extends AbstractPeer implements Resetable } @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractPeer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractPeer.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractPeer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractPeer.java index 58b823eb6f..18f235b9b6 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractPeer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractPeer.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Endpoint; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Endpoint; +import org.apache.dubbo.remoting.RemotingException; /** * AbstractPeer diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java index 6846687fe8..9c19987d8a 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/AbstractServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/AbstractServer.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.store.DataStore; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.store.DataStore; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; import java.net.InetSocketAddress; import java.util.Collection; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelDelegate.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelDelegate.java index e3843c2d42..fb64a77620 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelDelegate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerAdapter.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerAdapter.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerAdapter.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerAdapter.java index ee4153b336..188b7de4ba 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerAdapter.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; /** * ChannelHandlerAdapter. diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDelegate.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDelegate.java index 08c9f07840..bab09bdbce 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDelegate.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ChannelHandler; public interface ChannelHandlerDelegate extends ChannelHandler { ChannelHandler getHandler(); diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDispatcher.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDispatcher.java index aaf3e2b3c1..cec8006882 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ChannelHandlerDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ChannelHandlerDispatcher.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; import java.util.Arrays; import java.util.Collection; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ClientDelegate.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ClientDelegate.java index 6cfe206802..b3b60819bc 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ClientDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ClientDelegate.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; @@ -55,7 +55,7 @@ public class ClientDelegate implements Client { @Override @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/CodecSupport.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/CodecSupport.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java index a9b0c1a63a..9ca1c2e054 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/CodecSupport.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/CodecSupport.java @@ -15,14 +15,14 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.util.HashMap; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/DecodeHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/DecodeHandler.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/DecodeHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/DecodeHandler.java index db5b6f57b2..050dc78ad2 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/DecodeHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/DecodeHandler.java @@ -15,16 +15,16 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Decodeable; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Decodeable; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; public class DecodeHandler extends AbstractChannelHandlerDelegate { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ExceedPayloadLimitException.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ExceedPayloadLimitException.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ExceedPayloadLimitException.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ExceedPayloadLimitException.java index cfeb900a90..0cfe21f32b 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ExceedPayloadLimitException.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ExceedPayloadLimitException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/MultiMessageHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/MultiMessageHandler.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/MultiMessageHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/MultiMessageHandler.java index 80ff9a3b62..a669802c17 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/MultiMessageHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/MultiMessageHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.support.MultiMessage; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.support.MultiMessage; /** * diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ServerDelegate.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ServerDelegate.java index 5b24cc9c7d..6aeed60f78 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/ServerDelegate.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/ServerDelegate.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; import java.net.InetSocketAddress; import java.util.Collection; @@ -61,7 +61,7 @@ public class ServerDelegate implements Server { @Override @Deprecated - public void reset(com.alibaba.dubbo.common.Parameters parameters) { + public void reset(org.apache.dubbo.common.Parameters parameters) { reset(getUrl().addParameters(parameters.getParameters())); } diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapter.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/CodecAdapter.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapter.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/CodecAdapter.java index dfc945ed0b..d49313ffe3 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/CodecAdapter.java @@ -15,15 +15,15 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.codec; +package org.apache.dubbo.remoting.transport.codec; -import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream; -import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.common.io.UnsafeByteArrayInputStream; +import org.apache.dubbo.common.io.UnsafeByteArrayOutputStream; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/TransportCodec.java similarity index 80% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/TransportCodec.java index f41c7287fc..11d870b7ca 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/codec/TransportCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/codec/TransportCodec.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.codec; +package org.apache.dubbo.remoting.transport.codec; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferInputStream; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferOutputStream; -import com.alibaba.dubbo.remoting.transport.AbstractCodec; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferInputStream; +import org.apache.dubbo.remoting.buffer.ChannelBufferOutputStream; +import org.apache.dubbo.remoting.transport.AbstractCodec; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java index 44dea9464c..59622a6f39 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelEventRunnable.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher; +package org.apache.dubbo.remoting.transport.dispatcher; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; public class ChannelEventRunnable implements Runnable { private static final Logger logger = LoggerFactory.getLogger(ChannelEventRunnable.class); diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelHandlers.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelHandlers.java index e1e9b0876e..d14a1c3d6d 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/ChannelHandlers.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/ChannelHandlers.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher; +package org.apache.dubbo.remoting.transport.dispatcher; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; -import com.alibaba.dubbo.remoting.exchange.support.header.HeartbeatHandler; -import com.alibaba.dubbo.remoting.transport.MultiMessageHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; +import org.apache.dubbo.remoting.exchange.support.header.HeartbeatHandler; +import org.apache.dubbo.remoting.transport.MultiMessageHandler; public class ChannelHandlers { diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java index 71f4999789..072f998e06 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/WrappedChannelHandler.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher; +package org.apache.dubbo.remoting.transport.dispatcher; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.store.DataStore; -import com.alibaba.dubbo.common.threadpool.ThreadPool; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerDelegate; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.store.DataStore; +import org.apache.dubbo.common.threadpool.ThreadPool; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.ChannelHandlerDelegate; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java index d44f0655e8..88431fdb25 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllChannelHandler.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.all; +package org.apache.dubbo.remoting.transport.dispatcher.all; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; +import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java index e760b15fa3..31ee4c8b45 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/all/AllDispatcher.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.all; +package org.apache.dubbo.remoting.transport.dispatcher.all; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; /** * default thread pool configure diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java index fb432a8563..a40d432009 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedChannelHandler.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.connection; +package org.apache.dubbo.remoting.transport.dispatcher.connection; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadpool.support.AbortPolicyWithReport; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadpool.support.AbortPolicyWithReport; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; +import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java index 08088436e9..fed92b1768 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/connection/ConnectionOrderedDispatcher.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.connection; +package org.apache.dubbo.remoting.transport.dispatcher.connection; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; /** * connect disconnect ensure the order diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java index ca4f23fa50..f18065d9e7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/direct/DirectDispatcher.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.direct; +package org.apache.dubbo.remoting.transport.dispatcher.direct; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; /** * Direct dispatcher diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java similarity index 81% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java index d31840b688..ac588f3a95 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionChannelHandler.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.execution; +package org.apache.dubbo.remoting.transport.dispatcher.execution; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; +import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; import java.util.concurrent.ExecutorService; import java.util.concurrent.RejectedExecutionException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java index 20d0d5c1af..d5bc91d90f 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/execution/ExecutionDispatcher.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.execution; +package org.apache.dubbo.remoting.transport.dispatcher.execution; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; /** * In addition to sending all the use thread pool processing diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java similarity index 72% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java index cccd931398..3e756c7c66 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyChannelHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.message; +package org.apache.dubbo.remoting.transport.dispatcher.message; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; -import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelEventRunnable.ChannelState; +import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; import java.util.concurrent.ExecutorService; diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java rename to dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java index cde25531b8..fa427d16d4 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/main/java/com/alibaba/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java +++ b/dubbo-remoting/dubbo-remoting-api/src/main/java/org/apache/dubbo/remoting/transport/dispatcher/message/MessageOnlyDispatcher.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher.message; +package org.apache.dubbo.remoting.transport.dispatcher.message; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; /** * Only message receive uses the thread pool. diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 deleted file mode 100644 index be80199d9d..0000000000 --- a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 +++ /dev/null @@ -1,3 +0,0 @@ -transport=com.alibaba.dubbo.remoting.transport.codec.TransportCodec -telnet=com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec -exchange=com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher deleted file mode 100644 index 806cb8b7cd..0000000000 --- a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher +++ /dev/null @@ -1,5 +0,0 @@ -all=com.alibaba.dubbo.remoting.transport.dispatcher.all.AllDispatcher -direct=com.alibaba.dubbo.remoting.transport.dispatcher.direct.DirectDispatcher -message=com.alibaba.dubbo.remoting.transport.dispatcher.message.MessageOnlyDispatcher -execution=com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispatcher -connection=com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedDispatcher \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.exchange.Exchanger b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.exchange.Exchanger deleted file mode 100644 index c07fd67e04..0000000000 --- a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.exchange.Exchanger +++ /dev/null @@ -1 +0,0 @@ -header=com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchanger \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler deleted file mode 100644 index c56ce82a8c..0000000000 --- a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler +++ /dev/null @@ -1,5 +0,0 @@ -clear=com.alibaba.dubbo.remoting.telnet.support.command.ClearTelnetHandler -exit=com.alibaba.dubbo.remoting.telnet.support.command.ExitTelnetHandler -help=com.alibaba.dubbo.remoting.telnet.support.command.HelpTelnetHandler -status=com.alibaba.dubbo.remoting.telnet.support.command.StatusTelnetHandler -log=com.alibaba.dubbo.remoting.telnet.support.command.LogTelnetHandler \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 new file mode 100644 index 0000000000..b4ba960565 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 @@ -0,0 +1,3 @@ +transport=org.apache.dubbo.remoting.transport.codec.TransportCodec +telnet=org.apache.dubbo.remoting.telnet.codec.TelnetCodec +exchange=org.apache.dubbo.remoting.exchange.codec.ExchangeCodec \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher new file mode 100644 index 0000000000..052fb2bfd9 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher @@ -0,0 +1,5 @@ +all=org.apache.dubbo.remoting.transport.dispatcher.all.AllDispatcher +direct=org.apache.dubbo.remoting.transport.dispatcher.direct.DirectDispatcher +message=org.apache.dubbo.remoting.transport.dispatcher.message.MessageOnlyDispatcher +execution=org.apache.dubbo.remoting.transport.dispatcher.execution.ExecutionDispatcher +connection=org.apache.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedDispatcher \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.exchange.Exchanger b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.exchange.Exchanger new file mode 100644 index 0000000000..16f9932bf0 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.exchange.Exchanger @@ -0,0 +1 @@ +header=org.apache.dubbo.remoting.exchange.support.header.HeaderExchanger \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler new file mode 100644 index 0000000000..5a04f8040e --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler @@ -0,0 +1,5 @@ +clear=org.apache.dubbo.remoting.telnet.support.command.ClearTelnetHandler +exit=org.apache.dubbo.remoting.telnet.support.command.ExitTelnetHandler +help=org.apache.dubbo.remoting.telnet.support.command.HelpTelnetHandler +status=org.apache.dubbo.remoting.telnet.support.command.StatusTelnetHandler +log=org.apache.dubbo.remoting.telnet.support.command.LogTelnetHandler \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/ChanelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/ChanelHandlerTest.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/ChanelHandlerTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/ChanelHandlerTest.java index feaac4cbb1..412de8a9d0 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/ChanelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/ChanelHandlerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; import junit.framework.TestCase; import org.junit.Test; @@ -112,7 +112,7 @@ public class ChanelHandlerTest extends TestCase { } /* (non-Javadoc) - * @see com.alibaba.dubbo.remoting.transport.support.ChannelHandlerAdapter#caught(com.alibaba.dubbo.remoting.Channel, java.lang.Throwable) + * @see org.apache.dubbo.remoting.transport.support.ChannelHandlerAdapter#caught(org.apache.dubbo.remoting.Channel, java.lang.Throwable) */ @Override public void caught(Channel channel, Throwable exception) throws RemotingException { diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoService.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoService.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoService.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoService.java index 4d44c4e4c0..9b9a650c7f 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoService.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; /** * TestService diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoServiceImpl.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoServiceImpl.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoServiceImpl.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoServiceImpl.java index 306e9985fe..9d55befc69 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/DemoServiceImpl.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/DemoServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; /** * TestServiceImpl diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/Main.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/Main.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/Main.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/Main.java index 64a5be299b..566bda10d8 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/Main.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/Main.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.Replier; -import com.alibaba.dubbo.remoting.exchange.support.ReplierDispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.exchange.support.ReplierDispatcher; import java.io.Serializable; import java.util.Random; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/MockResult.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/MockResult.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/MockResult.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/MockResult.java index 7723840c97..78369527ef 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/MockResult.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/MockResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientCloseTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientCloseTest.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientCloseTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientCloseTest.java index 1a4b0c8f44..d71736e9b7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientCloseTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientCloseTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.Exchangers; import junit.framework.TestCase; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientFixedTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientFixedTest.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientFixedTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientFixedTest.java index 1f6afa5f26..8c5541b8da 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientFixedTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientFixedTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.Exchangers; import junit.framework.TestCase; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientMain.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientMain.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientMain.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientMain.java index 205ffcca16..d2fda965a0 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientMain.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientMain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; /** diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientTest.java index 2fa39fc8e0..dcd4799cda 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceClientTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceClientTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; import junit.framework.TestCase; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerMain.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerMain.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerMain.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerMain.java index 76b1fb5be9..22b88af349 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerMain.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerMain.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; /** * PerformanceServerMain diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerTest.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerTest.java index e021df0c4e..64130a3f61 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceServerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceServerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.remoting.transport.dispatcher.execution.ExecutionDispatcher; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.remoting.transport.dispatcher.execution.ExecutionDispatcher; import junit.framework.TestCase; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceUtils.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceUtils.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceUtils.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceUtils.java index 3bbcbc7ba3..1922be47e6 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/PerformanceUtils.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/PerformanceUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.net.NetworkInterface; import java.net.SocketException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessage.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessage.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessage.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessage.java index 73367f2baf..6cb642e2a3 100755 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessage.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessage.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessageHandler.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessageHandler.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessageHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessageHandler.java index 4389636ea3..b8dfa7de51 100755 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/RpcMessageHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/RpcMessageHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.common.bytecode.NoSuchMethodException; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.common.bytecode.NoSuchMethodException; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; import java.lang.reflect.InvocationTargetException; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/TelnetServer.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/TelnetServer.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/TelnetServer.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/TelnetServer.java index a72965b65c..1364628a19 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/TelnetServer.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/TelnetServer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting; +package org.apache.dubbo.remoting; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; /** * TelnetServer diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBufferTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/AbstractChannelBufferTest.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBufferTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/AbstractChannelBufferTest.java index 1ad0478dcd..78cce382a3 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/AbstractChannelBufferTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/AbstractChannelBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import org.junit.After; import org.junit.Before; @@ -26,8 +26,8 @@ import java.nio.ByteBuffer; import java.util.Arrays; import java.util.Random; -import static com.alibaba.dubbo.remoting.buffer.ChannelBuffers.directBuffer; -import static com.alibaba.dubbo.remoting.buffer.ChannelBuffers.wrappedBuffer; +import static org.apache.dubbo.remoting.buffer.ChannelBuffers.directBuffer; +import static org.apache.dubbo.remoting.buffer.ChannelBuffers.wrappedBuffer; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java index 8e92c628a5..abf4821cfd 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ByteBufferBackedChannelBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import java.nio.ByteBuffer; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferStreamTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ChannelBufferStreamTest.java similarity index 98% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferStreamTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ChannelBufferStreamTest.java index e48bdbd0ec..64e92167b7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/ChannelBufferStreamTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/ChannelBufferStreamTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferTest.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferTest.java index 83b87b30ab..c4ce299a03 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DirectChannelBufferTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DirectChannelBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import org.junit.Assert; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBufferTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DynamicChannelBufferTest.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBufferTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DynamicChannelBufferTest.java index 39a71aafde..8b4ca6ea40 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/DynamicChannelBufferTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/DynamicChannelBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferTest.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferTest.java index 03be4c41fc..f1c70b2ecb 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/buffer/HeapChannelBufferTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/buffer/HeapChannelBufferTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.buffer; +package org.apache.dubbo.remoting.buffer; import org.junit.Assert; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/AbstractMockChannel.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/AbstractMockChannel.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/AbstractMockChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/AbstractMockChannel.java index aa4402983c..b2d8bc9624 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/AbstractMockChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/AbstractMockChannel.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.codec; +package org.apache.dubbo.remoting.codec; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; import java.util.HashMap; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/ExchangeCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/ExchangeCodecTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java index 23cbcd80f1..cde663ded7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/ExchangeCodecTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/ExchangeCodecTest.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.codec; +package org.apache.dubbo.remoting.codec; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.io.Bytes; -import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec; -import com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.io.Bytes; +import org.apache.dubbo.common.io.UnsafeByteArrayOutputStream; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.codec.ExchangeCodec; +import org.apache.dubbo.remoting.telnet.codec.TelnetCodec; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/TelnetCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/TelnetCodecTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java index 2e8a41ad59..4a81121317 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/codec/TelnetCodecTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/codec/TelnetCodecTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.codec; +package org.apache.dubbo.remoting.codec; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; -import com.alibaba.dubbo.remoting.telnet.codec.TelnetCodec; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.remoting.telnet.codec.TelnetCodec; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java index 1933c19e43..5909a58666 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartBeatTaskTest.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.exchange.Request; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.exchange.Request; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/MockChannel.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/MockChannel.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/MockChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/MockChannel.java index 2e4eef5ffc..df750e0af5 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/MockChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/exchange/support/header/MockChannel.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java index 74b8896c15..699ad5c059 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/ConnectChannelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/ConnectChannelHandlerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.handler; +package org.apache.dubbo.remoting.handler; -import com.alibaba.dubbo.remoting.ExecutionException; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedChannelHandler; +import org.apache.dubbo.remoting.ExecutionException; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.dispatcher.connection.ConnectionOrderedChannelHandler; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/HeaderExchangeHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/HeaderExchangeHandlerTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java index ff533098ad..660f2d6e85 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/HeaderExchangeHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/HeaderExchangeHandlerTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.handler; +package org.apache.dubbo.remoting.handler; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeHandler; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.header.HeaderExchangeHandler; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannel.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannel.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannel.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannel.java index cded186335..902445e3c7 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannel.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannel.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.handler; +package org.apache.dubbo.remoting.handler; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; import java.util.HashMap; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannelHandler.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannelHandler.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannelHandler.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannelHandler.java index ec2bfab38b..d9ffe9bebc 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/MockedChannelHandler.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/MockedChannelHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.handler; +package org.apache.dubbo.remoting.handler; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.util.Collections; import java.util.Set; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/WrappedChannelHandlerTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/WrappedChannelHandlerTest.java index 7ff84a0aa1..1fa2a89719 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/handler/WrappedChannelHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/handler/WrappedChannelHandlerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.handler; +package org.apache.dubbo.remoting.handler; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.dispatcher.WrappedChannelHandler; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/AbstractCodecTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/AbstractCodecTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java index 2472c02c7b..735db70286 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/AbstractCodecTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/AbstractCodecTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport; +package org.apache.dubbo.remoting.transport; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; import junit.framework.TestCase; import org.hamcrest.CoreMatchers; import org.mockito.internal.verification.VerificationModeFactory; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapterTest.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapterTest.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java index 963aecf5f6..c986a8b942 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/CodecAdapterTest.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/CodecAdapterTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.codec; +package org.apache.dubbo.remoting.transport.codec; -import com.alibaba.dubbo.remoting.codec.ExchangeCodecTest; +import org.apache.dubbo.remoting.codec.ExchangeCodecTest; import org.junit.Before; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java index 2b44ada394..5dc5962ccf 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedExchangeCodec.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.codec; +package org.apache.dubbo.remoting.transport.codec; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.io.Bytes; -import com.alibaba.dubbo.common.io.StreamUtils; -import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream; -import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.DefaultFuture; -import com.alibaba.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.io.Bytes; +import org.apache.dubbo.common.io.StreamUtils; +import org.apache.dubbo.common.io.UnsafeByteArrayInputStream; +import org.apache.dubbo.common.io.UnsafeByteArrayOutputStream; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.DefaultFuture; +import org.apache.dubbo.remoting.transport.CodecSupport; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java rename to dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java index 33e8a64d5a..b0a1052409 100644 --- a/dubbo-remoting/dubbo-remoting-api/src/test/java/com/alibaba/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java +++ b/dubbo-remoting/dubbo-remoting-api/src/test/java/org/apache/dubbo/remoting/transport/codec/DeprecatedTelnetCodec.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.codec; +package org.apache.dubbo.remoting.transport.codec; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.CodecSupport; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyChannel.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyChannel.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyChannel.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyChannel.java index 2727251474..7cc96edad3 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyChannel.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyChannel.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractChannel; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractChannel; import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.Grizzly; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyClient.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyClient.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyClient.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyClient.java index 6ab20a7130..a929af3b44 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyClient.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyClient.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractClient; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractClient; import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.filterchain.FilterChainBuilder; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java index 239399f546..4e813f36f0 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyCodecAdapter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; -import com.alibaba.dubbo.remoting.buffer.DynamicChannelBuffer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.remoting.buffer.DynamicChannelBuffer; import org.glassfish.grizzly.Buffer; import org.glassfish.grizzly.Connection; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyHandler.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyHandler.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyHandler.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyHandler.java index 3ca4fbc30a..4ae6d8247b 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyHandler.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import org.glassfish.grizzly.Connection; import org.glassfish.grizzly.filterchain.BaseFilter; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyServer.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyServer.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyServer.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyServer.java index 06a828e9ea..65a8726305 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyServer.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyServer.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractServer; import org.glassfish.grizzly.filterchain.FilterChainBuilder; import org.glassfish.grizzly.filterchain.TransportFilter; diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java index 0a594cf073..bac7d6558c 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/java/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporter; /** * GrizzlyTransporter diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter deleted file mode 100644 index 1cd2509203..0000000000 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter +++ /dev/null @@ -1 +0,0 @@ -grizzly=com.alibaba.dubbo.remoting.transport.grizzly.GrizzlyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter new file mode 100644 index 0000000000..8e78c7f894 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter @@ -0,0 +1 @@ +grizzly=org.apache.dubbo.remoting.transport.grizzly.GrizzlyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-grizzly/src/main/test/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java b/dubbo-remoting/dubbo-remoting-grizzly/src/main/test/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-grizzly/src/main/test/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java rename to dubbo-remoting/dubbo-remoting-grizzly/src/main/test/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java index 9bb0693a63..e11c73267d 100644 --- a/dubbo-remoting/dubbo-remoting-grizzly/src/main/test/com/alibaba/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java +++ b/dubbo-remoting/dubbo-remoting-grizzly/src/main/test/org/apache/dubbo/remoting/transport/grizzly/GrizzlyTransporterTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.grizzly; +package org.apache.dubbo.remoting.transport.grizzly; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; import org.junit.Test; import static org.hamcrest.CoreMatchers.is; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpBinder.java similarity index 80% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpBinder.java index 1b3e1e7849..92e3dd02ce 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpBinder.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpBinder.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http; +package org.apache.dubbo.remoting.http; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * HttpBinder diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpHandler.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpHandler.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpHandler.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpHandler.java index ccc7f2f889..c8cd21781b 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpHandler.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpHandler.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http; +package org.apache.dubbo.remoting.http; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpServer.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpServer.java index 7b7f0b644a..2ff7692c7a 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/HttpServer.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/HttpServer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http; +package org.apache.dubbo.remoting.http; -import com.alibaba.dubbo.common.Resetable; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Resetable; +import org.apache.dubbo.common.URL; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinder.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinder.java index 6b708c1a01..4b2cd70b06 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinder.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinder.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.jetty; +package org.apache.dubbo.remoting.http.jetty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; /** * JettyHttpTransporter diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpServer.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpServer.java index d5366ac565..714c8ff097 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpServer.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/jetty/JettyHttpServer.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.jetty; +package org.apache.dubbo.remoting.http.jetty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.servlet.DispatcherServlet; -import com.alibaba.dubbo.remoting.http.servlet.ServletManager; -import com.alibaba.dubbo.remoting.http.support.AbstractHttpServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.servlet.DispatcherServlet; +import org.apache.dubbo.remoting.http.servlet.ServletManager; +import org.apache.dubbo.remoting.http.support.AbstractHttpServer; import org.mortbay.jetty.Server; import org.mortbay.jetty.nio.SelectChannelConnector; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/BootstrapListener.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/BootstrapListener.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/BootstrapListener.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/BootstrapListener.java index 5a570702f0..8c2e6f267b 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/BootstrapListener.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/BootstrapListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.servlet; +package org.apache.dubbo.remoting.http.servlet; import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/DispatcherServlet.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/DispatcherServlet.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/DispatcherServlet.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/DispatcherServlet.java index bdb05f6f67..bf75230fb3 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/DispatcherServlet.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/DispatcherServlet.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.servlet; +package org.apache.dubbo.remoting.http.servlet; -import com.alibaba.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpHandler; import javax.servlet.ServletException; import javax.servlet.http.HttpServlet; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpBinder.java similarity index 76% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpBinder.java index 28425e7d2a..cb4c82012e 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpBinder.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpBinder.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.servlet; +package org.apache.dubbo.remoting.http.servlet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; /** * ServletHttpTransporter diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpServer.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpServer.java index 3f9d4b614c..772e46e99b 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletHttpServer.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletHttpServer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.servlet; +package org.apache.dubbo.remoting.http.servlet; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.support.AbstractHttpServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.support.AbstractHttpServer; public class ServletHttpServer extends AbstractHttpServer { diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletManager.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletManager.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletManager.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletManager.java index 24dbd2ff91..0b22770419 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/servlet/ServletManager.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/servlet/ServletManager.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.servlet; +package org.apache.dubbo.remoting.http.servlet; import javax.servlet.ServletContext; import java.util.Map; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/support/AbstractHttpServer.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/support/AbstractHttpServer.java index 86cf6b12fb..ba4928d6f7 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/support/AbstractHttpServer.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/support/AbstractHttpServer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.support; +package org.apache.dubbo.remoting.http.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; import java.net.InetSocketAddress; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinder.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinder.java similarity index 80% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinder.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinder.java index 90e7a5f3e8..4e4a74bb7e 100755 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinder.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinder.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.tomcat; +package org.apache.dubbo.remoting.http.tomcat; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; public class TomcatHttpBinder implements HttpBinder { diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpServer.java b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpServer.java rename to dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java index 68cce424f9..ac050f16eb 100755 --- a/dubbo-remoting/dubbo-remoting-http/src/main/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpServer.java +++ b/dubbo-remoting/dubbo-remoting-http/src/main/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpServer.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.tomcat; +package org.apache.dubbo.remoting.http.tomcat; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.servlet.DispatcherServlet; -import com.alibaba.dubbo.remoting.http.servlet.ServletManager; -import com.alibaba.dubbo.remoting.http.support.AbstractHttpServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.servlet.DispatcherServlet; +import org.apache.dubbo.remoting.http.servlet.ServletManager; +import org.apache.dubbo.remoting.http.support.AbstractHttpServer; import org.apache.catalina.Context; import org.apache.catalina.LifecycleException; diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.http.HttpBinder b/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.http.HttpBinder deleted file mode 100644 index a241d7d563..0000000000 --- a/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.http.HttpBinder +++ /dev/null @@ -1,3 +0,0 @@ -servlet=com.alibaba.dubbo.remoting.http.servlet.ServletHttpBinder -jetty=com.alibaba.dubbo.remoting.http.jetty.JettyHttpBinder -tomcat=com.alibaba.dubbo.remoting.http.tomcat.TomcatHttpBinder \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.http.HttpBinder b/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.http.HttpBinder new file mode 100644 index 0000000000..d31dcb4d2e --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.http.HttpBinder @@ -0,0 +1,3 @@ +servlet=org.apache.dubbo.remoting.http.servlet.ServletHttpBinder +jetty=org.apache.dubbo.remoting.http.jetty.JettyHttpBinder +tomcat=org.apache.dubbo.remoting.http.tomcat.TomcatHttpBinder \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinderTest.java b/dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinderTest.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinderTest.java rename to dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinderTest.java index 47135dd146..4496e579a5 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/jetty/JettyHttpBinderTest.java +++ b/dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/jetty/JettyHttpBinderTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.jetty; +package org.apache.dubbo.remoting.http.jetty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; import org.apache.http.client.fluent.Request; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java b/dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java rename to dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java index 37c4b72177..0d38db40e2 100644 --- a/dubbo-remoting/dubbo-remoting-http/src/test/java/com/alibaba/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java +++ b/dubbo-remoting/dubbo-remoting-http/src/test/java/org/apache/dubbo/remoting/http/tomcat/TomcatHttpBinderTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.http.tomcat; +package org.apache.dubbo.remoting.http.tomcat; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; import org.apache.http.client.fluent.Request; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaChannel.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaChannel.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaChannel.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaChannel.java index f779c3b960..39c01f0585 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaChannel.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaChannel.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractChannel; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractChannel; import org.apache.mina.common.IoSession; import org.apache.mina.common.WriteFuture; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaClient.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaClient.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaClient.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaClient.java index 6f0ab9fe48..b2e4a6caa7 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaClient.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaClient.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractClient; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractClient; import org.apache.mina.common.ConnectFuture; import org.apache.mina.common.IoFuture; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaCodecAdapter.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaCodecAdapter.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaCodecAdapter.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaCodecAdapter.java index 9c3c2bf582..260bf62b35 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaCodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaCodecAdapter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; -import com.alibaba.dubbo.remoting.buffer.DynamicChannelBuffer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.remoting.buffer.DynamicChannelBuffer; import org.apache.mina.common.ByteBuffer; import org.apache.mina.common.IoSession; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaHandler.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaHandler.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaHandler.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaHandler.java index d4df644056..dabfe1c835 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaHandler.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; import org.apache.mina.common.IoHandlerAdapter; import org.apache.mina.common.IoSession; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaServer.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaServer.java index 57053c5f22..80e336d7e8 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaServer.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaServer.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractServer; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractServer; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelHandlers; import org.apache.mina.common.IoSession; import org.apache.mina.common.ThreadModel; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaTransporter.java similarity index 76% rename from dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java rename to dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaTransporter.java index 2380444cbd..4efdb13707 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/java/com/alibaba/dubbo/remoting/transport/mina/MinaTransporter.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/java/org/apache/dubbo/remoting/transport/mina/MinaTransporter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.mina; +package org.apache.dubbo.remoting.transport.mina; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporter; public class MinaTransporter implements Transporter { diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter deleted file mode 100644 index 237b77c5ed..0000000000 --- a/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter +++ /dev/null @@ -1 +0,0 @@ -mina=com.alibaba.dubbo.remoting.transport.mina.MinaTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter new file mode 100644 index 0000000000..28fba104ae --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-mina/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter @@ -0,0 +1 @@ +mina=org.apache.dubbo.remoting.transport.mina.MinaTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientToServerTest.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java index 9ec37c4e30..30e2cc7f4c 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientToServerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.Replier; import org.junit.Assert; import junit.framework.TestCase; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientsTest.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientsTest.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientsTest.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientsTest.java index 411fe6568b..ef7d956621 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/ClientsTest.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/ClientsTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.Transporter; -import com.alibaba.dubbo.remoting.transport.mina.MinaTransporter; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.Transporter; +import org.apache.dubbo.remoting.transport.mina.MinaTransporter; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/Hello.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/Hello.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/Hello.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/Hello.java index ababf973ef..9e0f7c7483 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/Hello.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/Hello.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/MinaClientToServerTest.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/MinaClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java index 902326eee2..d83236705d 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/MinaClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/MinaClientToServerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * MinaServerClientTest diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/World.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/World.java similarity index 96% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/World.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/World.java index 0aadf71b85..79fc3de515 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/World.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/World.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/WorldHandler.java b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/WorldHandler.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/WorldHandler.java rename to dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/WorldHandler.java index 393e9c9c6d..f74a6c1c88 100644 --- a/dubbo-remoting/dubbo-remoting-mina/src/test/java/com/alibaba/remoting/transport/mina/WorldHandler.java +++ b/dubbo-remoting/dubbo-remoting-mina/src/test/java/org/apache/remoting/transport/mina/WorldHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.remoting.transport.mina; +package org.apache.remoting.transport.mina; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * DataHandler diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java index 7d4462ef9c..2eb73a0db5 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBuffer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferFactory; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferFactory; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java index 68f73c67ad..de3e8091c4 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyBackedChannelBufferFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferFactory; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferFactory; import org.jboss.netty.buffer.ChannelBuffers; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyChannel.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyChannel.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyChannel.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyChannel.java index 65cc7b4fe1..0e7bc5dc42 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyChannel.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyChannel.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractChannel; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractChannel; import org.jboss.netty.channel.ChannelFuture; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyClient.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyClient.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyClient.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyClient.java index 8015e91ae5..a91aa58a6a 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyClient.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyClient.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractClient; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractClient; import org.jboss.netty.bootstrap.ClientBootstrap; import org.jboss.netty.channel.Channel; @@ -155,7 +155,7 @@ public class NettyClient extends AbstractClient { } @Override - protected com.alibaba.dubbo.remoting.Channel getChannel() { + protected org.apache.dubbo.remoting.Channel getChannel() { Channel c = channel; if (c == null || !c.isConnected()) return null; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyCodecAdapter.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyCodecAdapter.java similarity index 80% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyCodecAdapter.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyCodecAdapter.java index 9fbfad51d9..f23ee2dee0 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyCodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyCodecAdapter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.DynamicChannelBuffer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.DynamicChannelBuffer; import org.jboss.netty.buffer.ChannelBuffer; import org.jboss.netty.buffer.ChannelBuffers; @@ -50,9 +50,9 @@ final class NettyCodecAdapter { private final int bufferSize; - private final com.alibaba.dubbo.remoting.ChannelHandler handler; + private final org.apache.dubbo.remoting.ChannelHandler handler; - public NettyCodecAdapter(Codec2 codec, URL url, com.alibaba.dubbo.remoting.ChannelHandler handler) { + public NettyCodecAdapter(Codec2 codec, URL url, org.apache.dubbo.remoting.ChannelHandler handler) { this.codec = codec; this.url = url; this.handler = handler; @@ -73,8 +73,8 @@ final class NettyCodecAdapter { @Override protected Object encode(ChannelHandlerContext ctx, Channel ch, Object msg) throws Exception { - com.alibaba.dubbo.remoting.buffer.ChannelBuffer buffer = - com.alibaba.dubbo.remoting.buffer.ChannelBuffers.dynamicBuffer(1024); + org.apache.dubbo.remoting.buffer.ChannelBuffer buffer = + org.apache.dubbo.remoting.buffer.ChannelBuffers.dynamicBuffer(1024); NettyChannel channel = NettyChannel.getOrAddChannel(ch, url, handler); try { codec.encode(channel, buffer, msg); @@ -87,8 +87,8 @@ final class NettyCodecAdapter { private class InternalDecoder extends SimpleChannelUpstreamHandler { - private com.alibaba.dubbo.remoting.buffer.ChannelBuffer buffer = - com.alibaba.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; + private org.apache.dubbo.remoting.buffer.ChannelBuffer buffer = + org.apache.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; @Override public void messageReceived(ChannelHandlerContext ctx, MessageEvent event) throws Exception { @@ -104,20 +104,20 @@ final class NettyCodecAdapter { return; } - com.alibaba.dubbo.remoting.buffer.ChannelBuffer message; + org.apache.dubbo.remoting.buffer.ChannelBuffer message; if (buffer.readable()) { if (buffer instanceof DynamicChannelBuffer) { buffer.writeBytes(input.toByteBuffer()); message = buffer; } else { int size = buffer.readableBytes() + input.readableBytes(); - message = com.alibaba.dubbo.remoting.buffer.ChannelBuffers.dynamicBuffer( + message = org.apache.dubbo.remoting.buffer.ChannelBuffers.dynamicBuffer( size > bufferSize ? size : bufferSize); message.writeBytes(buffer, buffer.readableBytes()); message.writeBytes(input.toByteBuffer()); } } else { - message = com.alibaba.dubbo.remoting.buffer.ChannelBuffers.wrappedBuffer( + message = org.apache.dubbo.remoting.buffer.ChannelBuffers.wrappedBuffer( input.toByteBuffer()); } @@ -132,7 +132,7 @@ final class NettyCodecAdapter { try { msg = codec.decode(channel, message); } catch (IOException e) { - buffer = com.alibaba.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; + buffer = org.apache.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; throw e; } if (msg == Codec2.DecodeResult.NEED_MORE_INPUT) { @@ -140,7 +140,7 @@ final class NettyCodecAdapter { break; } else { if (saveReaderIndex == message.readerIndex()) { - buffer = com.alibaba.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; + buffer = org.apache.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; throw new IOException("Decode without read data."); } if (msg != null) { @@ -153,7 +153,7 @@ final class NettyCodecAdapter { message.discardReadBytes(); buffer = message; } else { - buffer = com.alibaba.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; + buffer = org.apache.dubbo.remoting.buffer.ChannelBuffers.EMPTY_BUFFER; } NettyChannel.removeChannelIfDisconnected(ctx.getChannel()); } diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHandler.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHandler.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHandler.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHandler.java index ae6dfbc870..c256039cb3 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; import org.jboss.netty.channel.ChannelHandler.Sharable; import org.jboss.netty.channel.ChannelHandlerContext; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHelper.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHelper.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHelper.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHelper.java index edf0c64b13..ec73094ce9 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyHelper.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyHelper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import org.jboss.netty.logging.AbstractInternalLogger; import org.jboss.netty.logging.InternalLogger; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyServer.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyServer.java index 5feddbc52d..f2ca73c347 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyServer.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyServer.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.transport.AbstractServer; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.transport.AbstractServer; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelHandlers; import org.jboss.netty.bootstrap.ServerBootstrap; import org.jboss.netty.channel.ChannelFactory; @@ -105,9 +105,9 @@ public class NettyServer extends AbstractServer implements Server { logger.warn(e.getMessage(), e); } try { - Collection channels = getChannels(); + Collection channels = getChannels(); if (channels != null && !channels.isEmpty()) { - for (com.alibaba.dubbo.remoting.Channel channel : channels) { + for (org.apache.dubbo.remoting.Channel channel : channels) { try { channel.close(); } catch (Throwable e) { diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyTransporter.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java rename to dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyTransporter.java index bbe0e96cf0..d85eecf18b 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/java/com/alibaba/dubbo/remoting/transport/netty/NettyTransporter.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/java/org/apache/dubbo/remoting/transport/netty/NettyTransporter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporter; public class NettyTransporter implements Transporter { diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter deleted file mode 100644 index eb9bcb2882..0000000000 --- a/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter +++ /dev/null @@ -1 +0,0 @@ -netty=com.alibaba.dubbo.remoting.transport.netty.NettyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter new file mode 100644 index 0000000000..4b43309ba2 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-netty/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter @@ -0,0 +1 @@ +netty=org.apache.dubbo.remoting.transport.netty.NettyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java index 6265f2d23a..74e894cbc1 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/exchange/support/header/HeartbeatHandlerTest.java @@ -15,20 +15,20 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.exchange.support.header; +package org.apache.dubbo.remoting.exchange.support.header; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.transport.dispatcher.FakeChannelHandlers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.transport.dispatcher.FakeChannelHandlers; import org.junit.Assert; import org.junit.After; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java index ae6812c2dd..0e17dab774 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/dispatcher/FakeChannelHandlers.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.dispatcher; +package org.apache.dubbo.remoting.transport.dispatcher; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Dispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Dispatcher; public class FakeChannelHandlers extends ChannelHandlers { diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java index f22ab11b1d..c5fc125d03 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientReconnectTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientReconnectTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.utils.DubboAppender; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.utils.DubboAppender; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; import org.apache.log4j.Level; import org.junit.Assert; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientToServerTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java index 91eebdd0a8..b217275663 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientToServerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.Replier; import org.junit.Assert; import junit.framework.TestCase; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientsTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientsTest.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientsTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientsTest.java index 3a6a3beaab..e39930a67a 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ClientsTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ClientsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.Transporter; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/Hello.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/Hello.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/Hello.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/Hello.java index a1ceeca5bb..5445acc626 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/Hello.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/Hello.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientTest.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientTest.java index 5e47ea5ae1..811adbd572 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.Exchangers; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientToServerTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientToServerTest.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientToServerTest.java index 7a5f238d13..e0242426f8 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyClientToServerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * NettyClientToServerTest diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyStringTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyStringTest.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyStringTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyStringTest.java index 1b1edfc117..440366eb66 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/NettyStringTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/NettyStringTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; import org.junit.AfterClass; import org.junit.BeforeClass; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetClientHandler.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetClientHandler.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetClientHandler.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetClientHandler.java index 37a6987260..0e0d917387 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetClientHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetClientHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * Date: 4/28/11 diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetServerHandler.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetServerHandler.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetServerHandler.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetServerHandler.java index 3030cf8f71..12b016ddc0 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/TelnetServerHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/TelnetServerHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * Date: 4/26/11 diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ThreadNameTest.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ThreadNameTest.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ThreadNameTest.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ThreadNameTest.java index 9050161093..951ed5b9c6 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/ThreadNameTest.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/ThreadNameTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import org.junit.After; import org.junit.Assert; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/World.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/World.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/World.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/World.java index cdbc19e1c0..3e940908aa 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/World.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/World.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/WorldHandler.java b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/WorldHandler.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/WorldHandler.java rename to dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/WorldHandler.java index bc66c83819..23dcab40e7 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/java/com/alibaba/dubbo/remoting/transport/netty/WorldHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/java/org/apache/dubbo/remoting/transport/netty/WorldHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty; +package org.apache.dubbo.remoting.transport.netty; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * DataHandler diff --git a/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml b/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml index 4ddb51cab3..acb85098b2 100644 --- a/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml +++ b/dubbo-remoting/dubbo-remoting-netty/src/test/resources/log4j.xml @@ -20,7 +20,7 @@ - + diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java index e6167cde52..20ac7a143e 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyBackedChannelBuffer.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferFactory; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferFactory; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; import io.netty.buffer.ByteBuf; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyChannel.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java similarity index 93% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyChannel.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java index 97c11547fd..39de3d9c61 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyChannel.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyChannel.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractChannel; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractChannel; import io.netty.channel.Channel; import io.netty.channel.ChannelFuture; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClient.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClient.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java index ea273aebfa..48e669c7c8 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClient.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClient.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.AbstractClient; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.AbstractClient; import io.netty.bootstrap.Bootstrap; import io.netty.buffer.PooledByteBufAllocator; @@ -154,7 +154,7 @@ public class NettyClient extends AbstractClient { } @Override - protected com.alibaba.dubbo.remoting.Channel getChannel() { + protected org.apache.dubbo.remoting.Channel getChannel() { Channel c = channel; if (c == null || !c.isActive()) return null; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientHandler.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientHandler.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java index f75d7028dd..c3f46d5236 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyClientHandler.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyCodecAdapter.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyCodecAdapter.java similarity index 88% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyCodecAdapter.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyCodecAdapter.java index 22833b775c..24d5d00f92 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyCodecAdapter.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyCodecAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; import io.netty.buffer.ByteBuf; import io.netty.channel.Channel; @@ -43,9 +43,9 @@ final class NettyCodecAdapter { private final URL url; - private final com.alibaba.dubbo.remoting.ChannelHandler handler; + private final org.apache.dubbo.remoting.ChannelHandler handler; - public NettyCodecAdapter(Codec2 codec, URL url, com.alibaba.dubbo.remoting.ChannelHandler handler) { + public NettyCodecAdapter(Codec2 codec, URL url, org.apache.dubbo.remoting.ChannelHandler handler) { this.codec = codec; this.url = url; this.handler = handler; @@ -63,7 +63,7 @@ final class NettyCodecAdapter { @Override protected void encode(ChannelHandlerContext ctx, Object msg, ByteBuf out) throws Exception { - com.alibaba.dubbo.remoting.buffer.ChannelBuffer buffer = new NettyBackedChannelBuffer(out); + org.apache.dubbo.remoting.buffer.ChannelBuffer buffer = new NettyBackedChannelBuffer(out); Channel ch = ctx.channel(); NettyChannel channel = NettyChannel.getOrAddChannel(ch, url, handler); try { diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServer.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java similarity index 87% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServer.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java index c4ffcf5dde..a8da94e05b 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServer.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServer.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ExecutorUtil; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.transport.AbstractServer; -import com.alibaba.dubbo.remoting.transport.dispatcher.ChannelHandlers; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ExecutorUtil; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.transport.AbstractServer; +import org.apache.dubbo.remoting.transport.dispatcher.ChannelHandlers; import io.netty.bootstrap.ServerBootstrap; import io.netty.buffer.PooledByteBufAllocator; @@ -109,9 +109,9 @@ public class NettyServer extends AbstractServer implements Server { logger.warn(e.getMessage(), e); } try { - Collection channels = getChannels(); + Collection channels = getChannels(); if (channels != null && channels.size() > 0) { - for (com.alibaba.dubbo.remoting.Channel channel : channels) { + for (org.apache.dubbo.remoting.Channel channel : channels) { try { channel.close(); } catch (Throwable e) { diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServerHandler.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServerHandler.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java index e23a500c26..88d54537ab 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyServerHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyServerHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; import io.netty.channel.ChannelDuplexHandler; import io.netty.channel.ChannelHandlerContext; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporter.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporter.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporter.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporter.java index 1a1f4bc7f7..03525206af 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporter.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporter; public class NettyTransporter implements Transporter { diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/FormattingTuple.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/FormattingTuple.java similarity index 97% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/FormattingTuple.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/FormattingTuple.java index abda86e40d..49bbce1f7a 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/FormattingTuple.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/FormattingTuple.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4.logging; +package org.apache.dubbo.remoting.transport.netty4.logging; /** diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/MessageFormatter.java b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java similarity index 99% rename from dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/MessageFormatter.java rename to dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java index 5ccf3f38bc..c8a6c2a3bc 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/java/com/alibaba/dubbo/remoting/transport/netty4/logging/MessageFormatter.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/java/org/apache/dubbo/remoting/transport/netty4/logging/MessageFormatter.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4.logging; +package org.apache.dubbo.remoting.transport.netty4.logging; import java.text.MessageFormat; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter deleted file mode 100644 index fbdb0340dd..0000000000 --- a/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter +++ /dev/null @@ -1 +0,0 @@ -netty4=com.alibaba.dubbo.remoting.transport.netty4.NettyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter b/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter new file mode 100644 index 0000000000..e6ec6d7172 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-netty4/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter @@ -0,0 +1 @@ +netty4=org.apache.dubbo.remoting.transport.netty4.NettyTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientReconnectTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientReconnectTest.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java index 59597bb162..aeadd06f9a 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientReconnectTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientReconnectTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.utils.DubboAppender; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.utils.DubboAppender; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientToServerTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java index d780e5bd32..4e89a0a564 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientToServerTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.remoting.exchange.support.Replier; import junit.framework.TestCase; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientsTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientsTest.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientsTest.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientsTest.java index c14bca2498..93d53e9b15 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/ClientsTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/ClientsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.Transporter; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.Transporter; import org.junit.Test; import static org.junit.Assert.*; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/Hello.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/Hello.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/Hello.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/Hello.java index fe2d31026b..5634f923ec 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/Hello.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/Hello.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientToServerTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientToServerTest.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java index 2c7ada22ea..2d1065df4c 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyClientToServerTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyClientToServerTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * Netty4ClientToServerTest diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporterTest.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporterTest.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporterTest.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporterTest.java index 6e04212b93..836c575a52 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/NettyTransporterTest.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/NettyTransporterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; import org.junit.Test; import java.util.concurrent.CountDownLatch; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/World.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/World.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/World.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/World.java index 5895f9babb..5d2641e442 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/World.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/World.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; import java.io.Serializable; diff --git a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/WorldHandler.java b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/WorldHandler.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/WorldHandler.java rename to dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/WorldHandler.java index c0b2fcdb0e..f31c3ec557 100644 --- a/dubbo-remoting/dubbo-remoting-netty4/src/test/java/com/alibaba/dubbo/remoting/transport/netty4/WorldHandler.java +++ b/dubbo-remoting/dubbo-remoting-netty4/src/test/java/org/apache/dubbo/remoting/transport/netty4/WorldHandler.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.transport.netty4; +package org.apache.dubbo.remoting.transport.netty4; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.support.Replier; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.support.Replier; /** * DataHandler diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Group.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Group.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Group.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Group.java index b965cce5c9..57483889df 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Group.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Group.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p; +package org.apache.dubbo.remoting.p2p; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; /** * Group. (SPI, Prototype, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networker.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networker.java index 56efe61188..ff99a0abfc 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networker.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p; +package org.apache.dubbo.remoting.p2p; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.SPI; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.SPI; +import org.apache.dubbo.remoting.RemotingException; /** * Networker. (SPI, Singleton, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networkers.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networkers.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networkers.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networkers.java index 81351c91f4..10f8138f90 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Networkers.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Networkers.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p; +package org.apache.dubbo.remoting.p2p; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; /** * Networkers. (API, Static, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Peer.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Peer.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Peer.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Peer.java index 7cdcd2cc06..b693f7670c 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/Peer.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/Peer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p; +package org.apache.dubbo.remoting.p2p; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; /** * Peer. (SPI, Prototype, ThreadSafe) diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeGroup.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeGroup.java index c1db547811..db6ef8c120 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeGroup.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange; +package org.apache.dubbo.remoting.p2p.exchange; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.p2p.Group; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.p2p.Group; /** * Group diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworker.java similarity index 85% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworker.java index b0fddf3b58..ba3ca8257c 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworker.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange; +package org.apache.dubbo.remoting.p2p.exchange; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; /** * Networker diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java similarity index 84% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java index 1b9222a4a3..c720d9e43f 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangeNetworkers.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange; +package org.apache.dubbo.remoting.p2p.exchange; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; /** * Networkers diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangePeer.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangePeer.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangePeer.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangePeer.java index 373aba76a0..998e54de40 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/ExchangePeer.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/ExchangePeer.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange; +package org.apache.dubbo.remoting.p2p.exchange; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.p2p.Peer; /** * Peer diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java index a727f41615..8408f65e28 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/AbstractExchangeGroup.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerDispatcher; -import com.alibaba.dubbo.remoting.p2p.Peer; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangePeer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerDispatcher; +import org.apache.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeGroup; +import org.apache.dubbo.remoting.p2p.exchange.ExchangePeer; import java.util.ArrayList; import java.util.Map; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java similarity index 81% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java index 0ed3612406..35d5ff7014 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/ExchangeServerPeer.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeServerDelegate; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangePeer; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.support.ExchangeServerDelegate; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeGroup; +import org.apache.dubbo.remoting.p2p.exchange.ExchangePeer; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java index d649eb1fb2..f2511a19ab 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeGroup.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.IOUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangePeer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.IOUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.p2p.exchange.ExchangePeer; import java.io.File; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java similarity index 76% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java index 0550a22cb6..6f66afcb84 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/FileExchangeNetworker.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeNetworker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeGroup; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeNetworker; /** * FileNetworker diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java index 99d0776bd8..ab6beff0c8 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeGroup.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangePeer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.p2p.exchange.ExchangePeer; import java.io.IOException; import java.net.DatagramPacket; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java similarity index 77% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java index f5523c99bf..cd46082286 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/exchange/support/MulticastExchangeNetworker.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.exchange.support; +package org.apache.dubbo.remoting.p2p.exchange.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeGroup; -import com.alibaba.dubbo.remoting.p2p.exchange.ExchangeNetworker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeGroup; +import org.apache.dubbo.remoting.p2p.exchange.ExchangeNetworker; /** * MulticastNetworker diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/AbstractGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/AbstractGroup.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/AbstractGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/AbstractGroup.java index 813bdcc9de..ffe5c69626 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/AbstractGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/AbstractGroup.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.Transporters; -import com.alibaba.dubbo.remoting.p2p.Group; -import com.alibaba.dubbo.remoting.p2p.Peer; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerDispatcher; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.Transporters; +import org.apache.dubbo.remoting.p2p.Group; +import org.apache.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.remoting.transport.ChannelHandlerDispatcher; import java.util.ArrayList; import java.util.Map; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileGroup.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileGroup.java index 22072bdcf5..8a67e0edcc 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileGroup.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.IOUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.IOUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.Peer; import java.io.File; import java.io.IOException; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileNetworker.java similarity index 78% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileNetworker.java index 8ec972e8a0..90569d4643 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/FileNetworker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/FileNetworker.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.Group; -import com.alibaba.dubbo.remoting.p2p.Networker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.Group; +import org.apache.dubbo.remoting.p2p.Networker; /** * FileNetworker diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastGroup.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastGroup.java similarity index 91% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastGroup.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastGroup.java index 979e6ef7bc..574ad5e119 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastGroup.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastGroup.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.Peer; import java.io.IOException; import java.net.DatagramPacket; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastNetworker.java similarity index 79% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastNetworker.java index 8b5c9277b0..09c8de2b54 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/MulticastNetworker.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/MulticastNetworker.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.p2p.Group; -import com.alibaba.dubbo.remoting.p2p.Networker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.p2p.Group; +import org.apache.dubbo.remoting.p2p.Networker; /** * MulticastNetworker diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/ServerPeer.java b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/ServerPeer.java similarity index 83% rename from dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/ServerPeer.java rename to dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/ServerPeer.java index d562b30440..83e5e8815b 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/java/com/alibaba/dubbo/remoting/p2p/support/ServerPeer.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/java/org/apache/dubbo/remoting/p2p/support/ServerPeer.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p.support; +package org.apache.dubbo.remoting.p2p.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Client; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Server; -import com.alibaba.dubbo.remoting.p2p.Group; -import com.alibaba.dubbo.remoting.p2p.Peer; -import com.alibaba.dubbo.remoting.transport.ServerDelegate; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Client; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Server; +import org.apache.dubbo.remoting.p2p.Group; +import org.apache.dubbo.remoting.p2p.Peer; +import org.apache.dubbo.remoting.transport.ServerDelegate; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.p2p.Networker b/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.p2p.Networker deleted file mode 100644 index 521c6c0414..0000000000 --- a/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.p2p.Networker +++ /dev/null @@ -1,2 +0,0 @@ -multicast=com.alibaba.dubbo.remoting.p2p.support.MulticastNetworker -file=com.alibaba.dubbo.remoting.p2p.support.FileNetworker \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.p2p.Networker b/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.p2p.Networker new file mode 100644 index 0000000000..08140a367c --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-p2p/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.p2p.Networker @@ -0,0 +1,2 @@ +multicast=org.apache.dubbo.remoting.p2p.support.MulticastNetworker +file=org.apache.dubbo.remoting.p2p.support.FileNetworker \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/com/alibaba/dubbo/remoting/p2p/PeerMain.java b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/PeerMain.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-p2p/src/test/java/com/alibaba/dubbo/remoting/p2p/PeerMain.java rename to dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/PeerMain.java index 375d6d9424..fc3bc28108 100644 --- a/dubbo-remoting/dubbo-remoting-p2p/src/test/java/com/alibaba/dubbo/remoting/p2p/PeerMain.java +++ b/dubbo-remoting/dubbo-remoting-p2p/src/test/java/org/apache/dubbo/remoting/p2p/PeerMain.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.p2p; +package org.apache.dubbo.remoting.p2p; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.transport.ChannelHandlerAdapter; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.transport.ChannelHandlerAdapter; import java.util.Collection; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ChildListener.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ChildListener.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java index e213a8afb1..0e876aff3e 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ChildListener.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ChildListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper; +package org.apache.dubbo.remoting.zookeeper; import java.util.List; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/StateListener.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/StateListener.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java index 7b9f03686d..a9da7196e0 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/StateListener.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/StateListener.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper; +package org.apache.dubbo.remoting.zookeeper; public interface StateListener { diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java similarity index 94% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java index f4132a2a54..25abde44e2 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperClient.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper; +package org.apache.dubbo.remoting.zookeeper; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; import java.util.List; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java similarity index 81% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java index bbddd8ceea..a339d97a17 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/ZookeeperTransporter.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/ZookeeperTransporter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper; +package org.apache.dubbo.remoting.zookeeper; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; @SPI("curator") public interface ZookeeperTransporter { diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java similarity index 92% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java index a08edc9a2b..5accb8579a 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClient.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.curator; +package org.apache.dubbo.remoting.zookeeper.curator; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.zookeeper.ChildListener; -import com.alibaba.dubbo.remoting.zookeeper.StateListener; -import com.alibaba.dubbo.remoting.zookeeper.support.AbstractZookeeperClient; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.zookeeper.ChildListener; +import org.apache.dubbo.remoting.zookeeper.StateListener; +import org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperClient; import org.apache.curator.framework.CuratorFramework; import org.apache.curator.framework.CuratorFrameworkFactory; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java index 4d7afef59a..363a69750d 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperTransporter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.curator; +package org.apache.dubbo.remoting.zookeeper.curator; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperClient; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; +import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; public class CuratorZookeeperTransporter implements ZookeeperTransporter { diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java similarity index 89% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java index 685effd465..5da3ab7b68 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/support/AbstractZookeeperClient.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.support; +package org.apache.dubbo.remoting.zookeeper.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.zookeeper.ChildListener; -import com.alibaba.dubbo.remoting.zookeeper.StateListener; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperClient; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.zookeeper.ChildListener; +import org.apache.dubbo.remoting.zookeeper.StateListener; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; import java.util.List; import java.util.Set; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java similarity index 95% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java index 3ed350aba0..c83a0ad064 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkClientWrapper.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.zkclient; +package org.apache.dubbo.remoting.zookeeper.zkclient; -import com.alibaba.dubbo.common.concurrent.ListenableFutureTask; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.Assert; +import org.apache.dubbo.common.concurrent.ListenableFutureTask; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.Assert; import org.I0Itec.zkclient.IZkChildListener; import org.I0Itec.zkclient.IZkStateListener; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java similarity index 90% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java index a27aab611c..8f0335e15d 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperClient.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.zkclient; +package org.apache.dubbo.remoting.zookeeper.zkclient; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.zookeeper.ChildListener; -import com.alibaba.dubbo.remoting.zookeeper.StateListener; -import com.alibaba.dubbo.remoting.zookeeper.support.AbstractZookeeperClient; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.zookeeper.ChildListener; +import org.apache.dubbo.remoting.zookeeper.StateListener; +import org.apache.dubbo.remoting.zookeeper.support.AbstractZookeeperClient; import org.I0Itec.zkclient.IZkChildListener; import org.I0Itec.zkclient.IZkStateListener; diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java similarity index 82% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java index 17be601a07..de5ee4b9d4 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/com/alibaba/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/java/org/apache/dubbo/remoting/zookeeper/zkclient/ZkclientZookeeperTransporter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.zkclient; +package org.apache.dubbo.remoting.zookeeper.zkclient; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperClient; -import com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.zookeeper.ZookeeperClient; +import org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter; public class ZkclientZookeeperTransporter implements ZookeeperTransporter { diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter deleted file mode 100644 index d3debfe12c..0000000000 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter +++ /dev/null @@ -1,2 +0,0 @@ -zkclient=com.alibaba.dubbo.remoting.zookeeper.zkclient.ZkclientZookeeperTransporter -curator=com.alibaba.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter new file mode 100644 index 0000000000..e9b9349f33 --- /dev/null +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter @@ -0,0 +1,2 @@ +zkclient=org.apache.dubbo.remoting.zookeeper.zkclient.ZkclientZookeeperTransporter +curator=org.apache.dubbo.remoting.zookeeper.curator.CuratorZookeeperTransporter \ No newline at end of file diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java similarity index 86% rename from dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java rename to dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java index a3d8a169cc..c0dbee20cf 100644 --- a/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/com/alibaba/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java +++ b/dubbo-remoting/dubbo-remoting-zookeeper/src/test/java/org/apache/dubbo/remoting/zookeeper/curator/CuratorZookeeperClientTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.remoting.zookeeper.curator; +package org.apache.dubbo.remoting.zookeeper.curator; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; import org.apache.curator.test.TestingServer; import org.junit.After; import org.junit.Assert; @@ -40,8 +40,8 @@ public class CuratorZookeeperClientTest { @Test public void testCheckExists() { - CuratorZookeeperClient curatorClient = new CuratorZookeeperClient(URL.valueOf("zookeeper://127.0.0.1:" + this.zkServerPort + "/com.alibaba.dubbo.registry.RegistryService")); - String path = "/dubbo/com.alibaba.dubbo.demo.DemoService/providers"; + CuratorZookeeperClient curatorClient = new CuratorZookeeperClient(URL.valueOf("zookeeper://127.0.0.1:" + this.zkServerPort + "/org.apache.dubbo.registry.RegistryService")); + String path = "/dubbo/org.apache.dubbo.demo.DemoService/providers"; curatorClient.create(path, false); Assert.assertThat(curatorClient.checkExists(path), is(true)); Assert.assertThat(curatorClient.checkExists(path + "/noneexits"), is(false)); diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContext.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContext.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContext.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContext.java index f5e4e5cb15..dca53ce46a 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContext.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContext.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; public interface AsyncContext { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContextImpl.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContextImpl.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java index f5b7a49de6..d169587469 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncContextImpl.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncContextImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncResult.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncResult.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncResult.java index 015c52c264..bf314a7a7a 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncResult.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncRpcResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncRpcResult.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java index 47b4166cff..dfc05985c5 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/AsyncRpcResult.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/AsyncRpcResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.util.concurrent.CompletableFuture; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Exporter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Exporter.java similarity index 82% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Exporter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Exporter.java index ffafddd28f..c0a71164f0 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Exporter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Exporter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; /** * Exporter. (API/SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.rpc.Protocol#export(Invoker) - * @see com.alibaba.dubbo.rpc.ExporterListener - * @see com.alibaba.dubbo.rpc.protocol.AbstractExporter + * @see org.apache.dubbo.rpc.Protocol#export(Invoker) + * @see org.apache.dubbo.rpc.ExporterListener + * @see org.apache.dubbo.rpc.protocol.AbstractExporter */ public interface Exporter { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ExporterListener.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ExporterListener.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ExporterListener.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ExporterListener.java index 90f93c1cc9..a7c9c5de8a 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ExporterListener.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ExporterListener.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; /** * ExporterListener. (SPI, Singleton, ThreadSafe) @@ -29,7 +29,7 @@ public interface ExporterListener { * * @param exporter * @throws RpcException - * @see com.alibaba.dubbo.rpc.Protocol#export(Invoker) + * @see org.apache.dubbo.rpc.Protocol#export(Invoker) */ void exported(Exporter exporter) throws RpcException; @@ -38,7 +38,7 @@ public interface ExporterListener { * * @param exporter * @throws RpcException - * @see com.alibaba.dubbo.rpc.Exporter#unexport() + * @see org.apache.dubbo.rpc.Exporter#unexport() */ void unexported(Exporter exporter); diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Filter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Filter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java index aed081d35a..3483a60705 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Filter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Filter.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; /** * Filter. (SPI, Singleton, ThreadSafe) @@ -38,7 +38,7 @@ public interface Filter { * @param invocation invocation. * @return invoke result. * @throws RpcException - * @see com.alibaba.dubbo.rpc.Invoker#invoke(Invocation) + * @see org.apache.dubbo.rpc.Invoker#invoke(Invocation) */ Result invoke(Invoker invoker, Invocation invocation) throws RpcException; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invocation.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invocation.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invocation.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invocation.java index e5a022074e..2b5f3dd9e9 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invocation.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invocation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Map; * Invocation. (API, Prototype, NonThreadSafe) * * @serial Don't change the class name and package name. - * @see com.alibaba.dubbo.rpc.Invoker#invoke(Invocation) - * @see com.alibaba.dubbo.rpc.RpcInvocation + * @see org.apache.dubbo.rpc.Invoker#invoke(Invocation) + * @see org.apache.dubbo.rpc.RpcInvocation */ public interface Invocation { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java similarity index 80% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invoker.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java index b04a56303c..04186fad82 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Invoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Invoker.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Node; +import org.apache.dubbo.common.Node; /** * Invoker. (API/SPI, Prototype, ThreadSafe) * - * @see com.alibaba.dubbo.rpc.Protocol#refer(Class, com.alibaba.dubbo.common.URL) - * @see com.alibaba.dubbo.rpc.InvokerListener - * @see com.alibaba.dubbo.rpc.protocol.AbstractInvoker + * @see org.apache.dubbo.rpc.Protocol#refer(Class, org.apache.dubbo.common.URL) + * @see org.apache.dubbo.rpc.InvokerListener + * @see org.apache.dubbo.rpc.protocol.AbstractInvoker */ public interface Invoker extends Node { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java index 022b51d6d9..6842dd8750 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/InvokerListener.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/InvokerListener.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.SPI; /** * InvokerListener. (SPI, Singleton, ThreadSafe) @@ -30,7 +30,7 @@ public interface InvokerListener { * * @param invoker * @throws RpcException - * @see com.alibaba.dubbo.rpc.Protocol#refer(Class, URL) + * @see org.apache.dubbo.rpc.Protocol#refer(Class, URL) */ void referred(Invoker invoker) throws RpcException; @@ -38,7 +38,7 @@ public interface InvokerListener { * The invoker destroyed. * * @param invoker - * @see com.alibaba.dubbo.rpc.Invoker#destroy() + * @see org.apache.dubbo.rpc.Invoker#destroy() */ void destroyed(Invoker invoker); diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Protocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Protocol.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Protocol.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Protocol.java index b44d49cbb3..f5705e55ab 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Protocol.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Protocol.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * Protocol. (API/SPI, Singleton, ThreadSafe) diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ProxyFactory.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ProxyFactory.java index fb03d6bda4..50cb62d41d 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ProxyFactory.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ProxyFactory.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; /** * ProxyFactory. (API/SPI, Singleton, ThreadSafe) diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Result.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Result.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Result.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Result.java index 6a74b2b906..90b772fb0d 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/Result.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/Result.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.util.Map; @@ -22,8 +22,8 @@ import java.util.Map; * RPC invoke result. (API, Prototype, NonThreadSafe) * * @serial Don't change the class name and package name. - * @see com.alibaba.dubbo.rpc.Invoker#invoke(Invocation) - * @see com.alibaba.dubbo.rpc.RpcResult + * @see org.apache.dubbo.rpc.Invoker#invoke(Invocation) + * @see org.apache.dubbo.rpc.RpcResult */ public interface Result { @@ -65,7 +65,7 @@ public interface Result { Object recreate() throws Throwable; /** - * @see com.alibaba.dubbo.rpc.Result#getValue() + * @see org.apache.dubbo.rpc.Result#getValue() * @deprecated Replace to getValue() */ @Deprecated diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcConstants.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcConstants.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcConstants.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcConstants.java index b3810a909d..ce2925a6c4 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcConstants.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcConstants.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Constants; +import org.apache.dubbo.common.Constants; /** * RpcConstants * - * @deprecated Replace to com.alibaba.dubbo.common.Constants + * @deprecated Replace to org.apache.dubbo.common.Constants */ @Deprecated public final class RpcConstants extends Constants { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java index f5dd0654ed..068dc9f50c 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcContext.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcContext.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.threadlocal.InternalThreadLocal; -import com.alibaba.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.threadlocal.InternalThreadLocal; +import org.apache.dubbo.common.utils.NetUtils; import java.net.InetSocketAddress; import java.util.ArrayList; @@ -43,7 +43,7 @@ import java.util.concurrent.TimeoutException; * starts invoking C, and saves invocation info from B to C after B invokes C. * * @export - * @see com.alibaba.dubbo.rpc.filter.ContextFilter + * @see org.apache.dubbo.rpc.filter.ContextFilter */ public class RpcContext { @@ -108,7 +108,7 @@ public class RpcContext { /** * remove server side context. * - * @see com.alibaba.dubbo.rpc.filter.ContextFilter + * @see org.apache.dubbo.rpc.filter.ContextFilter */ public static void removeServerContext() { SERVER_LOCAL.remove(); @@ -126,7 +126,7 @@ public class RpcContext { /** * remove context. * - * @see com.alibaba.dubbo.rpc.filter.ContextFilter + * @see org.apache.dubbo.rpc.filter.ContextFilter */ public static void removeContext() { LOCAL.remove(); diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcException.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcException.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcException.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcException.java index 749cb3eda0..2596912d04 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcException.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcException.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; /** * RPC Exception. (API, Prototype, ThreadSafe) * * @serial Don't change the class name and properties. * @export - * @see com.alibaba.dubbo.rpc.Invoker#invoke(Invocation) + * @see org.apache.dubbo.rpc.Invoker#invoke(Invocation) * @since 1.0 */ -public final class RpcException extends RuntimeException { +public /**final**/ class RpcException extends RuntimeException { public static final int UNKNOWN_EXCEPTION = 0; public static final int NETWORK_EXCEPTION = 1; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcInvocation.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcInvocation.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java index 1458131ba6..b40f544cf5 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcInvocation.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcInvocation.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcResult.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcResult.java index 8d3811bde4..17fbbf0a63 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcResult.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcResult.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.io.Serializable; import java.util.HashMap; @@ -55,7 +55,7 @@ public class RpcResult implements Result, Serializable { } /** - * @see com.alibaba.dubbo.rpc.RpcResult#getValue() + * @see org.apache.dubbo.rpc.RpcResult#getValue() * @deprecated Replace to getValue() */ @Override @@ -65,7 +65,7 @@ public class RpcResult implements Result, Serializable { } /** - * @see com.alibaba.dubbo.rpc.RpcResult#setValue(Object) + * @see org.apache.dubbo.rpc.RpcResult#setValue(Object) * @deprecated Replace to setValue() */ @Deprecated diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcStatus.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcStatus.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcStatus.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcStatus.java index bf8e6cbd7e..8b20cc4493 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/RpcStatus.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/RpcStatus.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -28,9 +28,9 @@ import java.util.concurrent.atomic.AtomicLong; /** * URL statistics. (API, Cached, ThreadSafe) * - * @see com.alibaba.dubbo.rpc.filter.ActiveLimitFilter - * @see com.alibaba.dubbo.rpc.filter.ExecuteLimitFilter - * @see com.alibaba.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance + * @see org.apache.dubbo.rpc.filter.ActiveLimitFilter + * @see org.apache.dubbo.rpc.filter.ExecuteLimitFilter + * @see org.apache.dubbo.rpc.cluster.loadbalance.LeastActiveLoadBalance */ public class RpcStatus { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ServiceClassHolder.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ServiceClassHolder.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ServiceClassHolder.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ServiceClassHolder.java index b480e14be3..bbbf755f1f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/ServiceClassHolder.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/ServiceClassHolder.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; /** * TODO this is just a workaround for rest protocol, and now we just ensure it works in the most common dubbo usages diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/StaticContext.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/StaticContext.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/StaticContext.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/StaticContext.java index 8db0df644e..30caf57109 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/StaticContext.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/StaticContext.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java index 304a34bb68..58965e1196 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/AccessLogFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/AccessLogFilter.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; import com.alibaba.fastjson.JSON; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NamedThreadFactory; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NamedThreadFactory; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; import java.io.File; import java.io.FileWriter; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java index 773657c2e8..7f7aff8024 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ActiveLimitFilter.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcStatus; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcStatus; /** * LimitInvokerFilter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java similarity index 78% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java index 66f11dd379..17a6ca01f6 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ClassLoaderFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ClassLoaderFilter.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; /** * ClassLoaderInvokerFilter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java index 0998fe7979..aef65aa36b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/CompatibleFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/CompatibleFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.CompatibleTypeUtils; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.CompatibleTypeUtils; +import org.apache.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ConsumerContextFilter.java similarity index 75% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ConsumerContextFilter.java index 8c9f822d7f..9d4e4e9f2c 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ConsumerContextFilter.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; /** * ConsumerContextInvokerFilter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java index f423349260..1c74592c04 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ContextFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ContextFilter.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/DeprecatedFilter.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/DeprecatedFilter.java index 3416bcfcc0..14732ddbd2 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/DeprecatedFilter.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.Set; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/EchoFilter.java similarity index 75% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/EchoFilter.java index 134c496c84..becdba3047 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/EchoFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/EchoFilter.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; /** * EchoInvokerFilter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java index 40b8046466..6d97b93f61 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExceptionFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExceptionFilter.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.service.GenericService; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java index b025f68629..17e05f785f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/ExecuteLimitFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/ExecuteLimitFilter.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcStatus; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcStatus; import java.util.concurrent.Semaphore; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java index 8404a99f3c..b78b0cafed 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericFilter.java @@ -14,31 +14,31 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.beanutil.JavaBeanAccessor; -import com.alibaba.dubbo.common.beanutil.JavaBeanDescriptor; -import com.alibaba.dubbo.common.beanutil.JavaBeanSerializeUtil; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream; -import com.alibaba.dubbo.common.io.UnsafeByteArrayOutputStream; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.service.GenericException; -import com.alibaba.dubbo.rpc.service.GenericService; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.beanutil.JavaBeanAccessor; +import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; +import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.io.UnsafeByteArrayInputStream; +import org.apache.dubbo.common.io.UnsafeByteArrayOutputStream; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.io.IOException; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java index 6be08fef47..6df1262fbe 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/GenericImplFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/GenericImplFilter.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.beanutil.JavaBeanAccessor; -import com.alibaba.dubbo.common.beanutil.JavaBeanDescriptor; -import com.alibaba.dubbo.common.beanutil.JavaBeanSerializeUtil; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.service.GenericException; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.beanutil.JavaBeanAccessor; +import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; +import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.service.GenericException; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.lang.reflect.Constructor; import java.lang.reflect.Field; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java similarity index 79% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java index 3800fe9997..ad783efd99 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TimeoutFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TimeoutFilter.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.Arrays; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TokenFilter.java similarity index 79% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TokenFilter.java index c5df12104b..3b9695fb16 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TokenFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TokenFilter.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TpsLimitFilter.java similarity index 78% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TpsLimitFilter.java index fbdc311598..ad4137a050 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/TpsLimitFilter.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.filter.tps.DefaultTPSLimiter; -import com.alibaba.dubbo.rpc.filter.tps.TPSLimiter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.filter.tps.DefaultTPSLimiter; +import org.apache.dubbo.rpc.filter.tps.TPSLimiter; /** * Limit TPS for either service or service's particular method diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/DefaultTPSLimiter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/DefaultTPSLimiter.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/DefaultTPSLimiter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/DefaultTPSLimiter.java index 03890cb63c..431a31f7ae 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/DefaultTPSLimiter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/DefaultTPSLimiter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter.tps; +package org.apache.dubbo.rpc.filter.tps; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/StatItem.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/StatItem.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/StatItem.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/StatItem.java index d3b768f453..6ef9ab524b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/StatItem.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/StatItem.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter.tps; +package org.apache.dubbo.rpc.filter.tps; import java.util.concurrent.atomic.AtomicInteger; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/TPSLimiter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/TPSLimiter.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/TPSLimiter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/TPSLimiter.java index 9ee9430090..7145a96cdf 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/filter/tps/TPSLimiter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/filter/tps/TPSLimiter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter.tps; +package org.apache.dubbo.rpc.filter.tps; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; public interface TPSLimiter { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/DeprecatedInvokerListener.java similarity index 79% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/DeprecatedInvokerListener.java index f53c2d1aab..2dbbfa96c6 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/DeprecatedInvokerListener.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/DeprecatedInvokerListener.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.listener; +package org.apache.dubbo.rpc.listener; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; /** * DeprecatedProtocolFilter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ExporterListenerAdapter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ExporterListenerAdapter.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ExporterListenerAdapter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ExporterListenerAdapter.java index cd2ebbe403..e4f9e50d56 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ExporterListenerAdapter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ExporterListenerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.listener; +package org.apache.dubbo.rpc.listener; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.ExporterListener; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.ExporterListener; +import org.apache.dubbo.rpc.RpcException; /** * ExporterListenerAdapter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/InvokerListenerAdapter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/InvokerListenerAdapter.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/InvokerListenerAdapter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/InvokerListenerAdapter.java index fd482fe62a..4de28e9c83 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/InvokerListenerAdapter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/InvokerListenerAdapter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.listener; +package org.apache.dubbo.rpc.listener; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.RpcException; /** * InvokerListenerAdapter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerExporterWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerExporterWrapper.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerExporterWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerExporterWrapper.java index 84ad7ff36a..ca7fd93aae 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerExporterWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerExporterWrapper.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.listener; +package org.apache.dubbo.rpc.listener; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.ExporterListener; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.ExporterListener; +import org.apache.dubbo.rpc.Invoker; import java.util.List; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java index f585b2aed5..f3e8f8054f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/listener/ListenerInvokerWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/listener/ListenerInvokerWrapper.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.listener; +package org.apache.dubbo.rpc.listener; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.List; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractExporter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractExporter.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractExporter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractExporter.java index f749af8f43..3e7cd60943 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractExporter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractExporter.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; /** * AbstractExporter. diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java index dd5c158e33..a00a993835 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractInvoker.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.support.RpcUtils; import java.lang.reflect.InvocationTargetException; import java.util.Collections; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java index 8ae4680382..86ef44ca54 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProtocol.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProtocol.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.util.ArrayList; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProxyProtocol.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProxyProtocol.java index 561520c49e..c87f244ac6 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/AbstractProxyProtocol.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/AbstractProxyProtocol.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.List; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/InvokerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/InvokerWrapper.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/InvokerWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/InvokerWrapper.java index 4dfdc9dc06..c85e69111e 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/InvokerWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/InvokerWrapper.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; /** * InvokerWrapper diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolFilterWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolFilterWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java index b2baf5c3e8..0e0867f839 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolFilterWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolFilterWrapper.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.List; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java similarity index 78% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java index 68c00485d5..96e37cc81e 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/protocol/ProtocolListenerWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/protocol/ProtocolListenerWrapper.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol; +package org.apache.dubbo.rpc.protocol; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.ExporterListener; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.InvokerListener; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.listener.ListenerExporterWrapper; -import com.alibaba.dubbo.rpc.listener.ListenerInvokerWrapper; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.ExporterListener; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.InvokerListener; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.listener.ListenerExporterWrapper; +import org.apache.dubbo.rpc.listener.ListenerInvokerWrapper; import java.util.Collections; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyFactory.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyFactory.java index 1e3ed49fe0..f9cdfb141f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyFactory.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.service.EchoService; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.service.EchoService; +import org.apache.dubbo.rpc.service.GenericService; /** * AbstractProxyFactory diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java index 26dfdafb01..8675f348e1 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/AbstractProxyInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/AbstractProxyInvoker.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; import java.lang.reflect.InvocationTargetException; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/InvokerInvocationHandler.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/InvokerInvocationHandler.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java index 488f6ca251..f5b1c242f9 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/InvokerInvocationHandler.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/InvokerInvocationHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.support.RpcUtils; import java.lang.reflect.InvocationHandler; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java similarity index 82% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java index 6ac30374d7..f2bb163826 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/javassist/JavassistProxyFactory.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy.javassist; +package org.apache.dubbo.rpc.proxy.javassist; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.bytecode.Proxy; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.proxy.AbstractProxyFactory; -import com.alibaba.dubbo.rpc.proxy.AbstractProxyInvoker; -import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.bytecode.Proxy; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.proxy.AbstractProxyFactory; +import org.apache.dubbo.rpc.proxy.AbstractProxyInvoker; +import org.apache.dubbo.rpc.proxy.InvokerInvocationHandler; /** * JavaassistRpcProxyFactory diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/jdk/JdkProxyFactory.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/jdk/JdkProxyFactory.java index 6173d961a7..b74fb70256 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/jdk/JdkProxyFactory.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/jdk/JdkProxyFactory.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy.jdk; +package org.apache.dubbo.rpc.proxy.jdk; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.proxy.AbstractProxyFactory; -import com.alibaba.dubbo.rpc.proxy.AbstractProxyInvoker; -import com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.proxy.AbstractProxyFactory; +import org.apache.dubbo.rpc.proxy.AbstractProxyInvoker; +import org.apache.dubbo.rpc.proxy.InvokerInvocationHandler; import java.lang.reflect.Method; import java.lang.reflect.Proxy; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java index 3f3ed3ff49..b1f6e7a546 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/proxy/wrapper/StubProxyFactoryWrapper.java @@ -14,24 +14,24 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy.wrapper; +package org.apache.dubbo.rpc.proxy.wrapper; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.service.GenericService; import java.lang.reflect.Constructor; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/EchoService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/EchoService.java index c2fc8d7fc7..c9125dc5bf 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/EchoService.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/EchoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.service; +package org.apache.dubbo.rpc.service; /** * Echo service. diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericException.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericException.java index 2f77a6e9ad..ca22670f89 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericException.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericException.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.service; +package org.apache.dubbo.rpc.service; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.utils.StringUtils; /** * GenericException diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericService.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericService.java index 79ab06f4d6..124db22807 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/service/GenericService.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/service/GenericService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.service; +package org.apache.dubbo.rpc.service; /** * Generic service interface diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateExporter.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateExporter.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateExporter.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateExporter.java index 14be9ea958..76d6dd42e0 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateExporter.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateExporter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; /** * DelegateExporter diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateInvoker.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateInvoker.java index 97060a8f38..eea4fcbc80 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/DelegateInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/DelegateInvoker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; /** * DelegateInvoker diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockInvoker.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockInvoker.java index 7ee2b20016..9f71c41f5a 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockInvoker.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; import com.alibaba.fastjson.JSON; import java.lang.reflect.Constructor; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockProtocol.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockProtocol.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockProtocol.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockProtocol.java index aec5586bfb..0b6f4d145f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/MockProtocol.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/MockProtocol.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; /** * MockProtocol is used for generating a mock invoker by URL and type on consumer side diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/ProtocolUtils.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/ProtocolUtils.java index 7ed7ff3f60..5242cbd893 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/ProtocolUtils.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/ProtocolUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; public class ProtocolUtils { diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/RpcUtils.java b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/RpcUtils.java rename to dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java index 6b2a9aa039..78b4ed2912 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/main/java/com/alibaba/dubbo/rpc/support/RpcUtils.java +++ b/dubbo-rpc/dubbo-rpc-api/src/main/java/org/apache/dubbo/rpc/support/RpcUtils.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.config.AsyncFor; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.config.AsyncFor; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcInvocation; import java.lang.reflect.Method; import java.lang.reflect.Type; diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 2689465c24..0000000000 --- a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1,14 +0,0 @@ -echo=com.alibaba.dubbo.rpc.filter.EchoFilter -generic=com.alibaba.dubbo.rpc.filter.GenericFilter -genericimpl=com.alibaba.dubbo.rpc.filter.GenericImplFilter -token=com.alibaba.dubbo.rpc.filter.TokenFilter -accesslog=com.alibaba.dubbo.rpc.filter.AccessLogFilter -activelimit=com.alibaba.dubbo.rpc.filter.ActiveLimitFilter -classloader=com.alibaba.dubbo.rpc.filter.ClassLoaderFilter -context=com.alibaba.dubbo.rpc.filter.ContextFilter -consumercontext=com.alibaba.dubbo.rpc.filter.ConsumerContextFilter -exception=com.alibaba.dubbo.rpc.filter.ExceptionFilter -executelimit=com.alibaba.dubbo.rpc.filter.ExecuteLimitFilter -deprecated=com.alibaba.dubbo.rpc.filter.DeprecatedFilter -compatible=com.alibaba.dubbo.rpc.filter.CompatibleFilter -timeout=com.alibaba.dubbo.rpc.filter.TimeoutFilter \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.InvokerListener b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.InvokerListener deleted file mode 100644 index 6ec09b5370..0000000000 --- a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.InvokerListener +++ /dev/null @@ -1 +0,0 @@ -deprecated=com.alibaba.dubbo.rpc.listener.DeprecatedInvokerListener \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 6d823d6a1e..0000000000 --- a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1,3 +0,0 @@ -filter=com.alibaba.dubbo.rpc.protocol.ProtocolFilterWrapper -listener=com.alibaba.dubbo.rpc.protocol.ProtocolListenerWrapper -mock=com.alibaba.dubbo.rpc.support.MockProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ProxyFactory b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ProxyFactory deleted file mode 100644 index d281b8a564..0000000000 --- a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ProxyFactory +++ /dev/null @@ -1,3 +0,0 @@ -stub=com.alibaba.dubbo.rpc.proxy.wrapper.StubProxyFactoryWrapper -jdk=com.alibaba.dubbo.rpc.proxy.jdk.JdkProxyFactory -javassist=com.alibaba.dubbo.rpc.proxy.javassist.JavassistProxyFactory \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..376f966e7b --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1,14 @@ +echo=org.apache.dubbo.rpc.filter.EchoFilter +generic=org.apache.dubbo.rpc.filter.GenericFilter +genericimpl=org.apache.dubbo.rpc.filter.GenericImplFilter +token=org.apache.dubbo.rpc.filter.TokenFilter +accesslog=org.apache.dubbo.rpc.filter.AccessLogFilter +activelimit=org.apache.dubbo.rpc.filter.ActiveLimitFilter +classloader=org.apache.dubbo.rpc.filter.ClassLoaderFilter +context=org.apache.dubbo.rpc.filter.ContextFilter +consumercontext=org.apache.dubbo.rpc.filter.ConsumerContextFilter +exception=org.apache.dubbo.rpc.filter.ExceptionFilter +executelimit=org.apache.dubbo.rpc.filter.ExecuteLimitFilter +deprecated=org.apache.dubbo.rpc.filter.DeprecatedFilter +compatible=org.apache.dubbo.rpc.filter.CompatibleFilter +timeout=org.apache.dubbo.rpc.filter.TimeoutFilter \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.InvokerListener b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.InvokerListener new file mode 100644 index 0000000000..3897512db5 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.InvokerListener @@ -0,0 +1 @@ +deprecated=org.apache.dubbo.rpc.listener.DeprecatedInvokerListener \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..689e812cd3 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1,3 @@ +filter=org.apache.dubbo.rpc.protocol.ProtocolFilterWrapper +listener=org.apache.dubbo.rpc.protocol.ProtocolListenerWrapper +mock=org.apache.dubbo.rpc.support.MockProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.ProxyFactory b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.ProxyFactory new file mode 100644 index 0000000000..a39a6f81da --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-api/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.ProxyFactory @@ -0,0 +1,3 @@ +stub=org.apache.dubbo.rpc.proxy.wrapper.StubProxyFactoryWrapper +jdk=org.apache.dubbo.rpc.proxy.jdk.JdkProxyFactory +javassist=org.apache.dubbo.rpc.proxy.javassist.JavassistProxyFactory \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/CustomArgument.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/CustomArgument.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/CustomArgument.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/CustomArgument.java index 37ac5952df..53db49d9b4 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/CustomArgument.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/CustomArgument.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.rpc.support.Type; +import org.apache.dubbo.rpc.support.Type; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/DemoRequest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/DemoRequest.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/DemoRequest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/DemoRequest.java index 40bdd51b52..97d9ddc523 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/DemoRequest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/DemoRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/ProtocolUtils.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/ProtocolUtils.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/ProtocolUtils.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/ProtocolUtils.java index eb2b396824..46a39b17f4 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/ProtocolUtils.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/ProtocolUtils.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc; +package org.apache.dubbo.rpc; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; /** * TODO Comment of ProtocolUtils diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/AccessLogFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/AccessLogFilterTest.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/AccessLogFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/AccessLogFilterTest.java index bd1b26aadc..5db1127791 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/AccessLogFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/AccessLogFilterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java index b5c08b7c53..b49e10fe25 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ActiveLimitFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ActiveLimitFilterTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.support.BlockMyInvoker; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.support.BlockMyInvoker; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/CompatibleFilterFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/CompatibleFilterFilterTest.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/CompatibleFilterFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/CompatibleFilterFilterTest.java index 4fe7828ea2..b94090745e 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/CompatibleFilterFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/CompatibleFilterFilterTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.support.DemoService; -import com.alibaba.dubbo.rpc.support.Type; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.support.DemoService; +import org.apache.dubbo.rpc.support.Type; import org.junit.After; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ConsumerContextFilterTest.java similarity index 77% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ConsumerContextFilterTest.java index 474ceac5c4..076361b3c9 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ConsumerContextFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ConsumerContextFilterTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.support.DemoService; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.support.DemoService; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ContextFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java similarity index 82% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ContextFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java index 4de385b914..a954785a01 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ContextFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ContextFilterTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.support.DemoService; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.support.DemoService; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/DeprecatedFilterTest.java similarity index 71% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/DeprecatedFilterTest.java index d8a526c900..d3a973a121 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/DeprecatedFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/DeprecatedFilterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.support.DemoService; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.support.DemoService; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; @@ -41,7 +41,7 @@ public class DeprecatedFilterTest { LogUtil.start(); deprecatedFilter.invoke(new MyInvoker(url), new MockInvocation()); assertEquals(1, - LogUtil.findMessage("The service method com.alibaba.dubbo.rpc.support.DemoService.echo(String) is DEPRECATED")); + LogUtil.findMessage("The service method org.apache.dubbo.rpc.support.DemoService.echo(String) is DEPRECATED")); LogUtil.stop(); } } \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/EchoFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/EchoFilterTest.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/EchoFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/EchoFilterTest.java index ec8f5793c4..ea9dd4d19c 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/EchoFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/EchoFilterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.support.DemoService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.support.DemoService; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ExceptionFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ExceptionFilterTest.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ExceptionFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ExceptionFilterTest.java index 8d10c8f76b..e08adf898f 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/ExceptionFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/ExceptionFilterTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.support.DemoService; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.support.DemoService; import org.junit.Test; import org.mockito.Mockito; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilterTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/TpsLimitFilterTest.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilterTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/TpsLimitFilterTest.java index 8416ee4949..acb96ccc49 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/TpsLimitFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/TpsLimitFilterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter; +package org.apache.dubbo.rpc.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.support.MockInvocation; -import com.alibaba.dubbo.rpc.support.MyInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.support.MockInvocation; +import org.apache.dubbo.rpc.support.MyInvoker; import org.junit.Test; @@ -36,7 +36,7 @@ public class TpsLimitFilterTest { public void testWithoutCount() throws Exception { URL url = URL.valueOf("test://test"); url = url.addParameter(Constants.INTERFACE_KEY, - "com.alibaba.dubbo.rpc.file.TpsService"); + "org.apache.dubbo.rpc.file.TpsService"); url = url.addParameter(Constants.TPS_LIMIT_RATE_KEY, 5); Invoker invoker = new MyInvoker(url); Invocation invocation = new MockInvocation(); @@ -47,7 +47,7 @@ public class TpsLimitFilterTest { public void testFail() throws Exception { URL url = URL.valueOf("test://test"); url = url.addParameter(Constants.INTERFACE_KEY, - "com.alibaba.dubbo.rpc.file.TpsService"); + "org.apache.dubbo.rpc.file.TpsService"); url = url.addParameter(Constants.TPS_LIMIT_RATE_KEY, 5); Invoker invoker = new MyInvoker(url); Invocation invocation = new MockInvocation(); diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/tps/StatItemTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/tps/StatItemTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java index c211af12c7..2693bb1c56 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/filter/tps/StatItemTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/filter/tps/StatItemTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.filter.tps; +package org.apache.dubbo.rpc.filter.tps; import org.junit.After; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoRequest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoRequest.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoRequest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoRequest.java index f806447ce8..dfa5919792 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoRequest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoService.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoService.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoService.java index 24b378c3c5..4eac40ff37 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; public interface DemoService { void sayHello(String name); diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoServiceImpl.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoServiceImpl.java index 3b2993e47a..9395f9d9e8 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/DemoServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; /** * DemoServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteService.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteService.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteService.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteService.java index 9558625306..ce462e587a 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteService.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; import java.rmi.Remote; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteServiceImpl.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteServiceImpl.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteServiceImpl.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteServiceImpl.java index e6e82bdbd8..4a60dbc8e0 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/RemoteServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/RemoteServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/Type.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/Type.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/Type.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/Type.java index 1b7248b707..994897cf91 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/proxy/Type.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/proxy/Type.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.proxy; +package org.apache.dubbo.rpc.proxy; public enum Type { High, Normal, Lower diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/BlockMyInvoker.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/BlockMyInvoker.java index 6d83e7f945..28baacbf61 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/BlockMyInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/BlockMyInvoker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; public class BlockMyInvoker extends MyInvoker { diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoService.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoService.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoService.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoService.java index d99843bfe1..b84f379f40 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoService.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.rpc.CustomArgument; +import org.apache.dubbo.rpc.CustomArgument; public interface DemoService { void sayHello(String name); diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoServiceImpl.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoServiceImpl.java index 87932daf4d..b2355ac35d 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/DemoServiceImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.rpc.CustomArgument; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.CustomArgument; +import org.apache.dubbo.rpc.RpcContext; /** * DemoServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/IEcho.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/IEcho.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/IEcho.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/IEcho.java index 86aabb1d08..8f18699fb6 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/IEcho.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/IEcho.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; public interface IEcho { String echo(String e); diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MockInvocation.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvocation.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MockInvocation.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvocation.java index 4d290918cc..5b7261de7b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MockInvocation.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MockInvocation.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MyInvoker.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MyInvoker.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MyInvoker.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MyInvoker.java index 19b4a648e7..23d9c4efe6 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/MyInvoker.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/MyInvoker.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; /** * MockInvoker.java diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Person.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Person.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Person.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Person.java index 09ef6ff185..b043606f16 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Person.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/RpcUtilsTest.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/RpcUtilsTest.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java index ec355e7fbe..01859cac0b 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/RpcUtilsTest.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/RpcUtilsTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcInvocation; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Type.java b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Type.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Type.java rename to dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Type.java index 33d386b5f1..d4d78c90c0 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/java/com/alibaba/dubbo/rpc/support/Type.java +++ b/dubbo-rpc/dubbo-rpc-api/src/test/java/org/apache/dubbo/rpc/support/Type.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.support; +package org.apache.dubbo.rpc.support; public enum Type { High, Normal, Lower diff --git a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml b/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml index 30e13346af..f041044f08 100644 --- a/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml +++ b/dubbo-rpc/dubbo-rpc-api/src/test/resources/log4j.xml @@ -20,7 +20,7 @@ - + diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java index 26bda1c925..426fe91730 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/CallbackServiceCodec.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.bytecode.Wrapper; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.bytecode.Wrapper; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcInvocation; import java.io.IOException; import java.util.HashMap; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java index b564c85bbe..4c78c1cceb 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ChannelWrappedInvoker.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.TimeoutException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeClient; -import com.alibaba.dubbo.remoting.transport.ClientDelegate; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.TimeoutException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.support.header.HeaderExchangeClient; +import org.apache.dubbo.remoting.transport.ClientDelegate; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; import java.net.InetSocketAddress; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java index 4002f04e3a..fdf541b35d 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcInvocation.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.Decodeable; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.transport.CodecSupport; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Decodeable; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.rpc.RpcInvocation; import java.io.IOException; import java.io.InputStream; @@ -37,7 +37,7 @@ import java.io.OutputStream; import java.util.HashMap; import java.util.Map; -import static com.alibaba.dubbo.rpc.protocol.dubbo.CallbackServiceCodec.decodeInvocationArgument; +import static org.apache.dubbo.rpc.protocol.dubbo.CallbackServiceCodec.decodeInvocationArgument; public class DecodeableRpcInvocation extends RpcInvocation implements Codec, Decodeable { diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java index f774557a60..50cdc76a18 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DecodeableRpcResult.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.utils.Assert; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec; -import com.alibaba.dubbo.remoting.Decodeable; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.transport.CodecSupport; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.utils.Assert; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec; +import org.apache.dubbo.remoting.Decodeable; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.support.RpcUtils; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java index 80e4209051..78970398c3 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCodec.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCodec.java @@ -14,34 +14,34 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.common.io.Bytes; -import com.alibaba.dubbo.common.io.UnsafeByteArrayInputStream; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.codec.ExchangeCodec; -import com.alibaba.dubbo.remoting.transport.CodecSupport; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.common.io.Bytes; +import org.apache.dubbo.common.io.UnsafeByteArrayInputStream; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.codec.ExchangeCodec; +import org.apache.dubbo.remoting.transport.CodecSupport; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcInvocation; import java.io.IOException; import java.io.InputStream; -import static com.alibaba.dubbo.rpc.protocol.dubbo.CallbackServiceCodec.encodeInvocationArgument; +import static org.apache.dubbo.rpc.protocol.dubbo.CallbackServiceCodec.encodeInvocationArgument; /** * Dubbo codec. diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCountCodec.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCountCodec.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java index 6305f97619..4093eb266d 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboCountCodec.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboCountCodec.java @@ -15,17 +15,17 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.MultiMessage; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.MultiMessage; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; import java.io.IOException; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboExporter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboExporter.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboExporter.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboExporter.java index 82b4c11b44..2f9c2eb9eb 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboExporter.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboExporter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.AbstractExporter; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.AbstractExporter; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java index 1aabb943cf..5b5ed0b3a3 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvoker.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvoker.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.AtomicPositiveInteger; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.TimeoutException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.rpc.AsyncRpcResult; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.AtomicPositiveInteger; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.TimeoutException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.rpc.AsyncRpcResult; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.rpc.support.RpcUtils; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java index 750fb05070..956a2e956f 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocol.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocol.java @@ -14,36 +14,36 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.support.SerializableClassRegistry; -import com.alibaba.dubbo.common.serialize.support.SerializationOptimizer; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Transporter; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.rpc.AsyncContextImpl; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.support.SerializableClassRegistry; +import org.apache.dubbo.common.serialize.support.SerializationOptimizer; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Transporter; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.rpc.AsyncContextImpl; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; import java.net.InetSocketAddress; import java.util.ArrayList; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java index 9fc478e9d1..ca9ecc72c7 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureAdapter.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/FutureAdapter.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ResponseCallback; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ResponseCallback; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ExecutionException; @@ -94,7 +94,7 @@ public class FutureAdapter extends CompletableFuture { int timeoutInMillis = (int) TimeUnit.MILLISECONDS.convert(timeout, unit); try { return (V) (((Result) future.get(timeoutInMillis)).recreate()); - } catch (com.alibaba.dubbo.remoting.TimeoutException e) { + } catch (org.apache.dubbo.remoting.TimeoutException e) { throw new TimeoutException(StringUtils.toString(e)); } catch (RemotingException e) { throw new ExecutionException(e.getMessage(), e); diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java index bc14ebaae2..508b7e7f39 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/LazyConnectExchangeClient.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Parameters; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.Parameters; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.ResponseFuture; import java.net.InetSocketAddress; import java.util.concurrent.atomic.AtomicLong; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java index e60ce515e2..2d35af4274 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClient.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.Parameters; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.Parameters; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ResponseFuture; import java.net.InetSocketAddress; import java.util.concurrent.ConcurrentMap; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java index 8e20a74c9e..c30281ac82 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/FutureFilter.java @@ -14,23 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.filter; +package org.apache.dubbo.rpc.protocol.dubbo.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.remoting.exchange.ResponseCallback; -import com.alibaba.dubbo.remoting.exchange.ResponseFuture; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.StaticContext; -import com.alibaba.dubbo.rpc.protocol.dubbo.FutureAdapter; -import com.alibaba.dubbo.rpc.support.RpcUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.remoting.exchange.ResponseCallback; +import org.apache.dubbo.remoting.exchange.ResponseFuture; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.StaticContext; +import org.apache.dubbo.rpc.protocol.dubbo.FutureAdapter; +import org.apache.dubbo.rpc.support.RpcUtils; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java index 1693b0b9a3..475c3eef2a 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/filter/TraceFilter.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.filter; +package org.apache.dubbo.rpc.protocol.dubbo.filter; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.ConcurrentHashSet; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.ConcurrentHashSet; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; import com.alibaba.fastjson.JSON; import java.util.ArrayList; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java index fb793ced54..ccbd646ec4 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ServerStatusChecker.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.status; +package org.apache.dubbo.rpc.protocol.dubbo.status; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import java.util.Collection; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java index 7b1b721bf1..27bc6730d8 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/status/ThreadPoolStatusChecker.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.status; +package org.apache.dubbo.rpc.protocol.dubbo.status; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.status.Status; -import com.alibaba.dubbo.common.status.StatusChecker; -import com.alibaba.dubbo.common.store.DataStore; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.status.Status; +import org.apache.dubbo.common.status.StatusChecker; +import org.apache.dubbo.common.store.DataStore; import java.util.Map; import java.util.concurrent.ExecutorService; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java index 60fecdc65f..bca855a7c8 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandler.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; /** * ChangeServiceTelnetHandler diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java index 202c49b056..81e4900e13 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CountTelnetHandler.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.remoting.telnet.support.TelnetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcStatus; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.remoting.telnet.support.TelnetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcStatus; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import java.lang.reflect.Method; import java.util.ArrayList; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java index ff3d94ad66..dfd337a4ff 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandler.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; /** * CurrentServiceTelnetHandler diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java index 47f11f5b08..4464add83f 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokeTelnetHandler.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.PojoUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import com.alibaba.fastjson.JSON; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java index 554cca0d94..5a933814de 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java index c8379b3e46..ae8ac964f7 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.logger.Level; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.logger.Level; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; import java.io.File; import java.io.FileInputStream; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java index e12243e1ee..4965548cfb 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandler.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import java.util.Collection; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java index 65c6fd6798..5045b31dac 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/TraceTelnetHandler.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.extension.Activate; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.remoting.telnet.support.Help; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.filter.TraceFilter; +import org.apache.dubbo.common.extension.Activate; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.telnet.support.Help; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.filter.TraceFilter; import java.lang.reflect.Method; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker deleted file mode 100644 index 3e063fb5b8..0000000000 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker +++ /dev/null @@ -1,2 +0,0 @@ -server=com.alibaba.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker -threadpool=com.alibaba.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 deleted file mode 100644 index f786cae172..0000000000 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 +++ /dev/null @@ -1 +0,0 @@ -dubbo=com.alibaba.dubbo.rpc.protocol.dubbo.DubboCountCodec \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler deleted file mode 100644 index 33ebee2d0b..0000000000 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler +++ /dev/null @@ -1,7 +0,0 @@ -ls=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ListTelnetHandler -ps=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.PortTelnetHandler -cd=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.ChangeTelnetHandler -pwd=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CurrentTelnetHandler -invoke=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler -trace=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.TraceTelnetHandler -count=com.alibaba.dubbo.rpc.protocol.dubbo.telnet.CountTelnetHandler \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter deleted file mode 100644 index 749239254d..0000000000 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter +++ /dev/null @@ -1,2 +0,0 @@ -trace=com.alibaba.dubbo.rpc.protocol.dubbo.filter.TraceFilter -future=com.alibaba.dubbo.rpc.protocol.dubbo.filter.FutureFilter \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 6725d68521..0000000000 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -dubbo=com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker new file mode 100644 index 0000000000..92362bf706 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker @@ -0,0 +1,2 @@ +server=org.apache.dubbo.rpc.protocol.dubbo.status.ServerStatusChecker +threadpool=org.apache.dubbo.rpc.protocol.dubbo.status.ThreadPoolStatusChecker \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 new file mode 100644 index 0000000000..0a193239e4 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 @@ -0,0 +1 @@ +dubbo=org.apache.dubbo.rpc.protocol.dubbo.DubboCountCodec \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler new file mode 100644 index 0000000000..ad5b55f9e0 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler @@ -0,0 +1,7 @@ +ls=org.apache.dubbo.rpc.protocol.dubbo.telnet.ListTelnetHandler +ps=org.apache.dubbo.rpc.protocol.dubbo.telnet.PortTelnetHandler +cd=org.apache.dubbo.rpc.protocol.dubbo.telnet.ChangeTelnetHandler +pwd=org.apache.dubbo.rpc.protocol.dubbo.telnet.CurrentTelnetHandler +invoke=org.apache.dubbo.rpc.protocol.dubbo.telnet.InvokeTelnetHandler +trace=org.apache.dubbo.rpc.protocol.dubbo.telnet.TraceTelnetHandler +count=org.apache.dubbo.rpc.protocol.dubbo.telnet.CountTelnetHandler \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter new file mode 100644 index 0000000000..79a7a380df --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter @@ -0,0 +1,2 @@ +trace=org.apache.dubbo.rpc.protocol.dubbo.filter.TraceFilter +future=org.apache.dubbo.rpc.protocol.dubbo.filter.FutureFilter \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..9052f95baf --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +dubbo=org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java index 6629aa13ff..c3eecc8d79 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboInvokerAvilableTest.java @@ -14,22 +14,23 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeServer; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.support.header.HeaderExchangeServer; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import java.lang.reflect.Field; @@ -80,7 +81,6 @@ public class DubboInvokerAvilableTest { @Test public void test_normal_channel_close_wait_gracefully() throws Exception { - URL url = URL.valueOf("dubbo://127.0.0.1:20883/hi?scope=true&lazy=false"); Exporter exporter = ProtocolUtils.export(new DemoServiceImpl(), IDemoService.class, url); Exporter exporter0 = ProtocolUtils.export(new DemoServiceImpl0(), IDemoService.class, url); diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java index de492f78af..b89ce5c1d4 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboLazyConnectTest.java @@ -14,14 +14,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java index 4ef0c4d5e0..32dd1f486e 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/DubboProtocolTest.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.NonSerialized; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.RemoteService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.RemoteServiceImpl; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.Type; -import com.alibaba.dubbo.rpc.service.EchoService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; +import org.apache.dubbo.rpc.protocol.dubbo.support.NonSerialized; +import org.apache.dubbo.rpc.protocol.dubbo.support.RemoteService; +import org.apache.dubbo.rpc.protocol.dubbo.support.RemoteServiceImpl; +import org.apache.dubbo.rpc.protocol.dubbo.support.Type; +import org.apache.dubbo.rpc.service.EchoService; import org.junit.Assert; import org.junit.Test; @@ -165,7 +165,7 @@ public class DubboProtocolTest { service.nonSerializedParameter(new NonSerialized()); Assert.fail(); } catch (RpcException e) { - Assert.assertTrue(e.getMessage().contains("com.alibaba.dubbo.rpc.protocol.dubbo.support.NonSerialized must implement java.io.Serializable")); + Assert.assertTrue(e.getMessage().contains("org.apache.dubbo.rpc.protocol.dubbo.support.NonSerialized must implement java.io.Serializable")); } } @@ -178,7 +178,7 @@ public class DubboProtocolTest { service.returnNonSerialized(); Assert.fail(); } catch (RpcException e) { - Assert.assertTrue(e.getMessage().contains("com.alibaba.dubbo.rpc.protocol.dubbo.support.NonSerialized must implement java.io.Serializable")); + Assert.assertTrue(e.getMessage().contains("org.apache.dubbo.rpc.protocol.dubbo.support.NonSerialized must implement java.io.Serializable")); } } } \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java index 96e5c81d30..623be8629e 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ExplicitCallbackTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.After; import org.junit.Assert; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureFilterTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureFilterTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java index 4be71e4675..69d27eaf6f 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/FutureFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/FutureFilterTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.dubbo.filter.FutureFilter; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Filter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.dubbo.filter.FutureFilter; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; import org.junit.BeforeClass; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java index 728a424538..ca2ecc568d 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ImplicitCallBackTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.StaticContext; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.StaticContext; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.Assert; import org.junit.After; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/MultiThreadTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/MultiThreadTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java index 04cffa886f..4e573b8fd6 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/MultiThreadTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/MultiThreadTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; import junit.framework.TestCase; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java index d9b64c2fa3..2a31507345 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/ReferenceCountExchangeClientTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.DubboAppender; -import com.alibaba.dubbo.common.utils.LogUtil; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.DubboAppender; +import org.apache.dubbo.common.utils.LogUtil; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.ProxyFactory; import org.junit.Assert; import org.junit.Before; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/RpcFilterTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java similarity index 76% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/RpcFilterTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java index 8c0f7dd3b3..c1ac717140 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/RpcFilterTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/RpcFilterTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo; +package org.apache.dubbo.rpc.protocol.dubbo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; -import com.alibaba.dubbo.rpc.service.EchoService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoServiceImpl; +import org.apache.dubbo.rpc.service.EchoService; import junit.framework.TestCase; @@ -32,7 +32,7 @@ public class RpcFilterTest extends TestCase { public void testRpcFilter() throws Exception { DemoService service = new DemoServiceImpl(); - URL url = URL.valueOf("dubbo://127.0.0.1:9010/com.alibaba.dubbo.rpc.DemoService?service.filter=echo"); + URL url = URL.valueOf("dubbo://127.0.0.1:9010/org.apache.dubbo.rpc.DemoService?service.filter=echo"); protocol.export(proxy.getInvoker(service, DemoService.class, url)); service = proxy.getProxy(protocol.refer(DemoService.class, url)); assertEquals("123", service.echo("123")); diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/CustomArgument.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/CustomArgument.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/CustomArgument.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/CustomArgument.java index a139b0d6fa..4391988aaf 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/CustomArgument.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/CustomArgument.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoRequest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoRequest.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoRequest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoRequest.java index 2e2461336c..d7de5ecf11 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoRequest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoService.java index 182a1e8697..2668111f6a 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; import java.util.Map; import java.util.Set; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java index 93c9764675..f1ba82e174 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/DemoServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; import java.util.Map; import java.util.Set; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/EnumBak.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/EnumBak.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java index 295a9bd8da..a3d2972ac4 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/EnumBak.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/EnumBak.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.service.GenericService; import org.junit.Assert; import org.junit.Ignore; @@ -146,7 +146,7 @@ public class EnumBak { arg.put("type", "High"); arg.put("name", "hi"); - Object obj = demoProxy.$invoke("get", new String[]{"com.alibaba.dubbo.rpc.CustomArgument"}, new Object[]{arg}); + Object obj = demoProxy.$invoke("get", new String[]{"org.apache.dubbo.rpc.CustomArgument"}, new Object[]{arg}); System.out.println("obj---------->" + obj); reference.destroy(); } diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/NonSerialized.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/NonSerialized.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/NonSerialized.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/NonSerialized.java index e047aa2ddf..1ec80e5c0c 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/NonSerialized.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/NonSerialized.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; /** * NonSerialized diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Person.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Person.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Person.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Person.java index 7268503342..58cb712e3a 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Person.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java similarity index 82% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java index 64895babff..8552f4add3 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/ProtocolUtils.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; import java.util.Collection; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteService.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteService.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteService.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteService.java index d645d98e16..0a84fa4bdc 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteService.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; import java.rmi.Remote; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java index 1a0fa6f05f..967bc4c7e1 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/RemoteServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Type.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Type.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Type.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Type.java index 7487881b4a..893907e19a 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/support/Type.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/support/Type.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.support; +package org.apache.dubbo.rpc.protocol.dubbo.support; public enum Type { High, Normal, Lower diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java similarity index 76% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java index dfe7b69998..77a08324be 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ChangeTelnetHandlerTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.After; import org.junit.AfterClass; @@ -54,10 +54,10 @@ public class ChangeTelnetHandlerTest { public void setUp() { mockChannel = mock(Channel.class); mockInvoker = mock(Invoker.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); mockChannel.setAttribute("telnet.service", "DemoService"); givenLastCall(); - mockChannel.setAttribute("telnet.service", "com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + mockChannel.setAttribute("telnet.service", "org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); givenLastCall(); mockChannel.setAttribute("telnet.service", "demo"); givenLastCall(); @@ -87,8 +87,8 @@ public class ChangeTelnetHandlerTest { @Test public void testChangeName() throws RemotingException { DubboProtocol.getDubboProtocol().export(mockInvoker); - String result = change.telnet(mockChannel, "com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); - assertEquals("Used the com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService as default.\r\nYou can cancel default service by command: cd /", + String result = change.telnet(mockChannel, "org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); + assertEquals("Used the org.apache.dubbo.rpc.protocol.dubbo.support.DemoService as default.\r\nYou can cancel default service by command: cd /", result); } @@ -114,12 +114,12 @@ public class ChangeTelnetHandlerTest { @Test public void testChangeCancel() throws RemotingException { String result = change.telnet(mockChannel, ".."); - assertEquals("Cancelled default service com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService.", result); + assertEquals("Cancelled default service org.apache.dubbo.rpc.protocol.dubbo.support.DemoService.", result); } @Test public void testChangeCancel2() throws RemotingException { String result = change.telnet(mockChannel, "/"); - assertEquals("Cancelled default service com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService.", result); + assertEquals("Cancelled default service org.apache.dubbo.rpc.protocol.dubbo.support.DemoService.", result); } } \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java similarity index 84% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java index 2b30295327..eea4884e5d 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/CurrentTelnetHandlerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; import org.junit.After; import org.junit.Test; @@ -38,10 +38,10 @@ public class CurrentTelnetHandlerTest { @Test public void testService() throws RemotingException { mockChannel = mock(Channel.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); String result = count.telnet(mockChannel, ""); - assertEquals("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService", result); + assertEquals("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", result); } @Test diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java index 04092d0962..e1fe2c08e8 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/InvokerTelnetHandlerTest.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.After; import org.junit.Test; @@ -59,13 +59,13 @@ public class InvokerTelnetHandlerTest { given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20883/demo")); given(mockInvoker.invoke(any(Invocation.class))).willReturn(new RpcResult("ok")); mockChannel = mock(Channel.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); given(mockChannel.getLocalAddress()).willReturn(NetUtils.toAddress("127.0.0.1:5555")); given(mockChannel.getRemoteAddress()).willReturn(NetUtils.toAddress("127.0.0.1:20883")); DubboProtocol.getDubboProtocol().export(mockInvoker); String result = invoke.telnet(mockChannel, "DemoService.echo(\"ok\")"); - assertTrue(result.contains("Use default service com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService.\r\n\"ok\"\r\n")); + assertTrue(result.contains("Use default service org.apache.dubbo.rpc.protocol.dubbo.support.DemoService.\r\n\"ok\"\r\n")); } @SuppressWarnings("unchecked") diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java similarity index 83% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java index 7ebc417eed..1d3333edbf 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/ListTelnetHandlerTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.common.utils.ReflectUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.utils.ReflectUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.After; import org.junit.BeforeClass; @@ -85,7 +85,7 @@ public class ListTelnetHandlerTest { given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo")); given(mockInvoker.invoke(any(Invocation.class))).willReturn(new RpcResult("ok")); mockChannel = mock(Channel.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); DubboProtocol.getDubboProtocol().export(mockInvoker); String result = list.telnet(mockChannel, "-l DemoService"); @@ -100,7 +100,7 @@ public class ListTelnetHandlerTest { given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo")); given(mockInvoker.invoke(any(Invocation.class))).willReturn(new RpcResult("ok")); mockChannel = mock(Channel.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); DubboProtocol.getDubboProtocol().export(mockInvoker); String result = list.telnet(mockChannel, "DemoService"); @@ -119,7 +119,7 @@ public class ListTelnetHandlerTest { DubboProtocol.getDubboProtocol().export(mockInvoker); String result = list.telnet(mockChannel, ""); - assertEquals("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService", result); + assertEquals("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService", result); } @SuppressWarnings("unchecked") @@ -135,7 +135,7 @@ public class ListTelnetHandlerTest { DubboProtocol.getDubboProtocol().export(mockInvoker); String result = list.telnet(mockChannel, "-l"); - assertEquals("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService -> dubbo://127.0.0.1:" + port + "/demo", result); + assertEquals("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService -> dubbo://127.0.0.1:" + port + "/demo", result); } @SuppressWarnings("unchecked") @@ -146,11 +146,11 @@ public class ListTelnetHandlerTest { given(mockInvoker.getUrl()).willReturn(URL.valueOf("dubbo://127.0.0.1:20885/demo")); given(mockInvoker.invoke(any(Invocation.class))).willReturn(new RpcResult("ok")); mockChannel = mock(Channel.class); - given(mockChannel.getAttribute("telnet.service")).willReturn("com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService"); + given(mockChannel.getAttribute("telnet.service")).willReturn("org.apache.dubbo.rpc.protocol.dubbo.support.DemoService"); DubboProtocol.getDubboProtocol().export(mockInvoker); String result = list.telnet(mockChannel, ""); - assertEquals("Use default service com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService.\r\n\r\n" + assertEquals("Use default service org.apache.dubbo.rpc.protocol.dubbo.support.DemoService.\r\n\r\n" + methodsName, result); } diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java index 32d41e1bc8..092f458d8b 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/LogTelnetHandlerTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.telnet.TelnetHandler; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java rename to dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java index 5e46f54056..611008e49e 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/com/alibaba/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/java/org/apache/dubbo/rpc/protocol/dubbo/telnet/PortTelnetHandlerTest.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.dubbo.telnet; +package org.apache.dubbo.rpc.protocol.dubbo.telnet; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.telnet.TelnetHandler; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.DemoService; -import com.alibaba.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.telnet.TelnetHandler; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.dubbo.DubboProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.support.DemoService; +import org.apache.dubbo.rpc.protocol.dubbo.support.ProtocolUtils; import org.junit.After; import org.junit.Before; diff --git a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml index 5ee78642e3..0af90b6084 100644 --- a/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml +++ b/dubbo-rpc/dubbo-rpc-dubbo/src/test/resources/log4j.xml @@ -20,7 +20,7 @@ - + diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java rename to dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java index 8fe2f14de4..0cce1045f0 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/DubboHessianURLConnectionFactory.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.rpc.RpcContext; import com.caucho.hessian.client.HessianConnection; import com.caucho.hessian.client.HessianURLConnectionFactory; diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocol.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java rename to dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocol.java index 9733307d62..ebe1cbd8d7 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocol.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocol.java @@ -14,19 +14,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol; -import com.alibaba.dubbo.rpc.service.GenericService; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.support.ProtocolUtils; import com.caucho.hessian.HessianException; import com.caucho.hessian.client.HessianConnectionException; import com.caucho.hessian.client.HessianConnectionFactory; diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnection.java b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnection.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnection.java rename to dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnection.java index 777ba56f1b..2c339260ff 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnection.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnection.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; import com.caucho.hessian.client.HessianConnection; import org.apache.http.HttpResponse; diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java rename to dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java index b19cd275c8..24becb4c0c 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/main/java/com/alibaba/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/java/org/apache/dubbo/rpc/protocol/hessian/HttpClientConnectionFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.rpc.RpcContext; import com.caucho.hessian.client.HessianConnection; import com.caucho.hessian.client.HessianConnectionFactory; import com.caucho.hessian.client.HessianProxyFactory; diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 2738fa9091..0000000000 --- a/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -hessian=com.alibaba.dubbo.rpc.protocol.hessian.HessianProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..cecd14777e --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-hessian/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +hessian=org.apache.dubbo.rpc.protocol.hessian.HessianProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocolTest.java b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocolTest.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocolTest.java rename to dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocolTest.java index bae03335c5..e9abc0f30e 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianProtocolTest.java @@ -14,25 +14,25 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.beanutil.JavaBeanDescriptor; -import com.alibaba.dubbo.common.beanutil.JavaBeanSerializeUtil; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.serialize.nativejava.NativeJavaSerialization; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.hessian.HessianServiceImpl.MyException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; +import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.serialize.nativejava.NativeJavaSerialization; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.hessian.HessianServiceImpl.MyException; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.service.GenericService; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianService.java b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianService.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianService.java rename to dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianService.java index 9df4524f1d..9b3481ac18 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianService.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; /** diff --git a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianServiceImpl.java b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianServiceImpl.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianServiceImpl.java rename to dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianServiceImpl.java index 68d14b3f2b..8afd334e38 100644 --- a/dubbo-rpc/dubbo-rpc-hessian/src/test/java/com/alibaba/dubbo/rpc/protocol/hessian/HessianServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-hessian/src/test/java/org/apache/dubbo/rpc/protocol/hessian/HessianServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.hessian; +package org.apache.dubbo.rpc.protocol.hessian; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; /** * HessianServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java b/dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java rename to dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java index 3fc908749a..76130d69ea 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocol.java +++ b/dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpProtocol.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.http; +package org.apache.dubbo.rpc.protocol.http; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol; -import com.alibaba.dubbo.rpc.service.GenericService; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol; +import org.apache.dubbo.rpc.service.GenericService; +import org.apache.dubbo.rpc.support.ProtocolUtils; import org.aopalliance.intercept.MethodInvocation; import org.springframework.remoting.RemoteAccessException; import org.springframework.remoting.httpinvoker.HttpComponentsHttpInvokerRequestExecutor; diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpRemoteInvocation.java b/dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpRemoteInvocation.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpRemoteInvocation.java rename to dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpRemoteInvocation.java index 5054c4fded..77179f2456 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/main/java/com/alibaba/dubbo/rpc/protocol/http/HttpRemoteInvocation.java +++ b/dubbo-rpc/dubbo-rpc-http/src/main/java/org/apache/dubbo/rpc/protocol/http/HttpRemoteInvocation.java @@ -15,11 +15,11 @@ * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.http; +package org.apache.dubbo.rpc.protocol.http; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.RpcContext; import org.aopalliance.intercept.MethodInvocation; import org.springframework.remoting.support.RemoteInvocation; diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 4f8e312f9f..0000000000 --- a/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.dubbo.rpc.protocol.http.HttpProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..e0d103ea52 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-http/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +org.apache.dubbo.rpc.protocol.http.HttpProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocolTest.java b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocolTest.java rename to dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java index 014eed6558..2c75e6da85 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpProtocolTest.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.http; +package org.apache.dubbo.rpc.protocol.http; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.beanutil.JavaBeanDescriptor; -import com.alibaba.dubbo.common.beanutil.JavaBeanSerializeUtil; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.common.serialize.nativejava.NativeJavaSerialization; -import com.alibaba.dubbo.rpc.*; -import com.alibaba.dubbo.rpc.service.GenericService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.beanutil.JavaBeanDescriptor; +import org.apache.dubbo.common.beanutil.JavaBeanSerializeUtil; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.serialize.nativejava.NativeJavaSerialization; +import org.apache.dubbo.rpc.*; +import org.apache.dubbo.rpc.service.GenericService; import junit.framework.Assert; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpService.java b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpService.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpService.java rename to dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpService.java index 0d0d22c1e7..d9a0dc0c96 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpService.java +++ b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.http; +package org.apache.dubbo.rpc.protocol.http; /** diff --git a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpServiceImpl.java b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpServiceImpl.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpServiceImpl.java rename to dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpServiceImpl.java index 1c78b3ba69..c3d6e9734a 100644 --- a/dubbo-rpc/dubbo-rpc-http/src/test/java/com/alibaba/dubbo/rpc/protocol/http/HttpServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-http/src/test/java/org/apache/dubbo/rpc/protocol/http/HttpServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.http; +package org.apache.dubbo.rpc.protocol.http; /** * HttpServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmExporter.java b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmExporter.java similarity index 85% rename from dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmExporter.java rename to dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmExporter.java index b2004c8c20..3590e99752 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmExporter.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmExporter.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.protocol.AbstractExporter; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.protocol.AbstractExporter; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmInvoker.java b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java similarity index 80% rename from dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmInvoker.java rename to dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java index 08a7db2974..591022ecde 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmInvoker.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmInvoker.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocol.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java rename to dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocol.java index 74d9275fbe..eff37b801b 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/main/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocol.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocol.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.UrlUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; -import com.alibaba.dubbo.rpc.support.ProtocolUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.UrlUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.rpc.support.ProtocolUtils; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 09a526cc0f..0000000000 --- a/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -injvm=com.alibaba.dubbo.rpc.protocol.injvm.InjvmProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..92ec2df611 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-injvm/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +injvm=org.apache.dubbo.rpc.protocol.injvm.InjvmProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/Type.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/Type.java deleted file mode 100644 index 212e5a72fc..0000000000 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/Type.java +++ /dev/null @@ -1,21 +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.dubbo.rpc.protocol.injvm; - -public enum Type { - High, Normal, Lower -} \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoRequest.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoRequest.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoRequest.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoRequest.java index 906c3a977f..cbd2e340b2 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoRequest.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoRequest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; import java.io.Serializable; diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoService.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoService.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoService.java index 731e856159..8ecfaeede6 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; /** * TestService diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoServiceImpl.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoServiceImpl.java index 307168e5a8..ee7c368ecb 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/DemoServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; /** * DemoServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/IEcho.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/IEcho.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/IEcho.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/IEcho.java index 563d8fac98..8e40a7ac2b 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/IEcho.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/IEcho.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; public interface IEcho { String echo(String e); diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java index a390b73c6f..8d5c5d2eb8 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/InjvmProtocolTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; import org.junit.After; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/ProtocolTest.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/ProtocolTest.java similarity index 81% rename from dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/ProtocolTest.java rename to dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/ProtocolTest.java index 416192bddd..e68c4234ab 100644 --- a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/com/alibaba/dubbo/rpc/protocol/injvm/ProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/ProtocolTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.injvm; +package org.apache.dubbo.rpc.protocol.injvm; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; import org.junit.Test; @@ -38,7 +38,7 @@ public class ProtocolTest { ProxyFactory proxyFactory = ExtensionLoader.getExtensionLoader(ProxyFactory.class).getExtension("javassist"); - URL url = URL.valueOf("injvm://localhost:0/com.alibaba.dubbo.rpc.support.IEcho?interface=com.alibaba.dubbo.rpc.support.IEcho"); + URL url = URL.valueOf("injvm://localhost:0/org.apache.dubbo.rpc.support.IEcho?interface=org.apache.dubbo.rpc.support.IEcho"); Invoker invoker = proxyFactory.getInvoker(echo, IEcho.class, url); @@ -58,7 +58,7 @@ public class ProtocolTest { try { autowireProtocol.destroy(); } catch (UnsupportedOperationException expected) { - assertThat(expected.getMessage(), containsString("of interface com.alibaba.dubbo.rpc.Protocol is not adaptive method!")); + assertThat(expected.getMessage(), containsString("of interface org.apache.dubbo.rpc.Protocol is not adaptive method!")); } assertEquals("ok2", echoProxy.echo("ok2")); diff --git a/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/Type.java b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/Type.java new file mode 100644 index 0000000000..0598d34b53 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-injvm/src/test/java/org/apache/dubbo/rpc/protocol/injvm/Type.java @@ -0,0 +1,21 @@ +/* + * 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 org.apache.dubbo.rpc.protocol.injvm; + +public enum Type { + High, Normal, Lower +} \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-memcached/src/main/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocol.java b/dubbo-rpc/dubbo-rpc-memcached/src/main/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocol.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-memcached/src/main/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocol.java rename to dubbo-rpc/dubbo-rpc-memcached/src/main/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocol.java index 6cf4737e7a..8fa088bb95 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/src/main/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocol.java +++ b/dubbo-rpc/dubbo-rpc-memcached/src/main/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocol.java @@ -14,18 +14,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.memcached; +package org.apache.dubbo.rpc.protocol.memcached; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; import net.rubyeye.xmemcached.MemcachedClient; import net.rubyeye.xmemcached.MemcachedClientBuilder; diff --git a/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index e4588f21d9..0000000000 --- a/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -memcached=com.alibaba.dubbo.rpc.protocol.memcached.MemcachedProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..5102c3fe30 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-memcached/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +memcached=org.apache.dubbo.rpc.protocol.memcached.MemcachedProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-memcached/src/test/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java b/dubbo-rpc/dubbo-rpc-memcached/src/test/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-memcached/src/test/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java rename to dubbo-rpc/dubbo-rpc-memcached/src/test/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java index 5f35b9caa3..4f2a75265f 100644 --- a/dubbo-rpc/dubbo-rpc-memcached/src/test/java/com/alibaba/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-memcached/src/test/java/org/apache/dubbo/rpc/protocol/memcached/MemcachedProtocolTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.memcached; +package org.apache.dubbo.rpc.protocol.memcached; public class MemcachedProtocolTest { diff --git a/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java rename to dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java index dba2ac1b0e..7a5f7d7a74 100644 --- a/dubbo-rpc/dubbo-rpc-redis/src/main/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocol.java +++ b/dubbo-rpc/dubbo-rpc-redis/src/main/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocol.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.redis; +package org.apache.dubbo.rpc.protocol.redis; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; import org.apache.commons.pool2.impl.GenericObjectPoolConfig; import redis.clients.jedis.Jedis; diff --git a/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index e3683b2145..0000000000 --- a/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -redis=com.alibaba.dubbo.rpc.protocol.redis.RedisProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..e715493701 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-redis/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +redis=org.apache.dubbo.rpc.protocol.redis.RedisProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/IDemoService.java b/dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/IDemoService.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/IDemoService.java rename to dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/IDemoService.java index 8b0d3bbc4a..0f0b22480f 100644 --- a/dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/IDemoService.java +++ b/dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/IDemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.redis; +package org.apache.dubbo.rpc.protocol.redis; public interface IDemoService { void set(String key, String value); diff --git a/dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocolTest.java b/dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocolTest.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocolTest.java rename to dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocolTest.java index 312847841b..0ef53dda14 100644 --- a/dubbo-rpc/dubbo-rpc-redis/src/test/java/com/alibaba/dubbo/rpc/protocol/redis/RedisProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-redis/src/test/java/org/apache/dubbo/rpc/protocol/redis/RedisProtocolTest.java @@ -14,15 +14,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.redis; +package org.apache.dubbo.rpc.protocol.redis; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -56,7 +56,7 @@ public class RedisProtocolTest { Invoker refer = protocol.refer(IDemoService.class, registryUrl); Class serviceClass = refer.getInterface(); - assertThat(serviceClass.getName(), is("com.alibaba.dubbo.rpc.protocol.redis.IDemoService")); + assertThat(serviceClass.getName(), is("org.apache.dubbo.rpc.protocol.redis.IDemoService")); } @Test diff --git a/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index 5d8f2ec06b..0000000000 --- a/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1 +0,0 @@ -java=com.alibaba.dubbo.common.serialize.java.JavaSerialization \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..495c475e55 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-redis/src/test/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1 @@ +java=org.apache.dubbo.common.serialize.java.JavaSerialization \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/BaseRestServer.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/BaseRestServer.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/BaseRestServer.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/BaseRestServer.java index 1942971cba..50648e6fb9 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/BaseRestServer.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/BaseRestServer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; import org.jboss.resteasy.spi.ResteasyDeployment; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboHttpServer.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboHttpServer.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboHttpServer.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboHttpServer.java index 895e5853b4..733b38f6e9 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboHttpServer.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboHttpServer.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; -import com.alibaba.dubbo.remoting.http.servlet.BootstrapListener; -import com.alibaba.dubbo.remoting.http.servlet.ServletManager; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.remoting.http.servlet.BootstrapListener; +import org.apache.dubbo.remoting.http.servlet.ServletManager; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; import org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher; import org.jboss.resteasy.spi.ResteasyDeployment; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboResourceFactory.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboResourceFactory.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboResourceFactory.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboResourceFactory.java index 63d30f0c97..191102e2cd 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/DubboResourceFactory.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/DubboResourceFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; import org.jboss.resteasy.spi.HttpRequest; import org.jboss.resteasy.spi.HttpResponse; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/NettyServer.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyServer.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/NettyServer.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyServer.java index efb2ca88f6..7ee4a8f864 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/NettyServer.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/NettyServer.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; import io.netty.channel.ChannelOption; import org.jboss.resteasy.plugins.server.netty.NettyJaxrsServer; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestConstraintViolation.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestConstraintViolation.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestConstraintViolation.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestConstraintViolation.java index b761d16bfe..f229773b53 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestConstraintViolation.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestConstraintViolation.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocol.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocol.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java index 319b5818d9..6ed1029143 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocol.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestProtocol.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.servlet.BootstrapListener; -import com.alibaba.dubbo.remoting.http.servlet.ServletManager; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.ServiceClassHolder; -import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.servlet.BootstrapListener; +import org.apache.dubbo.remoting.http.servlet.ServletManager; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.ServiceClassHolder; +import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol; import org.apache.http.HeaderElement; import org.apache.http.HeaderElementIterator; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServer.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServer.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServer.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServer.java index a4c664ce66..7b2f1e18c6 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServer.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.URL; +import org.apache.dubbo.common.URL; public interface RestServer { diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServerFactory.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServerFactory.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServerFactory.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServerFactory.java index ef40e302a5..1e5262c44b 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RestServerFactory.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RestServerFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpBinder; /** * Only the server that implements servlet container diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcContextFilter.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcContextFilter.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcContextFilter.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcContextFilter.java index 7a6f2a2ae6..f585dc7e6e 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcContextFilter.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcContextFilter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.utils.StringUtils; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.common.utils.StringUtils; +import org.apache.dubbo.rpc.RpcContext; import org.jboss.resteasy.spi.ResteasyProviderFactory; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapper.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapper.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapper.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapper.java index 039819771b..e0fb782607 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapper.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapper.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.rest.support.ContentType; import javax.validation.ConstraintViolation; import javax.validation.ConstraintViolationException; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/ViolationReport.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/ViolationReport.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/ViolationReport.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/ViolationReport.java index 9a211e5595..1d5346044f 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/ViolationReport.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/ViolationReport.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java index fc5ec6de98..6fcc8db620 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResource.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.integration.swagger; +package org.apache.dubbo.rpc.protocol.rest.integration.swagger; -import com.alibaba.dubbo.config.annotation.Service; +import org.apache.dubbo.config.annotation.Service; import com.fasterxml.jackson.core.JsonProcessingException; import io.swagger.jaxrs.listing.BaseApiListingResource; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java index a692bf87b8..bca1b863e7 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.integration.swagger; +package org.apache.dubbo.rpc.protocol.rest.integration.swagger; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/ContentType.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/ContentType.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/ContentType.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/ContentType.java index 871fa5e606..14579668ba 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/ContentType.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/ContentType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.support; +package org.apache.dubbo.rpc.protocol.rest.support; import javax.ws.rs.core.MediaType; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/LoggingFilter.java b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/LoggingFilter.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/LoggingFilter.java rename to dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/LoggingFilter.java index 679eb63c63..f488fdf537 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/java/com/alibaba/dubbo/rpc/protocol/rest/support/LoggingFilter.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/java/org/apache/dubbo/rpc/protocol/rest/support/LoggingFilter.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.support; +package org.apache.dubbo.rpc.protocol.rest.support; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; import org.apache.commons.io.IOUtils; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index a0f05272d0..0000000000 --- a/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -rest=com.alibaba.dubbo.rpc.protocol.rest.RestProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..d492da9787 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-rest/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +rest=org.apache.dubbo.rpc.protocol.rest.RestProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/DemoService.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoService.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/DemoService.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoService.java index 82e010445f..5bcbbd21a6 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; public class DemoService implements IDemoService { diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/IDemoService.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/IDemoService.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/IDemoService.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/IDemoService.java index b7262d909f..47dbfb76cb 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/IDemoService.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/IDemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; import javax.ws.rs.GET; import javax.ws.rs.Path; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocolTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocolTest.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java index 089af0a227..671cdf5792 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RestProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RestProtocolTest.java @@ -14,20 +14,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.ServiceClassHolder; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.ServiceClassHolder; import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Test; @@ -116,7 +116,7 @@ public class RestProtocolTest { ServiceClassHolder.getInstance().pushServiceClass(DemoService.class); URL nettyUrl = exportUrl.addParameter(Constants.SERVER_KEY, "netty") - .addParameter(Constants.EXTENSION_KEY, "com.alibaba.dubbo.rpc.protocol.rest.support.LoggingFilter"); + .addParameter(Constants.EXTENSION_KEY, "org.apache.dubbo.rpc.protocol.rest.support.LoggingFilter"); Exporter exporter = protocol.export(proxy.getInvoker(new DemoService(), IDemoService.class, nettyUrl)); IDemoService demoService = this.proxy.getProxy(protocol.refer(IDemoService.class, nettyUrl)); diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java index 69dda71220..25f763ea85 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/RpcExceptionMapperTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest; +package org.apache.dubbo.rpc.protocol.rest; -import com.alibaba.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcException; import org.junit.Before; import org.junit.Test; import org.mockito.Answers; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java index 6af41c328c..8d819b254c 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/DubboSwaggerApiListingResourceTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.integration.swagger; +package org.apache.dubbo.rpc.protocol.rest.integration.swagger; import io.swagger.models.Swagger; import org.jboss.resteasy.spi.ResteasyUriInfo; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java index 59b5666dd4..8c00af46fa 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protocol/rest/integration/swagger/SwaggerService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rest.integration.swagger; +package org.apache.dubbo.rpc.protocol.rest.integration.swagger; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestProtocolTest.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestProtocolTest.java similarity index 89% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestProtocolTest.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestProtocolTest.java index 4764cf6b66..2b004a6cb0 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestProtocolTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protol.rest; +package org.apache.dubbo.rpc.protol.rest; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.*; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.*; import junit.framework.Assert; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestService.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestService.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestService.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestService.java index 30441b2a87..fe0d588440 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestService.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protol.rest; +package org.apache.dubbo.rpc.protol.rest; import javax.ws.rs.Consumes; diff --git a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestServiceImpl.java b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestServiceImpl.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestServiceImpl.java rename to dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestServiceImpl.java index 3de80d266c..e9d31dcac3 100644 --- a/dubbo-rpc/dubbo-rpc-rest/src/test/java/com/alibaba/dubbo/rpc/protol/rest/RestServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-rest/src/test/java/org/apache/dubbo/rpc/protol/rest/RestServiceImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protol.rest; +package org.apache.dubbo.rpc.protol.rest; /** * RestServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocol.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java rename to dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocol.java index 55fe932692..a9c78c7acf 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocol.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocol.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.Version; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.Version; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol; import org.aopalliance.intercept.MethodInvocation; import org.springframework.remoting.RemoteAccessException; diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java rename to dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java index 26e0ec8ddb..f85afccf61 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/main/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/main/java/org/apache/dubbo/rpc/protocol/rmi/RmiRemoteInvocation.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; import org.aopalliance.intercept.MethodInvocation; import org.springframework.remoting.support.RemoteInvocation; @@ -39,7 +39,7 @@ public class RmiRemoteInvocation extends RemoteInvocation { /** * Need to restore context on provider side (Though context will be overridden by Invocation's attachment * when ContextFilter gets executed, we will restore the attachment when Invocation is constructed, check more - * from {@link com.alibaba.dubbo.rpc.proxy.InvokerInvocationHandler} + * from {@link org.apache.dubbo.rpc.proxy.InvokerInvocationHandler} */ @SuppressWarnings("unchecked") @Override diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 71466d90ec..0000000000 --- a/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -rmi=com.alibaba.dubbo.rpc.protocol.rmi.RmiProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..a1e30e3af6 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-rmi/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +rmi=org.apache.dubbo.rpc.protocol.rmi.RmiProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoService.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoService.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoService.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoService.java index 354c70c8ef..9e1d334fbc 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; /** * TestService diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoServiceImpl.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoServiceImpl.java index ab7497f7ec..833969b243 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/DemoServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; /** * DemoServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteService.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteService.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteService.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteService.java index 4069e7b7ff..b28fad0324 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteService.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; import java.rmi.Remote; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java index 8d37c28c94..0447117e2e 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RemoteServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; import java.rmi.RemoteException; diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocolTest.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java similarity index 82% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocolTest.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java index d7c5910b68..10e1d6be12 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/RmiProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/RmiProtocolTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.service.EchoService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.service.EchoService; import org.junit.Ignore; import org.junit.Test; @@ -123,16 +123,16 @@ public class RmiProtocolTest { public void testRpcInvokerGroup() throws Exception { DemoService service = new DemoServiceImpl(); - RpcUtils.export("demo://127.0.0.1:9030/com.alibaba.dubbo.rpc.TestService",DemoService.class,service); + RpcUtils.export("demo://127.0.0.1:9030/org.apache.dubbo.rpc.TestService",DemoService.class,service); RpcUtils.export("dubbo://127.0.0.1:9031/TestService",DemoService.class,service); - RpcUtils.export("rmi://127.0.0.1:9032/com.alibaba.dubbo.rpc.TestService",DemoService.class,service); - RpcUtils.export("rmi://127.0.0.1:9033/com.alibaba.dubbo.rpc.TestService",DemoService.class,service); + RpcUtils.export("rmi://127.0.0.1:9032/org.apache.dubbo.rpc.TestService",DemoService.class,service); + RpcUtils.export("rmi://127.0.0.1:9033/org.apache.dubbo.rpc.TestService",DemoService.class,service); service = RpcUtils.createProxy(DemoService.class, new String[]{ - "demo://127.0.0.1:9030/com.alibaba.dubbo.rpc.TestService?weight=20", + "demo://127.0.0.1:9030/org.apache.dubbo.rpc.TestService?weight=20", "dubbo://127.0.0.1:9031/TestService?weight=20", - "rmi://127.0.0.1:9032/com.alibaba.dubbo.rpc.TestService", + "rmi://127.0.0.1:9032/org.apache.dubbo.rpc.TestService", }); assertEquals(service.getSize(null), -1); assertEquals(service.getSize(new String[]{"","",""}), 3); @@ -140,9 +140,9 @@ public class RmiProtocolTest { // cast to EchoService EchoService echo = RpcUtils.createProxy(EchoService.class, new String[]{ - "demo://127.0.0.1:9030/com.alibaba.dubbo.rpc.TestService?weight=20", + "demo://127.0.0.1:9030/org.apache.dubbo.rpc.TestService?weight=20", "dubbo://127.0.0.1:9031/TestService?weight=20", - "rmi://127.0.0.1:9032/com.alibaba.dubbo.rpc.TestService", + "rmi://127.0.0.1:9032/org.apache.dubbo.rpc.TestService", }); assertEquals(echo.$echo("test"), "test"); assertEquals(echo.$echo("abcdefg"), "abcdefg"); @@ -154,14 +154,14 @@ public class RmiProtocolTest { DemoService service = new DemoServiceImpl(); protocol.export(proxy.createInvoker("dubbo://127.0.0.1:9040/TestService", DemoService.class, service); protocol.export(proxy.createInvoker("dubbo://127.0.0.1:9041/TestService", DemoService.class, service); - protocol.export(proxy.createInvoker("rmi://127.0.0.1:9042/com.alibaba.dubbo.rpc.TestService", DemoService.class, service); - protocol.export(proxy.createInvoker("rmi://127.0.0.1:9043/com.alibaba.dubbo.rpc.TestService", DemoService.class, service); + protocol.export(proxy.createInvoker("rmi://127.0.0.1:9042/org.apache.dubbo.rpc.TestService", DemoService.class, service); + protocol.export(proxy.createInvoker("rmi://127.0.0.1:9043/org.apache.dubbo.rpc.TestService", DemoService.class, service); RpcInvokerGroup group = Proxies.createInvoker(DemoService.class, new String[]{ "dubbo://127.0.0.1:9040/TestService", "dubbo://127.0.0.1:9041/TestService", - "rmi://127.0.0.1:9042/com.alibaba.dubbo.rpc.TestService", - "rmi://127.0.0.1:9043/com.alibaba.dubbo.rpc.TestService", + "rmi://127.0.0.1:9042/org.apache.dubbo.rpc.TestService", + "rmi://127.0.0.1:9043/org.apache.dubbo.rpc.TestService", }); group.getMethodSettings("echo").setFork(true); group.getMethodSettings("echo").setForkInvokeCallback(new ForkInvokeCallback(){ diff --git a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/Type.java b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/Type.java similarity index 92% rename from dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/Type.java rename to dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/Type.java index 5777ac01d5..0f22495045 100644 --- a/dubbo-rpc/dubbo-rpc-rmi/src/test/java/com/alibaba/dubbo/rpc/protocol/rmi/Type.java +++ b/dubbo-rpc/dubbo-rpc-rmi/src/test/java/org/apache/dubbo/rpc/protocol/rmi/Type.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.rmi; +package org.apache.dubbo.rpc.protocol.rmi; public enum Type { High, Normal, Lower diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java similarity index 91% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ClassNameGenerator.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java index 9c89803167..0a5e2267d3 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ClassNameGenerator.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ClassNameGenerator.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.extension.SPI; @SPI(DubboClassNameGenerator.NAME) public interface ClassNameGenerator { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java index b662072186..0ed589e364 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/DubboClassNameGenerator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; public class DubboClassNameGenerator implements ClassNameGenerator { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java index ed867260d4..ed2073b8bf 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftClassNameGenerator.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; public class ThriftClassNameGenerator implements ClassNameGenerator { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodec.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodec.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java index 91a61a139d..cba0664bec 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodec.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodec.java @@ -14,22 +14,22 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ClassHelper; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferInputStream; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.protocol.thrift.io.RandomAccessByteArrayOutputStream; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ClassHelper; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferInputStream; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.protocol.thrift.io.RandomAccessByteArrayOutputStream; import org.apache.commons.lang.StringUtils; import org.apache.thrift.TApplicationException; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftConstants.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftConstants.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java index 9ec62ff82f..12fd19fa5e 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftConstants.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftConstants.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; public final class ThriftConstants { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftInvoker.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftInvoker.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java index af39ddefef..e3f393049e 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftInvoker.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftInvoker.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.AtomicPositiveInteger; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.TimeoutException; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.protocol.AbstractInvoker; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.AtomicPositiveInteger; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.TimeoutException; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.protocol.AbstractInvoker; import java.util.Set; import java.util.concurrent.locks.ReentrantLock; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java index 38fd422762..08229042b4 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftNativeCodec.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.Codec2; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBufferOutputStream; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.rpc.Invocation; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.Codec2; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBufferOutputStream; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.rpc.Invocation; import org.apache.thrift.TException; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocol.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java similarity index 87% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocol.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java index 29254db3b5..81b7f02816 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocol.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocol.java @@ -14,28 +14,28 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.ConfigUtils; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.Transporter; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.rpc.Exporter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProtocol; -import com.alibaba.dubbo.rpc.protocol.dubbo.DubboExporter; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.ConfigUtils; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.RemotingException; +import org.apache.dubbo.remoting.Transporter; +import org.apache.dubbo.remoting.exchange.ExchangeChannel; +import org.apache.dubbo.remoting.exchange.ExchangeClient; +import org.apache.dubbo.remoting.exchange.ExchangeHandler; +import org.apache.dubbo.remoting.exchange.ExchangeServer; +import org.apache.dubbo.remoting.exchange.Exchangers; +import org.apache.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; +import org.apache.dubbo.rpc.Exporter; +import org.apache.dubbo.rpc.Invocation; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProtocol; +import org.apache.dubbo.rpc.protocol.dubbo.DubboExporter; import java.util.ArrayList; import java.util.Set; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftType.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftType.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java index 811fff9b70..7ef659b311 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftType.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftType.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; import java.util.HashMap; import java.util.Map; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtils.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java similarity index 98% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtils.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java index 62ac8cd190..f4eb01e38c 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtils.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; public class ThriftUtils { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java index 3da17a9f7f..712db8eb85 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/ext/MultiServiceProcessor.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift.ext; +package org.apache.dubbo.rpc.protocol.thrift.ext; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.rpc.protocol.thrift.ThriftCodec; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.rpc.protocol.thrift.ThriftCodec; import org.apache.thrift.TException; import org.apache.thrift.TProcessor; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java similarity index 97% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java index a90aafd673..a35568b933 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/InputStreamWrapper.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift.io; +package org.apache.dubbo.rpc.protocol.thrift.io; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java rename to dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java index 7afd90a677..af9485bc18 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/java/com/alibaba/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/java/org/apache/dubbo/rpc/protocol/thrift/io/RandomAccessByteArrayOutputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift.io; +package org.apache.dubbo.rpc.protocol.thrift.io; -import com.alibaba.dubbo.common.io.Bytes; +import org.apache.dubbo.common.io.Bytes; import java.io.IOException; import java.io.OutputStream; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 deleted file mode 100644 index 518ce0ae7a..0000000000 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2 +++ /dev/null @@ -1 +0,0 @@ -thrift=com.alibaba.dubbo.rpc.protocol.thrift.ThriftCodec \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 85233b7736..0000000000 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -thrift=com.alibaba.dubbo.rpc.protocol.thrift.ThriftProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.protocol.thrift.ClassNameGenerator b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.protocol.thrift.ClassNameGenerator deleted file mode 100644 index b2e5598772..0000000000 --- a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.protocol.thrift.ClassNameGenerator +++ /dev/null @@ -1,2 +0,0 @@ -dubbo=com.alibaba.dubbo.rpc.protocol.thrift.DubboClassNameGenerator -thrift=com.alibaba.dubbo.rpc.protocol.thrift.ThriftClassNameGenerator \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 new file mode 100644 index 0000000000..600662d572 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2 @@ -0,0 +1 @@ +thrift=org.apache.dubbo.rpc.protocol.thrift.ThriftCodec \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..3800f4cb9d --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +thrift=org.apache.dubbo.rpc.protocol.thrift.ThriftProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.thrift.ClassNameGenerator b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.thrift.ClassNameGenerator new file mode 100644 index 0000000000..18d912ec26 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-thrift/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.protocol.thrift.ClassNameGenerator @@ -0,0 +1,2 @@ +dubbo=org.apache.dubbo.rpc.protocol.thrift.DubboClassNameGenerator +thrift=org.apache.dubbo.rpc.protocol.thrift.ThriftClassNameGenerator \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/ClassNameTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/ClassNameTest.java index f433234d4b..f383501e2c 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/ClassNameTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/ClassNameTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import com.alibaba.dubbo.rpc.protocol.thrift.ThriftUtils; +import org.apache.dubbo.rpc.protocol.thrift.ThriftUtils; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/$__DemoStub.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/$__DemoStub.java similarity index 99% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/$__DemoStub.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/$__DemoStub.java index 0b49afb7ee..da5c9a3a29 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/$__DemoStub.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/$__DemoStub.java @@ -21,7 +21,7 @@ *

    * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ -package com.alibaba.dubbo.rpc.gen.dubbo; +package org.apache.dubbo.rpc.gen.dubbo; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/Demo.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/Demo.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/Demo.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/Demo.java index 382adf31a1..3af2c67c60 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/dubbo/Demo.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/dubbo/Demo.java @@ -21,7 +21,7 @@ *

    * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ -package com.alibaba.dubbo.rpc.gen.dubbo; +package org.apache.dubbo.rpc.gen.dubbo; public interface Demo { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/thrift/Demo.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/thrift/Demo.java similarity index 99% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/thrift/Demo.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/thrift/Demo.java index b14d94c680..231ff9fc07 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/gen/thrift/Demo.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/gen/thrift/Demo.java @@ -3,7 +3,7 @@ *

    * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING */ -package com.alibaba.dubbo.rpc.gen.thrift; +package org.apache.dubbo.rpc.gen.thrift; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/AbstractTest.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/AbstractTest.java index 13e8d5f7cd..5db52ad934 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/AbstractTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/AbstractTest.java @@ -14,16 +14,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub; -import com.alibaba.dubbo.rpc.gen.dubbo.Demo; -import com.alibaba.dubbo.rpc.protocol.thrift.ext.MultiServiceProcessor; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.gen.dubbo.$__DemoStub; +import org.apache.dubbo.rpc.gen.dubbo.Demo; +import org.apache.dubbo.rpc.protocol.thrift.ext.MultiServiceProcessor; import org.apache.thrift.TProcessor; import org.apache.thrift.protocol.TBinaryProtocol; @@ -124,7 +124,7 @@ public abstract class AbstractTest { protected TProcessor getProcessor() { MultiServiceProcessor result = new MultiServiceProcessor(); result.addProcessor( - com.alibaba.dubbo.rpc.gen.dubbo.Demo.class, + org.apache.dubbo.rpc.gen.dubbo.Demo.class, new $__DemoStub.Processor(getServiceImpl())); return result; } diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DemoImpl.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DemoImpl.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DemoImpl.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DemoImpl.java index 34bacfd991..8737714603 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DemoImpl.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DemoImpl.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; public class DemoImpl { diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboDemoImpl.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DubboDemoImpl.java similarity index 86% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboDemoImpl.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DubboDemoImpl.java index 227a825e9a..ce04d1a0c4 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/DubboDemoImpl.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/DubboDemoImpl.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub; -import com.alibaba.dubbo.rpc.gen.dubbo.Demo; +import org.apache.dubbo.rpc.gen.dubbo.$__DemoStub; +import org.apache.dubbo.rpc.gen.dubbo.Demo; public class DubboDemoImpl extends DemoImpl implements Demo, $__DemoStub.Iface { } diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/FramedTransportFactory.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/FramedTransportFactory.java similarity index 96% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/FramedTransportFactory.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/FramedTransportFactory.java index 2a76a2b05a..d48248d7e2 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/FramedTransportFactory.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/FramedTransportFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; import org.apache.thrift.transport.TFramedTransport; import org.apache.thrift.transport.TTransport; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/MockedChannel.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/MockedChannel.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/MockedChannel.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/MockedChannel.java index fb8834a6bd..c871db018f 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/MockedChannel.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/MockedChannel.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.ChannelHandler; -import com.alibaba.dubbo.remoting.RemotingException; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.ChannelHandler; +import org.apache.dubbo.remoting.RemotingException; import java.net.InetSocketAddress; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServerExceptionTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServerExceptionTest.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServerExceptionTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServerExceptionTest.java index 17a8beb718..5414a0d0ab 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServerExceptionTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServerExceptionTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.Result; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.gen.dubbo.$__DemoStub; import org.junit.Assert; import org.junit.Test; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java similarity index 94% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java index 34aaf290f0..2028341672 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ServiceMethodNotFoundTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub; -import com.alibaba.dubbo.rpc.gen.dubbo.Demo; -import com.alibaba.dubbo.rpc.protocol.thrift.ext.MultiServiceProcessor; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.rpc.gen.dubbo.$__DemoStub; +import org.apache.dubbo.rpc.gen.dubbo.Demo; +import org.apache.dubbo.rpc.protocol.thrift.ext.MultiServiceProcessor; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.server.TThreadPoolServer; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java index 97e1ba6bef..f552422a74 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftCodecTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftCodecTest.java @@ -14,21 +14,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffer; -import com.alibaba.dubbo.remoting.buffer.ChannelBuffers; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.DefaultFuture; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.RpcInvocation; -import com.alibaba.dubbo.rpc.RpcResult; -import com.alibaba.dubbo.rpc.gen.thrift.Demo; -import com.alibaba.dubbo.rpc.protocol.thrift.io.RandomAccessByteArrayOutputStream; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.Channel; +import org.apache.dubbo.remoting.buffer.ChannelBuffer; +import org.apache.dubbo.remoting.buffer.ChannelBuffers; +import org.apache.dubbo.remoting.exchange.Request; +import org.apache.dubbo.remoting.exchange.Response; +import org.apache.dubbo.remoting.exchange.support.DefaultFuture; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.RpcInvocation; +import org.apache.dubbo.rpc.RpcResult; +import org.apache.dubbo.rpc.gen.thrift.Demo; +import org.apache.dubbo.rpc.protocol.thrift.io.RandomAccessByteArrayOutputStream; import org.apache.thrift.TApplicationException; import org.apache.thrift.protocol.TBinaryProtocol; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java index 4a8b4fea43..7c561adb1e 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftDemoImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.rpc.gen.thrift.Demo; +import org.apache.dubbo.rpc.gen.thrift.Demo; public class ThriftDemoImpl extends DemoImpl implements Demo.Iface { } diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java index 45e8bdc903..4b99899a5e 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftProtocolTest.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.gen.dubbo.Demo; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.utils.NetUtils; +import org.apache.dubbo.rpc.Invoker; +import org.apache.dubbo.rpc.gen.dubbo.Demo; import org.junit.After; import org.junit.Before; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java similarity index 68% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java index b7752193a5..31af56db71 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/ThriftUtilsTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift; +package org.apache.dubbo.rpc.protocol.thrift; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.gen.dubbo.$__DemoStub; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.gen.dubbo.$__DemoStub; import org.junit.Assert; import org.junit.Test; @@ -30,14 +30,14 @@ public class ThriftUtilsTest { Assert.assertEquals( $__DemoStub.echoString_args.class.getName(), ThriftUtils.generateMethodArgsClassName( - com.alibaba.dubbo.rpc.gen.dubbo.Demo.class.getName(), + org.apache.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); Assert.assertEquals( $__DemoStub.echoString_args.class.getName(), ExtensionLoader.getExtensionLoader(ClassNameGenerator.class) .getExtension(DubboClassNameGenerator.NAME).generateArgsClassName( - com.alibaba.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); + org.apache.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); } @@ -46,42 +46,42 @@ public class ThriftUtilsTest { Assert.assertEquals($__DemoStub.echoString_result.class.getName(), ThriftUtils.generateMethodResultClassName( - com.alibaba.dubbo.rpc.gen.dubbo.Demo.class.getName(), + org.apache.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); Assert.assertEquals($__DemoStub.echoString_result.class.getName(), ExtensionLoader.getExtensionLoader(ClassNameGenerator.class) .getExtension(DubboClassNameGenerator.NAME).generateResultClassName( - com.alibaba.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); + org.apache.dubbo.rpc.gen.dubbo.Demo.class.getName(), "echoString")); } @Test public void testGenerateMethodArgsClassNameThrift() { - Assert.assertEquals(com.alibaba.dubbo.rpc.gen.thrift.Demo.echoString_args.class.getName(), + Assert.assertEquals(org.apache.dubbo.rpc.gen.thrift.Demo.echoString_args.class.getName(), ThriftUtils.generateMethodArgsClassNameThrift( - com.alibaba.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), + org.apache.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), "echoString")); - Assert.assertEquals(com.alibaba.dubbo.rpc.gen.thrift.Demo.echoString_args.class.getName(), + Assert.assertEquals(org.apache.dubbo.rpc.gen.thrift.Demo.echoString_args.class.getName(), ExtensionLoader.getExtensionLoader(ClassNameGenerator.class) .getExtension(ThriftClassNameGenerator.NAME).generateArgsClassName( - com.alibaba.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), + org.apache.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), "echoString")); } @Test public void testGenerateMethodResultClassNameThrift() { - Assert.assertEquals(com.alibaba.dubbo.rpc.gen.thrift.Demo.echoString_result.class.getName(), + Assert.assertEquals(org.apache.dubbo.rpc.gen.thrift.Demo.echoString_result.class.getName(), ThriftUtils.generateMethodResultClassNameThrift( - com.alibaba.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), + org.apache.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), "echoString")); - Assert.assertEquals(com.alibaba.dubbo.rpc.gen.thrift.Demo.echoString_result.class.getName(), + Assert.assertEquals(org.apache.dubbo.rpc.gen.thrift.Demo.echoString_result.class.getName(), ExtensionLoader.getExtensionLoader(ClassNameGenerator.class) .getExtension(ThriftClassNameGenerator.NAME).generateResultClassName( - com.alibaba.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), + org.apache.dubbo.rpc.gen.thrift.Demo.Iface.class.getName(), "echoString")); } diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java similarity index 93% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java index 1f6545eb0a..15fb62a5f4 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoConsumer.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift.examples; +package org.apache.dubbo.rpc.protocol.thrift.examples; -import com.alibaba.dubbo.rpc.gen.thrift.Demo; +import org.apache.dubbo.rpc.gen.thrift.Demo; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java rename to dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java index 6671d1027c..d87be9de13 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/java/com/alibaba/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/java/org/apache/dubbo/rpc/protocol/thrift/examples/DubboDemoProvider.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.thrift.examples; +package org.apache.dubbo.rpc.protocol.thrift.examples; import org.springframework.context.support.ClassPathXmlApplicationContext; diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml index 752b933bd4..3dccf35dbe 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-consumer.xml @@ -27,6 +27,6 @@ - + \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml index 085ceafb63..cf375c5551 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/resources/dubbo-demo-provider.xml @@ -27,8 +27,8 @@ - + - + \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift index 91a264a525..8e66074a1d 100644 --- a/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift +++ b/dubbo-rpc/dubbo-rpc-thrift/src/test/thrift/Demo.thrift @@ -1,8 +1,8 @@ -namespace dubbo_java com.alibaba.dubbo.rpc.gen.dubbo -namespace dubbo_cpp com.alibaba.dubbo.rpc.gen.dubbo +namespace dubbo_java org.apache.dubbo.rpc.gen.dubbo +namespace dubbo_cpp org.apache.dubbo.rpc.gen.dubbo -namespace java com.alibaba.dubbo.rpc.gen.thrift -namespace cpp com.alibaba.dubbo.rpc.gen.thrift +namespace java org.apache.dubbo.rpc.gen.thrift +namespace cpp org.apache.dubbo.rpc.gen.thrift service Demo { bool echoBool( 1:required bool arg ); diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java similarity index 90% rename from dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java rename to dubbo-rpc/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java index f501a42043..ddb270def4 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/src/main/java/com/alibaba/dubbo/rpc/protocol/webservice/WebServiceProtocol.java +++ b/dubbo-rpc/dubbo-rpc-webservice/src/main/java/org/apache/dubbo/rpc/protocol/webservice/WebServiceProtocol.java @@ -14,17 +14,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.webservice; +package org.apache.dubbo.rpc.protocol.webservice; -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.remoting.http.HttpBinder; -import com.alibaba.dubbo.remoting.http.HttpHandler; -import com.alibaba.dubbo.remoting.http.HttpServer; -import com.alibaba.dubbo.remoting.http.servlet.DispatcherServlet; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.RpcException; -import com.alibaba.dubbo.rpc.protocol.AbstractProxyProtocol; +import org.apache.dubbo.common.Constants; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.remoting.http.HttpBinder; +import org.apache.dubbo.remoting.http.HttpHandler; +import org.apache.dubbo.remoting.http.HttpServer; +import org.apache.dubbo.remoting.http.servlet.DispatcherServlet; +import org.apache.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcException; +import org.apache.dubbo.rpc.protocol.AbstractProxyProtocol; import org.apache.cxf.bus.extension.ExtensionManagerBus; import org.apache.cxf.endpoint.Client; diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol deleted file mode 100644 index 4665a64822..0000000000 --- a/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol +++ /dev/null @@ -1 +0,0 @@ -com.alibaba.dubbo.rpc.protocol.webservice.WebServiceProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol b/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol new file mode 100644 index 0000000000..67640780f7 --- /dev/null +++ b/dubbo-rpc/dubbo-rpc-webservice/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol @@ -0,0 +1 @@ +org.apache.dubbo.rpc.protocol.webservice.WebServiceProtocol \ No newline at end of file diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoService.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java rename to dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoService.java index d3c664cb1c..d66e86d385 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoService.java +++ b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoService.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.webservice; +package org.apache.dubbo.rpc.protocol.webservice; /** * TestService diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoServiceImpl.java b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoServiceImpl.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoServiceImpl.java rename to dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoServiceImpl.java index 96e02c879f..e9b5fc1b61 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/DemoServiceImpl.java +++ b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/DemoServiceImpl.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.webservice; +package org.apache.dubbo.rpc.protocol.webservice; -import com.alibaba.dubbo.rpc.RpcContext; +import org.apache.dubbo.rpc.RpcContext; /** * DemoServiceImpl diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/User.java b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/User.java similarity index 95% rename from dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/User.java rename to dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/User.java index 866e36b958..9fc2dc2c2a 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/User.java +++ b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/User.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.webservice; +package org.apache.dubbo.rpc.protocol.webservice; public class User { private int age; diff --git a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java similarity index 88% rename from dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java rename to dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java index 98e77385f9..e668bcbd63 100644 --- a/dubbo-rpc/dubbo-rpc-webservice/src/test/java/com/alibaba/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java +++ b/dubbo-rpc/dubbo-rpc-webservice/src/test/java/org/apache/dubbo/rpc/protocol/webservice/WebserviceProtocolTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.rpc.protocol.webservice; +package org.apache.dubbo.rpc.protocol.webservice; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.ExtensionLoader; -import com.alibaba.dubbo.rpc.Protocol; -import com.alibaba.dubbo.rpc.ProxyFactory; -import com.alibaba.dubbo.rpc.service.EchoService; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.ExtensionLoader; +import org.apache.dubbo.rpc.Protocol; +import org.apache.dubbo.rpc.ProxyFactory; +import org.apache.dubbo.rpc.service.EchoService; import org.junit.Test; import static junit.framework.Assert.assertEquals; @@ -51,7 +51,7 @@ public class WebserviceProtocolTest { assertEquals(service.getSize(new String[]{"", "", ""}), 3); Object object = service.invoke("webservice://127.0.0.1:9019/" + DemoService.class.getName() + "", "invoke"); System.out.println(object); - assertEquals("webservice://127.0.0.1:9019/com.alibaba.dubbo.rpc.protocol.webservice.DemoService:invoke", object); + assertEquals("webservice://127.0.0.1:9019/org.apache.dubbo.rpc.protocol.webservice.DemoService:invoke", object); StringBuffer buf = new StringBuffer(); for (int i = 0; i < 1024 * 32 + 32; i++) diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Cleanable.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Cleanable.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Cleanable.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Cleanable.java index 0173cf6f76..a8f96d3b0e 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Cleanable.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Cleanable.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; public interface Cleanable { diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataInput.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataInput.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataInput.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataInput.java index d302ccf7a9..d122e5cfa1 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataInput.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataInput.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; import java.io.IOException; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataOutput.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataOutput.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataOutput.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataOutput.java index d6269ef58e..3657724042 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/DataOutput.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/DataOutput.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; import java.io.IOException; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectInput.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectInput.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java index 237f06ce25..81207cb720 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectInput.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; import java.io.IOException; import java.lang.reflect.Type; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectOutput.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectOutput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectOutput.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectOutput.java index 344da85f57..bf50167d81 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/ObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/ObjectOutput.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; import java.io.IOException; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Serialization.java similarity index 90% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Serialization.java index ad0da60ddf..eb9a72e98f 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/Serialization.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/Serialization.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize; +package org.apache.dubbo.common.serialize; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.extension.Adaptive; -import com.alibaba.dubbo.common.extension.SPI; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.extension.Adaptive; +import org.apache.dubbo.common.extension.SPI; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistry.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistry.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java index 132f27ac2d..dd7185936f 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistry.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistry.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.support; +package org.apache.dubbo.common.serialize.support; import java.util.LinkedHashSet; import java.util.Set; diff --git a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializationOptimizer.java b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializationOptimizer.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializationOptimizer.java rename to dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializationOptimizer.java index 1d9bd6192f..7085f2de89 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/main/java/com/alibaba/dubbo/common/serialize/support/SerializationOptimizer.java +++ b/dubbo-serialization/dubbo-serialization-api/src/main/java/org/apache/dubbo/common/serialize/support/SerializationOptimizer.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.support; +package org.apache.dubbo.common.serialize.support; import java.util.Collection; diff --git a/dubbo-serialization/dubbo-serialization-api/src/test/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistryTest.java b/dubbo-serialization/dubbo-serialization-api/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-api/src/test/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistryTest.java rename to dubbo-serialization/dubbo-serialization-api/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java index 156e52fa8d..f471bc451a 100644 --- a/dubbo-serialization/dubbo-serialization-api/src/test/java/com/alibaba/dubbo/common/serialize/support/SerializableClassRegistryTest.java +++ b/dubbo-serialization/dubbo-serialization-api/src/test/java/org/apache/dubbo/common/serialize/support/SerializableClassRegistryTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.support; +package org.apache.dubbo.common.serialize.support; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java index 3ef50ce68f..bef92db462 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInput.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.utils.PojoUtils; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.utils.PojoUtils; import com.alibaba.fastjson.JSON; import java.io.BufferedReader; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java index 91d9171e56..0ec5c010ea 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutput.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.ObjectOutput; import com.alibaba.fastjson.serializer.JSONSerializer; import com.alibaba.fastjson.serializer.SerializeWriter; import com.alibaba.fastjson.serializer.SerializerFeature; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerialization.java b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerialization.java similarity index 84% rename from dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerialization.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerialization.java index 15daf8e56f..189ef0b0b8 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerialization.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/main/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index e6debd37c3..0000000000 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1 +0,0 @@ -fastjson=com.alibaba.dubbo.common.serialize.fastjson.FastJsonSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..cb8c9867dd --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1 @@ +fastjson=org.apache.dubbo.common.serialize.fastjson.FastJsonSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java index 06e6bc66d9..185d24fc28 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectInputTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.serialize.fastjson.model.Person; +import org.apache.dubbo.common.serialize.fastjson.model.Person; import com.alibaba.fastjson.JSONObject; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java index f8cda1d808..6cf0c35e8f 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonObjectOutputTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.serialize.fastjson.model.Image; +import org.apache.dubbo.common.serialize.fastjson.model.Image; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java similarity index 84% rename from dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java index e4297b3634..298f05bfc2 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/FastJsonSerializationTest.java @@ -14,13 +14,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson; +package org.apache.dubbo.common.serialize.fastjson; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.fastjson.FastJsonObjectInput; -import com.alibaba.dubbo.common.serialize.fastjson.FastJsonObjectOutput; -import com.alibaba.dubbo.common.serialize.fastjson.FastJsonSerialization; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.fastjson.FastJsonObjectInput; +import org.apache.dubbo.common.serialize.fastjson.FastJsonObjectOutput; +import org.apache.dubbo.common.serialize.fastjson.FastJsonSerialization; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Image.java b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Image.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Image.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Image.java index 5debe9c49a..bb2dc06eb3 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Image.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Image.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson.model; +package org.apache.dubbo.common.serialize.fastjson.model; public class Image implements java.io.Serializable { private static final long serialVersionUID = 1L; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Person.java b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Person.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Person.java rename to dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Person.java index 329ce9484b..eadb684d15 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/com/alibaba/dubbo/common/serialize/fastjson/model/Person.java +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/java/org/apache/dubbo/common/serialize/fastjson/model/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fastjson.model; +package org.apache.dubbo.common.serialize.fastjson.model; public class Person { private String name; diff --git a/dubbo-serialization/dubbo-serialization-fastjson/src/test/resources/log4j.xml b/dubbo-serialization/dubbo-serialization-fastjson/src/test/resources/log4j.xml index 671f2af883..d045b92c0d 100644 --- a/dubbo-serialization/dubbo-serialization-fastjson/src/test/resources/log4j.xml +++ b/dubbo-serialization/dubbo-serialization-fastjson/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstFactory.java b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstFactory.java similarity index 93% rename from dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstFactory.java rename to dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstFactory.java index 028cfd7640..feb9ce4646 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstFactory.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstFactory.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.support.SerializableClassRegistry; +import org.apache.dubbo.common.serialize.support.SerializableClassRegistry; import org.nustaq.serialization.FSTConfiguration; import org.nustaq.serialization.FSTObjectInput; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInput.java b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectInput.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInput.java rename to dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectInput.java index 6d437c35ed..b94a85f2fd 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectInput.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectInput; import org.nustaq.serialization.FSTObjectInput; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutput.java b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectOutput.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutput.java rename to dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectOutput.java index 6df1a914bd..46fee0b3aa 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstObjectOutput.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.ObjectOutput; import org.nustaq.serialization.FSTObjectOutput; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstSerialization.java b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstSerialization.java similarity index 84% rename from dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstSerialization.java rename to dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstSerialization.java index b38b1a040e..89881df396 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/main/java/com/alibaba/dubbo/common/serialize/fst/FstSerialization.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/main/java/org/apache/dubbo/common/serialize/fst/FstSerialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index f48d1ed8a6..0000000000 --- a/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1 +0,0 @@ -fst=com.alibaba.dubbo.common.serialize.fst.FstSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..793fede18b --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-fst/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1 @@ +fst=org.apache.dubbo.common.serialize.fst.FstSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstFactoryTest.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstFactoryTest.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstFactoryTest.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstFactoryTest.java index 4541a18f71..a8135b114f 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstFactoryTest.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstFactoryTest.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInputTest.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectInputTest.java similarity index 90% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInputTest.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectInputTest.java index 96332a7335..849e838630 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectInputTest.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectInputTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.fst.model.AnimalEnum; -import com.alibaba.dubbo.common.serialize.fst.model.FullAddress; +import org.apache.dubbo.common.serialize.fst.model.AnimalEnum; +import org.apache.dubbo.common.serialize.fst.model.FullAddress; import org.junit.Test; import java.io.ByteArrayInputStream; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutputTest.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectOutputTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutputTest.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectOutputTest.java index 88afe23d9a..d2796ab667 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstObjectOutputTest.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstObjectOutputTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.fst.model.AnimalEnum; -import com.alibaba.dubbo.common.serialize.fst.model.FullAddress; +import org.apache.dubbo.common.serialize.fst.model.AnimalEnum; +import org.apache.dubbo.common.serialize.fst.model.FullAddress; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstSerializationTest.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstSerializationTest.java similarity index 92% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstSerializationTest.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstSerializationTest.java index 63e1aa10c6..a8319bf645 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/FstSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/FstSerializationTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst; +package org.apache.dubbo.common.serialize.fst; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; import org.hamcrest.Matchers; import org.junit.Before; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/AnimalEnum.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/AnimalEnum.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/AnimalEnum.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/AnimalEnum.java index c979df6943..0f1b98bfc3 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/AnimalEnum.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/AnimalEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst.model; +package org.apache.dubbo.common.serialize.fst.model; public enum AnimalEnum { dog, cat, rat, cow, bull, horse; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/FullAddress.java b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/FullAddress.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/FullAddress.java rename to dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/FullAddress.java index 44d21a6b66..d3f88a93f9 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/java/com/alibaba/dubbo/common/serialize/fst/model/FullAddress.java +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/java/org/apache/dubbo/common/serialize/fst/model/FullAddress.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.fst.model; +package org.apache.dubbo.common.serialize.fst.model; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-fst/src/test/resources/log4j.xml b/dubbo-serialization/dubbo-serialization-fst/src/test/resources/log4j.xml index 671f2af883..d045b92c0d 100644 --- a/dubbo-serialization/dubbo-serialization-fst/src/test/resources/log4j.xml +++ b/dubbo-serialization/dubbo-serialization-fst/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java index 7812de7e39..4ec97a4c70 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectInput.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.hessian2; +package org.apache.dubbo.common.serialize.hessian2; import com.alibaba.com.caucho.hessian.io.Hessian2Input; -import com.alibaba.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectInput; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java index aa0e6b898e..5d640fdc8d 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2ObjectOutput.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.hessian2; +package org.apache.dubbo.common.serialize.hessian2; import com.alibaba.com.caucho.hessian.io.Hessian2Output; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.ObjectOutput; import java.io.IOException; import java.io.OutputStream; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2Serialization.java b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2Serialization.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2Serialization.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2Serialization.java index 2ff87f91d1..71c6233659 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2Serialization.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2Serialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.hessian2; +package org.apache.dubbo.common.serialize.hessian2; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java index d7ed95da8d..a5c5a9020e 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/com/alibaba/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/main/java/org/apache/dubbo/common/serialize/hessian2/Hessian2SerializerFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.hessian2; +package org.apache.dubbo.common.serialize.hessian2; import com.alibaba.com.caucho.hessian.io.SerializerFactory; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index 2217447ab7..0000000000 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1 +0,0 @@ -hessian2=com.alibaba.dubbo.common.serialize.hessian2.Hessian2Serialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..47d4cf2701 --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1 @@ +hessian2=org.apache.dubbo.common.serialize.hessian2.Hessian2Serialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java index f920a0c657..760663fe04 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public enum AnimalEnum { dog, cat, rat, cow, bull, horse; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizException.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizException.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizException.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizException.java index b6eb1f4bbc..95f4046afa 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizException.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizException extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java index 29db6e00fc..f1ffadb023 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizExceptionNoDefaultConstructor extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/Person.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/Person.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/Person.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/Person.java index 6383706cf7..5a551a7f36 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/Person.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java index e7dd248678..d78c5928ea 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.io.Serializable; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Image.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Image.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Image.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Image.java index 0d6a74a3d4..a59eff35be 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/media/Image.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Image.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; public class Image implements java.io.Serializable { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Media.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Media.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Media.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Media.java index 8a78f6d313..042a3a5273 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/Media.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/Media.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java index 9664116a63..7991f50610 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java index 70bc793979..4ce79008fb 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java index dcc93cf8bd..38921670f9 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java index f1ff041e93..15f1238fe8 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java index 66b67c9634..62869c2b80 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; public enum PersonStatus { ENABLED, diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/Phone.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/Phone.java index f7da708364..41fd38a92d 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/model/person/Phone.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java index 68060336da..b8eedda47e 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.model.Person; +import org.apache.dubbo.common.serialize.ObjectOutput; import org.junit.Test; @@ -42,7 +42,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -56,7 +56,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -70,7 +70,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -84,7 +84,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -98,7 +98,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -115,7 +115,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -131,7 +131,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } } \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java index 32ff6e4856..292ee8b2b9 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; +import org.apache.dubbo.common.model.Person; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java index 61c642595f..a40e378094 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.model.AnimalEnum; -import com.alibaba.dubbo.common.model.BizException; -import com.alibaba.dubbo.common.model.BizExceptionNoDefaultConstructor; -import com.alibaba.dubbo.common.model.SerializablePerson; -import com.alibaba.dubbo.common.model.media.Image; -import com.alibaba.dubbo.common.model.media.Image.Size; -import com.alibaba.dubbo.common.model.media.Media; -import com.alibaba.dubbo.common.model.media.Media.Player; -import com.alibaba.dubbo.common.model.media.MediaContent; -import com.alibaba.dubbo.common.model.person.BigPerson; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonInfo; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.model.AnimalEnum; +import org.apache.dubbo.common.model.BizException; +import org.apache.dubbo.common.model.BizExceptionNoDefaultConstructor; +import org.apache.dubbo.common.model.SerializablePerson; +import org.apache.dubbo.common.model.media.Image; +import org.apache.dubbo.common.model.media.Image.Size; +import org.apache.dubbo.common.model.media.Media; +import org.apache.dubbo.common.model.media.Media.Player; +import org.apache.dubbo.common.model.media.MediaContent; +import org.apache.dubbo.common.model.person.BigPerson; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonInfo; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/Hessian2SerializationTest.java b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/Hessian2SerializationTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/Hessian2SerializationTest.java rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/Hessian2SerializationTest.java index a3b94c6715..badbbe7ef0 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/Hessian2SerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/org/apache/dubbo/common/serialize/serialization/Hessian2SerializationTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.hessian2.Hessian2Serialization; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.hessian2.Hessian2Serialization; import org.junit.Ignore; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/log4j.xml b/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/log4j.xml index 671f2af883..d045b92c0d 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/log4j.xml +++ b/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc b/dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc similarity index 100% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc rename to dubbo-serialization/dubbo-serialization-hessian2/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedJavaSerialization.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedJavaSerialization.java similarity index 84% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedJavaSerialization.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedJavaSerialization.java index cdfff2a067..9573ed7789 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedJavaSerialization.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedJavaSerialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectInputStream.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectInputStream.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectInputStream.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectInputStream.java index 9732351108..2587e597cf 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectInputStream.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectInputStream.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; -import com.alibaba.dubbo.common.utils.ClassHelper; +import org.apache.dubbo.common.utils.ClassHelper; import java.io.EOFException; import java.io.IOException; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectOutputStream.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectOutputStream.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectOutputStream.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectOutputStream.java index 0bf8610914..2bbf42e97e 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/CompactedObjectOutputStream.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/CompactedObjectOutputStream.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectInput.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectInput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectInput.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectInput.java index 9a74f6660f..6a4bbb9b37 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectInput.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; -import com.alibaba.dubbo.common.serialize.nativejava.NativeJavaObjectInput; +import org.apache.dubbo.common.serialize.nativejava.NativeJavaObjectInput; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectOutput.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectOutput.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectOutput.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectOutput.java index 94859505f0..44308b4828 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaObjectOutput.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; -import com.alibaba.dubbo.common.serialize.nativejava.NativeJavaObjectOutput; +import org.apache.dubbo.common.serialize.nativejava.NativeJavaObjectOutput; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaSerialization.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaSerialization.java similarity index 84% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaSerialization.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaSerialization.java index fdd8d2e521..72d9ef3a94 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/java/JavaSerialization.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/java/JavaSerialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.java; +package org.apache.dubbo.common.serialize.java; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java index dfbf85915d..a01f1ebaa7 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectInput.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.nativejava; +package org.apache.dubbo.common.serialize.nativejava; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.utils.Assert; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.utils.Assert; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java index 35b8617030..89f8145a68 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaObjectOutput.java @@ -15,10 +15,10 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.nativejava; +package org.apache.dubbo.common.serialize.nativejava; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.utils.Assert; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.utils.Assert; import java.io.IOException; import java.io.ObjectOutputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaSerialization.java b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaSerialization.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaSerialization.java rename to dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaSerialization.java index cf61f8a2ef..3b69248744 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/java/com/alibaba/dubbo/common/serialize/nativejava/NativeJavaSerialization.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/java/org/apache/dubbo/common/serialize/nativejava/NativeJavaSerialization.java @@ -15,12 +15,12 @@ * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.nativejava; +package org.apache.dubbo.common.serialize.nativejava; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index f336d9e5a9..0000000000 --- a/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1,3 +0,0 @@ -java=com.alibaba.dubbo.common.serialize.java.JavaSerialization -compactedjava=com.alibaba.dubbo.common.serialize.java.CompactedJavaSerialization -nativejava=com.alibaba.dubbo.common.serialize.nativejava.NativeJavaSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..bc1e4ef00d --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-jdk/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1,3 @@ +java=org.apache.dubbo.common.serialize.java.JavaSerialization +compactedjava=org.apache.dubbo.common.serialize.java.CompactedJavaSerialization +nativejava=org.apache.dubbo.common.serialize.nativejava.NativeJavaSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java index f920a0c657..760663fe04 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public enum AnimalEnum { dog, cat, rat, cow, bull, horse; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizException.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizException.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizException.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizException.java index b6eb1f4bbc..95f4046afa 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizException.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizException extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java index 29db6e00fc..f1ffadb023 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizExceptionNoDefaultConstructor extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/Person.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/Person.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/Person.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/Person.java index 6383706cf7..5a551a7f36 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/Person.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java index e7dd248678..d78c5928ea 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.io.Serializable; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Image.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Image.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Image.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Image.java index 0d6a74a3d4..a59eff35be 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Image.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Image.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; public class Image implements java.io.Serializable { diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Media.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Media.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Media.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Media.java index 8a78f6d313..042a3a5273 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/Media.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/Media.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java index 9664116a63..7991f50610 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java index 70bc793979..4ce79008fb 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java index dcc93cf8bd..38921670f9 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java index f1ff041e93..15f1238fe8 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java index 66b67c9634..62869c2b80 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; public enum PersonStatus { ENABLED, diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/Phone.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/Phone.java index f7da708364..41fd38a92d 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/model/person/Phone.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java index 68060336da..b8eedda47e 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.model.Person; +import org.apache.dubbo.common.serialize.ObjectOutput; import org.junit.Test; @@ -42,7 +42,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -56,7 +56,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -70,7 +70,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -84,7 +84,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -98,7 +98,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -115,7 +115,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -131,7 +131,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } } \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java index 32ff6e4856..292ee8b2b9 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; +import org.apache.dubbo.common.model.Person; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java index 61c642595f..a40e378094 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.model.AnimalEnum; -import com.alibaba.dubbo.common.model.BizException; -import com.alibaba.dubbo.common.model.BizExceptionNoDefaultConstructor; -import com.alibaba.dubbo.common.model.SerializablePerson; -import com.alibaba.dubbo.common.model.media.Image; -import com.alibaba.dubbo.common.model.media.Image.Size; -import com.alibaba.dubbo.common.model.media.Media; -import com.alibaba.dubbo.common.model.media.Media.Player; -import com.alibaba.dubbo.common.model.media.MediaContent; -import com.alibaba.dubbo.common.model.person.BigPerson; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonInfo; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.model.AnimalEnum; +import org.apache.dubbo.common.model.BizException; +import org.apache.dubbo.common.model.BizExceptionNoDefaultConstructor; +import org.apache.dubbo.common.model.SerializablePerson; +import org.apache.dubbo.common.model.media.Image; +import org.apache.dubbo.common.model.media.Image.Size; +import org.apache.dubbo.common.model.media.Media; +import org.apache.dubbo.common.model.media.Media.Player; +import org.apache.dubbo.common.model.media.MediaContent; +import org.apache.dubbo.common.model.person.BigPerson; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonInfo; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java similarity index 87% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java index 2547b72861..c9c45b8f4b 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/CompactedJavaSerializationTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.java.CompactedJavaSerialization; +import org.apache.dubbo.common.serialize.java.CompactedJavaSerialization; public class CompactedJavaSerializationTest extends AbstractSerializationPersionFailTest { { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/JavaSerializationTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/JavaSerializationTest.java similarity index 88% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/JavaSerializationTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/JavaSerializationTest.java index 9f881d126d..b7d1e0637d 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/JavaSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/JavaSerializationTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.java.JavaSerialization; +import org.apache.dubbo.common.serialize.java.JavaSerialization; public class JavaSerializationTest extends AbstractSerializationPersionFailTest { { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java similarity index 87% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java rename to dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java index 8522c0c492..d3779b21e2 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/java/org/apache/dubbo/common/serialize/serialization/NativeJavaSerializationTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.nativejava.NativeJavaSerialization; +import org.apache.dubbo.common.serialize.nativejava.NativeJavaSerialization; public class NativeJavaSerializationTest extends AbstractSerializationPersionFailTest { { diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/log4j.xml b/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/log4j.xml index 671f2af883..d045b92c0d 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/log4j.xml +++ b/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc b/dubbo-serialization/dubbo-serialization-jdk/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc similarity index 100% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc rename to dubbo-serialization/dubbo-serialization-jdk/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/CompatibleKryo.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/CompatibleKryo.java similarity index 88% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/CompatibleKryo.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/CompatibleKryo.java index 302906064a..dcd000767b 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/CompatibleKryo.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/CompatibleKryo.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo; +package org.apache.dubbo.common.serialize.kryo; -import com.alibaba.dubbo.common.logger.Logger; -import com.alibaba.dubbo.common.logger.LoggerFactory; -import com.alibaba.dubbo.common.serialize.kryo.utils.ReflectionUtils; +import org.apache.dubbo.common.logger.Logger; +import org.apache.dubbo.common.logger.LoggerFactory; +import org.apache.dubbo.common.serialize.kryo.utils.ReflectionUtils; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.Serializer; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectInput.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectInput.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectInput.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectInput.java index f24decf4a7..fcfc91a4fe 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectInput.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectInput.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo; +package org.apache.dubbo.common.serialize.kryo; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.kryo.utils.KryoUtils; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.kryo.utils.KryoUtils; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.KryoException; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectOutput.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectOutput.java similarity index 92% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectOutput.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectOutput.java index 91cbb5c9d7..ef2f219acd 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoObjectOutput.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoObjectOutput.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo; +package org.apache.dubbo.common.serialize.kryo; -import com.alibaba.dubbo.common.serialize.Cleanable; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.kryo.utils.KryoUtils; +import org.apache.dubbo.common.serialize.Cleanable; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.kryo.utils.KryoUtils; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.io.Output; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoSerialization.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoSerialization.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoSerialization.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoSerialization.java index bc64331b89..7ff6617a70 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/KryoSerialization.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/KryoSerialization.java @@ -14,12 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo; +package org.apache.dubbo.common.serialize.kryo; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import java.io.IOException; import java.io.InputStream; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java index bcde92aae6..ca0abad42f 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/AbstractKryoFactory.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; -import com.alibaba.dubbo.common.serialize.kryo.CompatibleKryo; -import com.alibaba.dubbo.common.serialize.support.SerializableClassRegistry; +import org.apache.dubbo.common.serialize.kryo.CompatibleKryo; +import org.apache.dubbo.common.serialize.support.SerializableClassRegistry; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.pool.KryoFactory; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/KryoUtils.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/KryoUtils.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/KryoUtils.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/KryoUtils.java index 1cb7e1ec9c..93cbb5dfa6 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/KryoUtils.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/KryoUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; import com.esotericsoftware.kryo.Kryo; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java index ff3964203b..d9102e186d 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PooledKryoFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; import com.esotericsoftware.kryo.Kryo; import com.esotericsoftware.kryo.pool.KryoPool; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java index a32c4b592f..5a53f468e5 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/PrototypeKryoFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; import com.esotericsoftware.kryo.Kryo; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ReflectionUtils.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ReflectionUtils.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ReflectionUtils.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ReflectionUtils.java index b35fcc6ef9..473685e7b8 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ReflectionUtils.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ReflectionUtils.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; public abstract class ReflectionUtils { diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java rename to dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java index 17392cecf3..d3599ec224 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/java/com/alibaba/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/java/org/apache/dubbo/common/serialize/kryo/utils/ThreadLocalKryoFactory.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.kryo.utils; +package org.apache.dubbo.common.serialize.kryo.utils; import com.esotericsoftware.kryo.Kryo; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization deleted file mode 100644 index d8f7be1edd..0000000000 --- a/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization +++ /dev/null @@ -1 +0,0 @@ -kryo=com.alibaba.dubbo.common.serialize.kryo.KryoSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization b/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization new file mode 100644 index 0000000000..531a00804e --- /dev/null +++ b/dubbo-serialization/dubbo-serialization-kryo/src/main/resources/META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization @@ -0,0 +1 @@ +kryo=org.apache.dubbo.common.serialize.kryo.KryoSerialization \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java similarity index 95% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java index f920a0c657..760663fe04 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/AnimalEnum.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/AnimalEnum.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public enum AnimalEnum { dog, cat, rat, cow, bull, horse; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizException.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizException.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizException.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizException.java index b6eb1f4bbc..95f4046afa 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizException.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizException.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizException extends RuntimeException { diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java index 29db6e00fc..f1ffadb023 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/BizExceptionNoDefaultConstructor.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/BizExceptionNoDefaultConstructor.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; public class BizExceptionNoDefaultConstructor extends RuntimeException { diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/Person.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/Person.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/Person.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/Person.java index 6383706cf7..5a551a7f36 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/Person.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/Person.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java index e7dd248678..d78c5928ea 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/SerializablePerson.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/SerializablePerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model; +package org.apache.dubbo.common.model; import java.io.Serializable; import java.util.Arrays; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Image.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Image.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Image.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Image.java index 0d6a74a3d4..a59eff35be 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Image.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Image.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; public class Image implements java.io.Serializable { diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Media.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Media.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Media.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Media.java index 8a78f6d313..042a3a5273 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/media/Media.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/Media.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java index 9664116a63..7991f50610 100644 --- a/dubbo-serialization/dubbo-serialization-hessian2/src/test/java/com/alibaba/dubbo/common/model/media/MediaContent.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/media/MediaContent.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.media; +package org.apache.dubbo.common.model.media; import java.util.List; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java similarity index 98% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java index 70bc793979..4ce79008fb 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/BigPerson.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/BigPerson.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java similarity index 99% rename from dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java index dcc93cf8bd..38921670f9 100644 --- a/dubbo-common/src/test/java/com/alibaba/dubbo/common/model/person/FullAddress.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/FullAddress.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java similarity index 99% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java index f1ff041e93..15f1238fe8 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/model/person/PersonInfo.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonInfo.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; import java.util.List; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java similarity index 94% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java index 66b67c9634..62869c2b80 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/PersonStatus.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/PersonStatus.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; public enum PersonStatus { ENABLED, diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/Phone.java similarity index 98% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/Phone.java index f7da708364..41fd38a92d 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/model/person/Phone.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/model/person/Phone.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.model.person; +package org.apache.dubbo.common.model.person; import java.io.Serializable; diff --git a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java similarity index 85% rename from dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java index 68060336da..b8eedda47e 100644 --- a/dubbo-serialization/dubbo-serialization-jdk/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionFailTest.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; -import com.alibaba.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.model.Person; +import org.apache.dubbo.common.serialize.ObjectOutput; import org.junit.Test; @@ -42,7 +42,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -56,7 +56,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -70,7 +70,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -84,7 +84,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -98,7 +98,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -115,7 +115,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } @@ -131,7 +131,7 @@ public abstract class AbstractSerializationPersionFailTest extends AbstractSeria fail(); } catch (NotSerializableException expected) { } catch (IllegalStateException expected) { - assertThat(expected.getMessage(), containsString("Serialized class com.alibaba.dubbo.common.model.Person must implement java.io.Serializable")); + assertThat(expected.getMessage(), containsString("Serialized class org.apache.dubbo.common.model.Person must implement java.io.Serializable")); } } } \ No newline at end of file diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java similarity index 96% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java index 32ff6e4856..292ee8b2b9 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationPersionOkTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.model.Person; +import org.apache.dubbo.common.model.Person; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java similarity index 97% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java index 61c642595f..a40e378094 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/AbstractSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/AbstractSerializationTest.java @@ -14,26 +14,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.model.AnimalEnum; -import com.alibaba.dubbo.common.model.BizException; -import com.alibaba.dubbo.common.model.BizExceptionNoDefaultConstructor; -import com.alibaba.dubbo.common.model.SerializablePerson; -import com.alibaba.dubbo.common.model.media.Image; -import com.alibaba.dubbo.common.model.media.Image.Size; -import com.alibaba.dubbo.common.model.media.Media; -import com.alibaba.dubbo.common.model.media.Media.Player; -import com.alibaba.dubbo.common.model.media.MediaContent; -import com.alibaba.dubbo.common.model.person.BigPerson; -import com.alibaba.dubbo.common.model.person.FullAddress; -import com.alibaba.dubbo.common.model.person.PersonInfo; -import com.alibaba.dubbo.common.model.person.PersonStatus; -import com.alibaba.dubbo.common.model.person.Phone; -import com.alibaba.dubbo.common.serialize.ObjectInput; -import com.alibaba.dubbo.common.serialize.ObjectOutput; -import com.alibaba.dubbo.common.serialize.Serialization; +import org.apache.dubbo.common.URL; +import org.apache.dubbo.common.model.AnimalEnum; +import org.apache.dubbo.common.model.BizException; +import org.apache.dubbo.common.model.BizExceptionNoDefaultConstructor; +import org.apache.dubbo.common.model.SerializablePerson; +import org.apache.dubbo.common.model.media.Image; +import org.apache.dubbo.common.model.media.Image.Size; +import org.apache.dubbo.common.model.media.Media; +import org.apache.dubbo.common.model.media.Media.Player; +import org.apache.dubbo.common.model.media.MediaContent; +import org.apache.dubbo.common.model.person.BigPerson; +import org.apache.dubbo.common.model.person.FullAddress; +import org.apache.dubbo.common.model.person.PersonInfo; +import org.apache.dubbo.common.model.person.PersonStatus; +import org.apache.dubbo.common.model.person.Phone; +import org.apache.dubbo.common.serialize.ObjectInput; +import org.apache.dubbo.common.serialize.ObjectOutput; +import org.apache.dubbo.common.serialize.Serialization; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/KyroSerializationTest.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/KyroSerializationTest.java similarity index 88% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/KyroSerializationTest.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/KyroSerializationTest.java index 48d0ce2386..a4fe585026 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/KyroSerializationTest.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/KyroSerializationTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.kryo.KryoSerialization; +import org.apache.dubbo.common.serialize.kryo.KryoSerialization; public class KyroSerializationTest extends AbstractSerializationTest { diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/ReflectionUtilsTest.java b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/ReflectionUtilsTest.java similarity index 91% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/ReflectionUtilsTest.java rename to dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/ReflectionUtilsTest.java index 98045b57c4..39d0bccb8b 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/java/com/alibaba/dubbo/common/serialize/serialization/ReflectionUtilsTest.java +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/java/org/apache/dubbo/common/serialize/serialization/ReflectionUtilsTest.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.common.serialize.serialization; +package org.apache.dubbo.common.serialize.serialization; -import com.alibaba.dubbo.common.serialize.kryo.utils.ReflectionUtils; +import org.apache.dubbo.common.serialize.kryo.utils.ReflectionUtils; import org.junit.Test; diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/log4j.xml b/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/log4j.xml index 671f2af883..d045b92c0d 100644 --- a/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/log4j.xml +++ b/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/log4j.xml @@ -19,7 +19,7 @@ - + diff --git a/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc b/dubbo-serialization/dubbo-serialization-kryo/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc similarity index 100% rename from dubbo-serialization/dubbo-serialization-kryo/src/test/resources/com/alibaba/dubbo/common/serialize/dubbo/SimpleDO.fc rename to dubbo-serialization/dubbo-serialization-kryo/src/test/resources/org/apache/dubbo/common/serialize/dubbo/SimpleDO.fc diff --git a/dubbo-test/dubbo-test-benchmark/pom.xml b/dubbo-test/dubbo-test-benchmark/pom.xml deleted file mode 100644 index 1ade5e593b..0000000000 --- a/dubbo-test/dubbo-test-benchmark/pom.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - 4.0.0 - - com.alibaba - dubbo-test - 2.7.0-SNAPSHOT - - dubbo-test-benchmark - jar - ${project.artifactId} - The performance benchmark kit test module of dubbo project - - true - - - - - - org.apache.maven.plugins - maven-jar-plugin - - - package-exclude-resources - - jar - - package - - - dubbo.properties - ProviderSample.xml - - assemble - - - - - - org.apache.maven.plugins - maven-compiler-plugin - - -proc:none - 1.8 - 1.8 - UTF-8 - - - - maven-assembly-plugin - 2.2.1 - - - assembly - package - - single - - - - ${basedir}/src/assembly/release.xml - - false - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/assembly/dev.xml b/dubbo-test/dubbo-test-benchmark/src/assembly/dev.xml deleted file mode 100644 index 9ea634d57a..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/assembly/dev.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - dist - - tar.gz - - false - - - src/main/resources - dubbo.benchmark - 0755 - - - - - dubbo.benchmark/lib - false - true - - *:sources - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/assembly/release.xml b/dubbo-test/dubbo-test-benchmark/src/assembly/release.xml deleted file mode 100644 index 9ea634d57a..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/assembly/release.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - dist - - tar.gz - - false - - - src/main/resources - dubbo.benchmark - 0755 - - - - - dubbo.benchmark/lib - false - true - - *:sources - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkClient.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkClient.java deleted file mode 100644 index 2a152fca69..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkClient.java +++ /dev/null @@ -1,254 +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.dubbo.rpc.benchmark; - -import com.alibaba.dubbo.common.utils.ConfigUtils; - -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.lang.reflect.InvocationTargetException; -import java.text.SimpleDateFormat; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -/** - * Abstract benchmark client,test for difference scenes Usage: -Dwrite.statistics=false BenchmarkClient serverIP - * serverPort concurrents timeout codectype requestSize runtime(seconds) clientNums - */ -public abstract class AbstractBenchmarkClient { - - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - private static long maxTPS = 0; - - private static long minTPS = 0; - - private static long allRequestSum; - - private static long allResponseTimeSum; - - private static long allErrorRequestSum; - - private static long allErrorResponseTimeSum; - - private static int runtime; - - // < 0 - private static long below0sum; - - // (0,1] - private static long above0sum; - - // (1,5] - private static long above1sum; - - // (5,10] - private static long above5sum; - - // (10,50] - private static long above10sum; - - // (50,100] - private static long above50sum; - - // (100,500] - private static long above100sum; - - // (500,1000] - private static long above500sum; - - // > 1000 - private static long above1000sum; - - Properties properties = ConfigUtils.getProperties(); - - public void run(String[] args) throws Exception { - - final String serverIP = properties.getProperty("serverip"); - final int serverPort = Integer.parseInt(properties.getProperty("serverport")); - final int concurrents = Integer.parseInt(properties.getProperty("concurrents")); - final int timeout = Integer.parseInt(properties.getProperty("timeout")); - runtime = Integer.parseInt(properties.getProperty("runtime")); - final long endtime = System.nanoTime() / 1000L + runtime * 1000 * 1000L; - final int clientNums = Integer.parseInt(properties.getProperty("connectionnums")); - - // Print start info - Date currentDate = new Date(); - Calendar calendar = Calendar.getInstance(); - calendar.setTime(currentDate); - calendar.add(Calendar.SECOND, runtime); - StringBuilder startInfo = new StringBuilder(dateFormat.format(currentDate)); - startInfo.append(" ready to start client benchmark,server is "); - startInfo.append(serverIP).append(":").append(serverPort); - startInfo.append(",concurrents is: ").append(concurrents); - startInfo.append(",clientNums is: ").append(clientNums); - startInfo.append(",timeout is:").append(timeout); - startInfo.append(" s,the benchmark will end at:").append(dateFormat.format(calendar.getTime())); - System.out.println(startInfo.toString()); - - CyclicBarrier barrier = new CyclicBarrier(concurrents); - CountDownLatch latch = new CountDownLatch(concurrents); - List runnables = new ArrayList(); - // benchmark start after thirty seconds,let java app warm up - long beginTime = System.nanoTime() / 1000L + 30 * 1000 * 1000L; - for (int i = 0; i < concurrents; i++) { - ClientRunnable runnable = getClientRunnable(serverIP, serverPort, clientNums, timeout, barrier, latch, - beginTime, endtime); - runnables.add(runnable); - } - - startRunnables(runnables); - - latch.await(); - - // read results & add all - // key: runtime second range value: Long[2] array Long[0]: execute count Long[1]: response time sum - Map times = new HashMap(); - Map errorTimes = new HashMap(); - for (ClientRunnable runnable : runnables) { - List results = runnable.getResults(); - long[] responseSpreads = results.get(0); - below0sum += responseSpreads[0]; - above0sum += responseSpreads[1]; - above1sum += responseSpreads[2]; - above5sum += responseSpreads[3]; - above10sum += responseSpreads[4]; - above50sum += responseSpreads[5]; - above100sum += responseSpreads[6]; - above500sum += responseSpreads[7]; - above1000sum += responseSpreads[8]; - long[] tps = results.get(1); - long[] responseTimes = results.get(2); - long[] errorTPS = results.get(3); - long[] errorResponseTimes = results.get(4); - for (int i = 0; i < tps.length; i++) { - String key = String.valueOf(i); - if (times.containsKey(key)) { - Long[] successInfos = times.get(key); - Long[] errorInfos = errorTimes.get(key); - successInfos[0] += tps[i]; - successInfos[1] += responseTimes[i]; - errorInfos[0] += errorTPS[i]; - errorInfos[1] += errorResponseTimes[i]; - times.put(key, successInfos); - errorTimes.put(key, errorInfos); - } else { - Long[] successInfos = new Long[2]; - successInfos[0] = tps[i]; - successInfos[1] = responseTimes[i]; - Long[] errorInfos = new Long[2]; - errorInfos[0] = errorTPS[i]; - errorInfos[1] = errorResponseTimes[i]; - times.put(key, successInfos); - errorTimes.put(key, errorInfos); - } - } - } - - long ignoreRequest = 0; - long ignoreErrorRequest = 0; - int maxTimeRange = runtime - 30; - // ignore the last 10 second requests,so tps can count more accurate - for (int i = 0; i < 10; i++) { - Long[] values = times.remove(String.valueOf(maxTimeRange - i)); - if (values != null) { - ignoreRequest += values[0]; - } - Long[] errorValues = errorTimes.remove(String.valueOf(maxTimeRange - i)); - if (errorValues != null) { - ignoreErrorRequest += errorValues[0]; - } - } - - for (Map.Entry entry : times.entrySet()) { - long successRequest = entry.getValue()[0]; - long errorRequest = 0; - if (errorTimes.containsKey(entry.getKey())) { - errorRequest = errorTimes.get(entry.getKey())[0]; - } - allRequestSum += successRequest; - allResponseTimeSum += entry.getValue()[1]; - allErrorRequestSum += errorRequest; - if (errorTimes.containsKey(entry.getKey())) { - allErrorResponseTimeSum += errorTimes.get(entry.getKey())[1]; - } - long currentRequest = successRequest + errorRequest; - if (currentRequest > maxTPS) { - maxTPS = currentRequest; - } - if (minTPS == 0 || currentRequest < minTPS) { - minTPS = currentRequest; - } - } - - boolean isWriteResult = Boolean.parseBoolean(System.getProperty("write.statistics", "false")); - if (isWriteResult) { - BufferedWriter writer = new BufferedWriter(new FileWriter("benchmark.all.results")); - for (Map.Entry entry : times.entrySet()) { - writer.write(entry.getKey() + "," + entry.getValue()[0] + "," + entry.getValue()[1] + "\r\n"); - } - writer.close(); - } - - System.out.println("----------Benchmark Statistics--------------"); - System.out.println(" Concurrents: " + concurrents); - System.out.println(" ClientNums: " + clientNums); - System.out.println(" Runtime: " + runtime + " seconds"); - System.out.println(" Benchmark Time: " + times.keySet().size()); - long benchmarkRequest = allRequestSum + allErrorRequestSum; - long allRequest = benchmarkRequest + ignoreRequest + ignoreErrorRequest; - System.out.println(" Requests: " + allRequest + " Success: " + (allRequestSum + ignoreRequest) * 100 - / allRequest + "% (" + (allRequestSum + ignoreRequest) + ") Error: " - + (allErrorRequestSum + ignoreErrorRequest) * 100 / allRequest + "% (" - + (allErrorRequestSum + ignoreErrorRequest) + ")"); - System.out.println(" Avg TPS: " + benchmarkRequest / times.keySet().size() + " Max TPS: " + maxTPS - + " Min TPS: " + minTPS); - System.out.println(" Avg RT: " + (allErrorResponseTimeSum + allResponseTimeSum) / benchmarkRequest / 1000f - + "ms"); - System.out.println(" RT <= 0: " + (below0sum * 100 / allRequest) + "% " + below0sum + "/" + allRequest); - System.out.println(" RT (0,1]: " + (above0sum * 100 / allRequest) + "% " + above0sum + "/" + allRequest); - System.out.println(" RT (1,5]: " + (above1sum * 100 / allRequest) + "% " + above1sum + "/" + allRequest); - System.out.println(" RT (5,10]: " + (above5sum * 100 / allRequest) + "% " + above5sum + "/" + allRequest); - System.out.println(" RT (10,50]: " + (above10sum * 100 / allRequest) + "% " + above10sum + "/" + allRequest); - System.out.println(" RT (50,100]: " + (above50sum * 100 / allRequest) + "% " + above50sum + "/" + allRequest); - System.out.println(" RT (100,500]: " + (above100sum * 100 / allRequest) + "% " + above100sum + "/" + allRequest); - System.out.println(" RT (500,1000]: " + (above500sum * 100 / allRequest) + "% " + above500sum + "/" - + allRequest); - System.out.println(" RT > 1000: " + (above1000sum * 100 / allRequest) + "% " + above1000sum + "/" + allRequest); - System.exit(0); - } - - public abstract ClientRunnable getClientRunnable(String targetIP, int targetPort, int clientNums, int rpcTimeout, - CyclicBarrier barrier, CountDownLatch latch, long startTime, - long endTime) throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException; - - protected void startRunnables(List runnables) { - for (int i = 0; i < runnables.size(); i++) { - final ClientRunnable runnable = runnables.get(i); - Thread thread = new Thread(runnable, "benchmarkclient-" + i); - thread.start(); - } - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkServer.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkServer.java deleted file mode 100644 index 0e1f2292b9..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractBenchmarkServer.java +++ /dev/null @@ -1,65 +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.dubbo.rpc.benchmark; - -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeChannel; -import com.alibaba.dubbo.remoting.exchange.Exchangers; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.concurrent.CompletableFuture; - -/** - * Abstract benchmark server Usage: BenchmarkServer listenPort maxThreads responseSize - */ -public abstract class AbstractBenchmarkServer { - - private static final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - public void run(String[] args) throws Exception { - if (args == null || args.length != 5) { - throw new IllegalArgumentException( - "must give three args: listenPort | maxThreads | responseSize | transporter | serialization"); - } - int listenPort = Integer.parseInt(args[0]); - int maxThreads = Integer.parseInt(args[1]); - final int responseSize = Integer.parseInt(args[2]); - String transporter = args[3]; - String serialization = args[4]; - System.out.println(dateFormat.format(new Date()) + " ready to start server,listenPort is: " + listenPort - + ",maxThreads is:" + maxThreads + ",responseSize is:" + responseSize - + " bytes,transporter is:" + transporter + ",serialization is:" + serialization); - StringBuilder url = new StringBuilder(); - url.append("exchange://0.0.0.0:"); - url.append(listenPort); - url.append("?transporter="); - url.append(transporter); - url.append("&serialization="); - url.append(serialization); - url.append("&threads="); - url.append(maxThreads); - Exchangers.bind(url.toString(), new ExchangeHandlerAdapter() { - - @Override - public CompletableFuture reply(ExchangeChannel channel, Object message) throws RemotingException { - return CompletableFuture.completedFuture(new ResponseObject(responseSize)); // send response - } - }); - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractClientRunnable.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractClientRunnable.java deleted file mode 100644 index 16a2e69675..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/AbstractClientRunnable.java +++ /dev/null @@ -1,186 +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.dubbo.rpc.benchmark; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -/** - * Simple Processor RPC Benchmark Client Thread - */ -public abstract class AbstractClientRunnable implements ClientRunnable { - - private static final Log LOGGER = LogFactory.getLog(AbstractClientRunnable.class); - - private CyclicBarrier barrier; - - private CountDownLatch latch; - - private long endTime; - - private boolean running = true; - - // response time spread - private long[] responseSpreads = new long[9]; - - // error request per second - private long[] errorTPS = null; - - // error response times per second - private long[] errorResponseTimes = null; - - // tps per second - private long[] tps = null; - - // response times per second - private long[] responseTimes = null; - - // benchmark startTime - private long startTime; - - // benchmark maxRange - private int maxRange; - - private ServiceFactory serviceFactory = new ServiceFactory(); - - public AbstractClientRunnable(String targetIP, int targetPort, int clientNums, int rpcTimeout, - CyclicBarrier barrier, CountDownLatch latch, long startTime, long endTime) { - - this.barrier = barrier; - this.latch = latch; - this.startTime = startTime; - this.endTime = endTime; - serviceFactory.setTargetIP(targetIP); - serviceFactory.setClientNums(clientNums); - serviceFactory.setTargetPort(targetPort); - serviceFactory.setConnectTimeout(rpcTimeout); - maxRange = (Integer.parseInt(String.valueOf((endTime - startTime))) / 1000000) + 1; - errorTPS = new long[maxRange]; - errorResponseTimes = new long[maxRange]; - tps = new long[maxRange]; - responseTimes = new long[maxRange]; - // init - for (int i = 0; i < maxRange; i++) { - errorTPS[i] = 0; - errorResponseTimes[i] = 0; - tps[i] = 0; - responseTimes[i] = 0; - } - } - - @Override - public void run() { - try { - barrier.await(); - } catch (Exception e) { - // IGNORE - } - runJavaAndHessian(); - latch.countDown(); - } - - private void runJavaAndHessian() { - while (running) { - long beginTime = System.nanoTime() / 1000L; - if (beginTime >= endTime) { - running = false; - break; - } - try { - Object result = invoke(serviceFactory); - long currentTime = System.nanoTime() / 1000L; - if (beginTime <= startTime) { - continue; - } - long consumeTime = currentTime - beginTime; - sumResponseTimeSpread(consumeTime); - int range = Integer.parseInt(String.valueOf(beginTime - startTime)) / 1000000; - if (range >= maxRange) { - System.err.println("benchmark range exceeds maxRange,range is: " + range + ",maxRange is: " - + maxRange); - continue; - } - if (result != null) { - tps[range] = tps[range] + 1; - responseTimes[range] = responseTimes[range] + consumeTime; - } else { - LOGGER.error("server return result is null"); - errorTPS[range] = errorTPS[range] + 1; - errorResponseTimes[range] = errorResponseTimes[range] + consumeTime; - } - } catch (Exception e) { - LOGGER.error("client.invokeSync error", e); - long currentTime = System.nanoTime() / 1000L; - if (beginTime <= startTime) { - continue; - } - long consumeTime = currentTime - beginTime; - sumResponseTimeSpread(consumeTime); - int range = Integer.parseInt(String.valueOf(beginTime - startTime)) / 1000000; - if (range >= maxRange) { - System.err.println("benchmark range exceeds maxRange,range is: " + range + ",maxRange is: " - + maxRange); - continue; - } - errorTPS[range] = errorTPS[range] + 1; - errorResponseTimes[range] = errorResponseTimes[range] + consumeTime; - } - } - } - - public abstract Object invoke(ServiceFactory serviceFactory); - - @Override - public List getResults() { - List results = new ArrayList(); - results.add(responseSpreads); - results.add(tps); - results.add(responseTimes); - results.add(errorTPS); - results.add(errorResponseTimes); - return results; - } - - private void sumResponseTimeSpread(long responseTime) { - responseTime = responseTime / 1000L; - if (responseTime <= 0) { - responseSpreads[0] = responseSpreads[0] + 1; - } else if (responseTime > 0 && responseTime <= 1) { - responseSpreads[1] = responseSpreads[1] + 1; - } else if (responseTime > 1 && responseTime <= 5) { - responseSpreads[2] = responseSpreads[2] + 1; - } else if (responseTime > 5 && responseTime <= 10) { - responseSpreads[3] = responseSpreads[3] + 1; - } else if (responseTime > 10 && responseTime <= 50) { - responseSpreads[4] = responseSpreads[4] + 1; - } else if (responseTime > 50 && responseTime <= 100) { - responseSpreads[5] = responseSpreads[5] + 1; - } else if (responseTime > 100 && responseTime <= 500) { - responseSpreads[6] = responseSpreads[6] + 1; - } else if (responseTime > 500 && responseTime <= 1000) { - responseSpreads[7] = responseSpreads[7] + 1; - } else if (responseTime > 1000) { - responseSpreads[8] = responseSpreads[8] + 1; - } - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkClient.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkClient.java deleted file mode 100644 index 04c924e92b..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkClient.java +++ /dev/null @@ -1,35 +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.dubbo.rpc.benchmark; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -public class BenchmarkClient extends AbstractBenchmarkClient { - - public static void main(String[] args) throws Exception { - new BenchmarkClient().run(args); - } - - @Override - public ClientRunnable getClientRunnable(String targetIP, int targetPort, int clientNums, int rpcTimeout, - CyclicBarrier barrier, - CountDownLatch latch, long endTime, long startTime) { - return new SimpleProcessorBenchmarkClientRunnable(targetIP, targetPort, clientNums, rpcTimeout, - barrier, latch, startTime, endTime); - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkServer.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkServer.java deleted file mode 100644 index 7a28ae664a..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/BenchmarkServer.java +++ /dev/null @@ -1,27 +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.dubbo.rpc.benchmark; - -public class BenchmarkServer extends AbstractBenchmarkServer { - - public static void main(String[] args) throws Exception { - new BenchmarkServer().run(args); - synchronized (BenchmarkServer.class) { - BenchmarkServer.class.wait(); - } - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ClientRunnable.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ClientRunnable.java deleted file mode 100644 index 14bb930921..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ClientRunnable.java +++ /dev/null @@ -1,28 +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.dubbo.rpc.benchmark; - -import java.util.List; - -/** - * client runnable,so we can collect results - */ -public interface ClientRunnable extends Runnable { - - public List getResults(); - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoService.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoService.java deleted file mode 100644 index b8b60b90fd..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoService.java +++ /dev/null @@ -1,25 +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.dubbo.rpc.benchmark; - - -/** - * TODO Comment of HelloService - */ -public interface DemoService { - public Object sendRequest(Object requestObject); -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoServiceImpl.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoServiceImpl.java deleted file mode 100644 index dc35e3a383..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/DemoServiceImpl.java +++ /dev/null @@ -1,30 +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.dubbo.rpc.benchmark; - - -/** - * TODO Comment of HelloService - */ -public class DemoServiceImpl implements DemoService { - ResponseObject responseObject = new ResponseObject(100); - - @Override - public Object sendRequest(Object request) { - return request; - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ExchangeClientFactory.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ExchangeClientFactory.java deleted file mode 100644 index 2cf95c7243..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ExchangeClientFactory.java +++ /dev/null @@ -1,113 +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.dubbo.rpc.benchmark; - -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.Exchangers; - -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.FutureTask; - -/** - * Abstract ExchangeClient Factory,create custom nums ExchangeClient - */ -public class ExchangeClientFactory { - - // Cache ExchangeClient - private static ConcurrentHashMap>> clients = new ConcurrentHashMap>>(); - - public static ExchangeClientFactory getInstance() { - throw new UnsupportedOperationException("should be implemented by true class"); - } - - public ExchangeClient get(final String targetIP, final int targetPort, final int connectTimeout) throws Exception { - return get(targetIP, targetPort, connectTimeout, 1); - } - - public ExchangeClient get(final String targetIP, final int targetPort, final int connectTimeout, - final int clientNums) throws Exception { - String key = targetIP + ":" + targetPort; - if (clients.containsKey(key)) { - if (clientNums == 1) { - return clients.get(key).get().get(0); - } else { - Random random = new Random(); - return clients.get(key).get().get(random.nextInt(clientNums)); - } - } else { - FutureTask> task = new FutureTask>( - new Callable>() { - - @Override - public List call() - throws Exception { - List clients = new ArrayList( - clientNums); - for (int i = 0; i < clientNums; i++) { - clients.add(createClient(targetIP, - targetPort, - connectTimeout)); - } - return clients; - } - }); - FutureTask> currentTask = clients.putIfAbsent(key, task); - if (currentTask == null) { - task.run(); - } else { - task = currentTask; - } - if (clientNums == 1) return task.get().get(0); - else { - Random random = new Random(); - return task.get().get(random.nextInt(clientNums)); - } - } - } - - public void removeClient(String key, ExchangeClient ExchangeClient) { - try { - // TODO: Fix It - clients.remove(key); - // clients.get(key).get().remove(ExchangeClient); - // clients.get(key) - // .get() - // .add(createClient(ExchangeClient.getServerIP(), - // ExchangeClient.getServerPort(), ExchangeClient.getConnectTimeout(), - // key)); - } catch (Exception e) { - // IGNORE - } - } - - protected ExchangeClient createClient(String targetIP, int targetPort, int connectTimeout) throws Exception { - StringBuilder url = new StringBuilder(); - url.append("exchange://"); - url.append(targetIP); - url.append(":"); - url.append(targetPort); - url.append("?"); - url.append("timeout="); - url.append(connectTimeout); - return Exchangers.connect(url.toString()); - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RequestObject.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RequestObject.java deleted file mode 100644 index 68a9ad7398..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RequestObject.java +++ /dev/null @@ -1,44 +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.dubbo.rpc.benchmark; - -import java.io.Serializable; - -/** - * Just for RPC Benchmark Test,request object - */ -public class RequestObject implements Serializable { - - private static final long serialVersionUID = 1L; - private byte[] bytes = null; - - public RequestObject() { - } - - public RequestObject(int size) { - bytes = new byte[size]; - } - - public byte[] getBytes() { - return bytes; - } - - public void setBytes(byte[] bytes) { - this.bytes = bytes; - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ResponseObject.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ResponseObject.java deleted file mode 100644 index 8c3ceb2a1c..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ResponseObject.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.dubbo.rpc.benchmark; - -import java.io.Serializable; - -/** - * Just for RPC Benchmark Test,response object - */ -public class ResponseObject implements Serializable { - - private static final long serialVersionUID = 1L; - - private byte[] bytes = null; - - public ResponseObject(int size) { - bytes = new byte[size]; - } - - public byte[] getBytes() { - return bytes; - } - - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkClient.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkClient.java deleted file mode 100644 index 50c802e2d2..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkClient.java +++ /dev/null @@ -1,40 +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.dubbo.rpc.benchmark; - -import java.lang.reflect.InvocationTargetException; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -public class RpcBenchmarkClient extends AbstractBenchmarkClient { - - public static void main(String[] args) throws Exception { - new RpcBenchmarkClient().run(args); - } - - @SuppressWarnings("rawtypes") - @Override - public ClientRunnable getClientRunnable(String targetIP, int targetPort, int clientNums, int rpcTimeout, - CyclicBarrier barrier, CountDownLatch latch, long startTime, long endTime) throws IllegalArgumentException, SecurityException, InstantiationException, IllegalAccessException, InvocationTargetException, NoSuchMethodException, ClassNotFoundException { - String runnable = properties.getProperty("classname"); - Class[] parameterTypes = new Class[]{String.class, int.class, int.class, int.class, CyclicBarrier.class, - CountDownLatch.class, long.class, long.class}; - Object[] parameters = new Object[]{targetIP, targetPort, clientNums, rpcTimeout, barrier, latch, startTime, - endTime}; - return (ClientRunnable) Class.forName(runnable).getConstructor(parameterTypes).newInstance(parameters); - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkServer.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkServer.java deleted file mode 100644 index 0f84668038..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcBenchmarkServer.java +++ /dev/null @@ -1,34 +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.dubbo.rpc.benchmark; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class RpcBenchmarkServer extends AbstractBenchmarkServer { - - public static void main(String[] args) throws Exception { - ClassPathXmlApplicationContext ctx = new ClassPathXmlApplicationContext("ProviderSample.xml"); - ctx.start(); - synchronized (RpcBenchmarkServer.class) { - try { - RpcBenchmarkServer.class.wait(); - } catch (InterruptedException e) { - e.printStackTrace(); - } - } - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcClient.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcClient.java deleted file mode 100644 index 74c795f488..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/RpcClient.java +++ /dev/null @@ -1,65 +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.dubbo.rpc.benchmark; - -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -/** - * RpcClient.java - */ -public class RpcClient extends AbstractClientRunnable { - private static String message = null; - private static int length = 100; - - static { - length = Integer.valueOf(System.getProperty("message.length", "1000")); - StringBuilder sb = new StringBuilder(); - for (int i = 0; i < length; i++) { - sb.append("a"); - } - message = sb.toString(); - } - - /** - * @param targetIP - * @param targetPort - * @param clientNums - * @param rpcTimeout - * @param barrier - * @param latch - * @param startTime - * @param endTime - */ - public RpcClient(String targetIP, int targetPort, int clientNums, int rpcTimeout, CyclicBarrier barrier, - CountDownLatch latch, long startTime, long endTime) { - super(targetIP, targetPort, clientNums, rpcTimeout, barrier, latch, startTime, endTime); - } - - @SuppressWarnings({"unchecked", "rawtypes"}) - @Override - public Object invoke(ServiceFactory serviceFactory) { - DemoService demoService = (DemoService) serviceFactory.get(DemoService.class); - Object result = demoService.sendRequest(message); - return result; - /*if(result.equals(message)){ - return result; - }else{ - throw new RuntimeException("Result Error"); - }*/ - } -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ServiceFactory.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ServiceFactory.java deleted file mode 100644 index e8873e896c..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/ServiceFactory.java +++ /dev/null @@ -1,101 +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.dubbo.rpc.benchmark; - -import com.alibaba.dubbo.config.ApplicationConfig; -import com.alibaba.dubbo.config.ReferenceConfig; - -import java.util.concurrent.ConcurrentHashMap; - -/** - * Abstract Service Factory,create custom nums Service - */ -public class ServiceFactory { - - // Cache ExchangeClient - private static ConcurrentHashMap services = new ConcurrentHashMap(); - String targetIP = null; - int targetPort = 0; - int connectTimeout = 0; - int clientNums = 0; - - public String getTargetIP() { - return targetIP; - } - - public void setTargetIP(String targetIP) { - this.targetIP = targetIP; - } - - public int getTargetPort() { - return targetPort; - } - - public void setTargetPort(int targetPort) { - this.targetPort = targetPort; - } - - public int getConnectTimeout() { - return connectTimeout; - } - - public void setConnectTimeout(int connectTimeout) { - this.connectTimeout = connectTimeout; - } - - public int getClientNums() { - return clientNums; - } - - public void setClientNums(int clientNums) { - this.clientNums = clientNums; - } - - @SuppressWarnings("unchecked") - public T get(final Class cls) { - String key = cls.getName(); - if (services.containsKey(key)) { - return (T) services.get(key); - - } else { - T service = createClient(cls, targetIP, targetPort, connectTimeout, clientNums); - services.put(key, service); - return (T) services.get(key); - } - } - - protected T createClient(Class cls, String targetIP, int targetPort, int connectTimeout, int clientNums) { - ReferenceConfig referenceConfig = new ReferenceConfig(); - referenceConfig.setInterface(cls); - StringBuilder url = new StringBuilder(); - url.append("dubbo://"); - url.append(targetIP); - url.append(":"); - url.append(targetPort); - url.append("/"); - url.append(cls.getName()); - referenceConfig.setUrl(url.toString()); - // hardcode - referenceConfig.setConnections(clientNums); - ApplicationConfig application = new ApplicationConfig(); - application.setName("dubbo_consumer"); - referenceConfig.setApplication(application); - referenceConfig.setTimeout(connectTimeout); - return referenceConfig.get(); - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/SimpleProcessorBenchmarkClientRunnable.java b/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/SimpleProcessorBenchmarkClientRunnable.java deleted file mode 100644 index ce10579910..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/java/com/alibaba/dubbo/rpc/benchmark/SimpleProcessorBenchmarkClientRunnable.java +++ /dev/null @@ -1,197 +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.dubbo.rpc.benchmark; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.CountDownLatch; -import java.util.concurrent.CyclicBarrier; - -/** - * Simple Processor RPC Benchmark Client Thread - */ -public class SimpleProcessorBenchmarkClientRunnable implements ClientRunnable { - - private static final Log LOGGER = LogFactory.getLog(SimpleProcessorBenchmarkClientRunnable.class); - - private int requestSize; - - private CyclicBarrier barrier; - - private CountDownLatch latch; - - private long endTime; - - private boolean running = true; - - private ExchangeClientFactory clientFactory = new ExchangeClientFactory(); - - private String targetIP; - - private int targetPort; - - private int clientNums; - - private int rpcTimeout; - - // response time spread - private long[] responseSpreads = new long[9]; - - // error request per second - private long[] errorTPS = null; - - // error response times per second - private long[] errorResponseTimes = null; - - // tps per second - private long[] tps = null; - - // response times per second - private long[] responseTimes = null; - - // benchmark startTime - private long startTime; - - // benchmark maxRange - private int maxRange; - - public SimpleProcessorBenchmarkClientRunnable(String targetIP, int targetPort, int clientNums, int rpcTimeout, - CyclicBarrier barrier, CountDownLatch latch, long startTime, - long endTime) { - - this.targetIP = targetIP; - this.targetPort = targetPort; - this.clientNums = clientNums; - this.rpcTimeout = rpcTimeout; - this.barrier = barrier; - this.latch = latch; - this.startTime = startTime; - this.endTime = endTime; - maxRange = (Integer.parseInt(String.valueOf((endTime - startTime))) / 1000) + 1; - errorTPS = new long[maxRange]; - errorResponseTimes = new long[maxRange]; - tps = new long[maxRange]; - responseTimes = new long[maxRange]; - // init - for (int i = 0; i < maxRange; i++) { - errorTPS[i] = 0; - errorResponseTimes[i] = 0; - tps[i] = 0; - responseTimes[i] = 0; - } - } - - @Override - public void run() { - try { - barrier.await(); - } catch (Exception e) { - // IGNORE - } - runJavaAndHessian(); - latch.countDown(); - } - - private void runJavaAndHessian() { - while (running) { - Object requestObject = new RequestObject(requestSize); - long beginTime = System.nanoTime(); - if (beginTime >= endTime) { - running = false; - break; - } - try { - Object response = null; - response = clientFactory.get(targetIP, targetPort, rpcTimeout, clientNums).request(requestObject).get(); - long currentTime = System.nanoTime(); - if (beginTime <= startTime) { - continue; - } - long consumeTime = currentTime - beginTime; - sumResponseTimeSpread(consumeTime); - int range = Integer.parseInt(String.valueOf(beginTime - startTime)) / 1000; - if (range >= maxRange) { - System.err.println("benchmark range exceeds maxRange,range is: " + range + ",maxRange is: " - + maxRange); - continue; - } - if (((ResponseObject) response).getBytes() != null) { - tps[range] = tps[range] + 1; - responseTimes[range] = responseTimes[range] + consumeTime; - } else { - LOGGER.error("server return response is null"); - errorTPS[range] = errorTPS[range] + 1; - errorResponseTimes[range] = errorResponseTimes[range] + consumeTime; - } - } catch (Exception e) { - LOGGER.error("client.invokeSync error", e); - long currentTime = System.nanoTime(); - if (beginTime <= startTime) { - continue; - } - long consumeTime = currentTime - beginTime; - sumResponseTimeSpread(consumeTime); - int range = Integer.parseInt(String.valueOf(beginTime - startTime)) / 1000; - if (range >= maxRange) { - System.err.println("benchmark range exceeds maxRange,range is: " + range + ",maxRange is: " - + maxRange); - continue; - } - errorTPS[range] = errorTPS[range] + 1; - errorResponseTimes[range] = errorResponseTimes[range] + consumeTime; - } - } - } - - @Override - public List getResults() { - List results = new ArrayList(); - results.add(responseSpreads); - results.add(tps); - results.add(responseTimes); - results.add(errorTPS); - results.add(errorResponseTimes); - return results; - } - - private void sumResponseTimeSpread(long responseTime) { - responseTime = responseTime / 1000; - if (responseTime <= 0) { - responseSpreads[0] = responseSpreads[0] + 1; - } else if (responseTime > 0 && responseTime <= 1) { - responseSpreads[1] = responseSpreads[1] + 1; - } else if (responseTime > 1 && responseTime <= 5) { - responseSpreads[2] = responseSpreads[2] + 1; - } else if (responseTime > 5 && responseTime <= 10) { - responseSpreads[3] = responseSpreads[3] + 1; - } else if (responseTime > 10 && responseTime <= 50) { - responseSpreads[4] = responseSpreads[4] + 1; - } else if (responseTime > 50 && responseTime <= 100) { - responseSpreads[5] = responseSpreads[5] + 1; - } else if (responseTime > 100 && responseTime <= 500) { - responseSpreads[6] = responseSpreads[6] + 1; - } else if (responseTime > 500 && responseTime <= 1000) { - responseSpreads[7] = responseSpreads[7] + 1; - } else if (responseTime > 1000) { - responseSpreads[8] = responseSpreads[8] + 1; - } - } - -} diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/ProviderSample.xml b/dubbo-test/dubbo-test-benchmark/src/main/resources/ProviderSample.xml deleted file mode 100644 index 0ef1440bbb..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/resources/ProviderSample.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - classpath:dubbo-default.properties - classpath:dubbo.properties - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/README.md b/dubbo-test/dubbo-test-benchmark/src/main/resources/README.md deleted file mode 100644 index c1bd77a732..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/resources/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# Steps to use benchmark project - -0. New a benchmark project, say: demo.benchmark -1. Import both service interface (your service API jar) and `dubbo.benchmark.jar` into the project -2. Create a new class to implement `AbstractClientRunnable`: - * Override parent's constructor - * Implement `invoke` method, use `ServiceFactory` to create local proxy for the interface, and then implement business logic as below: - - ```java - public class MyClient implements AbstractClientRunnable { - public Object invoke(ServiceFactory serviceFactory) { - DemoService demoService = (DemoService) serviceFactory.get(DemoService.class); - return demoService.sendRequest("hello"); - } - } -``` - -3. build the project and package the result into a jar file, for example: `demo.benchmark.jar` -4. put `demo.benchmark.jar` under `dubbo.benchmark/lib` -5. config in `dubbo.proerties` -6. run `run.bat` on windows, or `run.sh` on unix-like platforms \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/dubbo.properties b/dubbo-test/dubbo-test-benchmark/src/main/resources/dubbo.properties deleted file mode 100644 index a3463a8b76..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/resources/dubbo.properties +++ /dev/null @@ -1,14 +0,0 @@ -# benchmark runnable class implementation -classname= -# provider's IP -serverip= -# provider's port -serverport= -# the number of concurrent clients -concurrents= -# client timeout in milliseconds -timeout= -# the lasting time for running benchmark in seconds -runtime= -# the number of connections -connectionnums= \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat deleted file mode 100644 index dad1879880..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.bat +++ /dev/null @@ -1 +0,0 @@ -java -Xms512m -Xmx512m -Xmn128m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Dwrite.statistics=true -Djava.ext.dirs="./lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkClient" > "benchmark.log" \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh b/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh deleted file mode 100644 index 05f52bbaf6..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/main/resources/run.sh +++ /dev/null @@ -1 +0,0 @@ -java -Xms512m -Xmx512m -Xmn128m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Dwrite.statistics=true -Djava.ext.dirs="./lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkClient" > "benchmark.log" 2>&1 & \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/dubbo-default.properties b/dubbo-test/dubbo-test-benchmark/src/test/resources/dubbo-default.properties deleted file mode 100644 index e185bedc19..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/test/resources/dubbo-default.properties +++ /dev/null @@ -1,7 +0,0 @@ -dubbo.registry.address=10.20.153.28:9090 -dubbo.provider.port=20880 -dubbo.provider.protocol=dubbo -dubbo.provider.codec= -dubbo.provider.client= -dubbo.provider.server= -dubbo.provider.serialization= \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/log4j.properties b/dubbo-test/dubbo-test-benchmark/src/test/resources/log4j.properties deleted file mode 100644 index 02bc05eaf9..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/test/resources/log4j.properties +++ /dev/null @@ -1,6 +0,0 @@ -log4j.rootLogger=WARN,stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} [%t] %5p %c{1}\:%L - %m%n -log4j.logger.com.alibaba.dubbo=WARN \ No newline at end of file diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh deleted file mode 100644 index 1cc54b786a..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubborpcserver.sh +++ /dev/null @@ -1 +0,0 @@ -sh servercommon.sh "../lib" "com.alibaba.dubbo.rpc.benchmark.RpcBenchmarkServer" "rpcserver.log.dubbo" diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh deleted file mode 100644 index 33e6522c02..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/dubboserver.sh +++ /dev/null @@ -1 +0,0 @@ -sh servercommon.sh "../lib" "com.alibaba.dubbo.rpc.benchmark.BenchmarkServer" "server.log.dubbo" diff --git a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh b/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh deleted file mode 100644 index 68e4ef8de3..0000000000 --- a/dubbo-test/dubbo-test-benchmark/src/test/resources/server/servercommon.sh +++ /dev/null @@ -1 +0,0 @@ -java -Xms2g -Xmx2g -Xmn500m -XX:+PrintGCDetails -XX:+PrintGCDateStamps -Xloggc:gc.log -Djava.ext.dirs=$1 $2 [listenport] [maxthreads] [responsesize] [transporter] [serialization]> $3 2>&1 & diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/Spring3CompatibilityTest.java b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/Spring3CompatibilityTest.java similarity index 92% rename from dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/Spring3CompatibilityTest.java rename to dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/Spring3CompatibilityTest.java index 4e77866ef5..35928152aa 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/Spring3CompatibilityTest.java +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/Spring3CompatibilityTest.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.test; +package org.apache.dubbo.test; -import com.alibaba.dubbo.demo.DemoService; -import com.alibaba.dubbo.test.consumer.ConsumerConfiguration; -import com.alibaba.dubbo.test.provider.ProviderConfiguration; +import org.apache.dubbo.demo.DemoService; +import org.apache.dubbo.test.consumer.ConsumerConfiguration; +import org.apache.dubbo.test.provider.ProviderConfiguration; import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; import org.springframework.util.Assert; diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/consumer/ConsumerConfiguration.java b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/consumer/ConsumerConfiguration.java similarity index 86% rename from dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/consumer/ConsumerConfiguration.java rename to dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/consumer/ConsumerConfiguration.java index 28c48fcf3a..074efcc41b 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/consumer/ConsumerConfiguration.java +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/consumer/ConsumerConfiguration.java @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.test.consumer; +package org.apache.dubbo.test.consumer; -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; -import com.alibaba.dubbo.demo.DemoService; +import org.apache.dubbo.config.annotation.Reference; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.demo.DemoService; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/DefaultDemoService.java b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/DefaultDemoService.java similarity index 89% rename from dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/DefaultDemoService.java rename to dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/DefaultDemoService.java index 004f9a70d9..7c747717ef 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/DefaultDemoService.java +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/DefaultDemoService.java @@ -14,10 +14,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.test.provider; +package org.apache.dubbo.test.provider; -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.demo.DemoService; +import org.apache.dubbo.config.annotation.Service; +import org.apache.dubbo.demo.DemoService; /** * Default {@link DemoService} implementation diff --git a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/ProviderConfiguration.java b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/ProviderConfiguration.java similarity index 90% rename from dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/ProviderConfiguration.java rename to dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/ProviderConfiguration.java index 1f43b07d1c..b0a7629c15 100644 --- a/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/com/alibaba/dubbo/test/provider/ProviderConfiguration.java +++ b/dubbo-test/dubbo-test-compatibility/dubbo-test-spring3/src/main/java/org/apache/dubbo/test/provider/ProviderConfiguration.java @@ -14,9 +14,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.alibaba.dubbo.test.provider; +package org.apache.dubbo.test.provider; -import com.alibaba.dubbo.config.spring.context.annotation.DubboComponentScan; +import org.apache.dubbo.config.spring.context.annotation.DubboComponentScan; import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.ImportResource; diff --git a/dubbo-test/dubbo-test-examples/pom.xml b/dubbo-test/dubbo-test-examples/pom.xml deleted file mode 100644 index 04950646a7..0000000000 --- a/dubbo-test/dubbo-test-examples/pom.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - 4.0.0 - - com.alibaba - dubbo-test - 2.7.0-SNAPSHOT - - dubbo-test-examples - jar - ${project.artifactId} - The examples demo module of dubbo project - - true - - - - - - ${basedir}/src/main/java - - **/*.java - - - - ${basedir}/src/main/resources - - - - - diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java deleted file mode 100644 index 84a1df7178..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationConsumer.java +++ /dev/null @@ -1,49 +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.dubbo.examples.annotation; - -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; -import com.alibaba.dubbo.examples.annotation.action.AnnotationAction; - -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -/** - * CallbackConsumer - */ -public class AnnotationConsumer { - - public static void main(String[] args) throws Exception { - AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ConsumerConfiguration.class); - context.start(); - final AnnotationAction annotationAction = (AnnotationAction) context.getBean("annotationAction"); - String hello = annotationAction.doSayHello("world"); - System.out.println("result :" + hello); - System.in.read(); - } - - @Configuration - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.action") - @PropertySource("classpath:/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties") - @ComponentScan(value = {"com.alibaba.dubbo.examples.annotation.action"}) - static public class ConsumerConfiguration { - - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.java deleted file mode 100644 index e705925205..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/AnnotationProvider.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.dubbo.examples.annotation; - -import com.alibaba.dubbo.config.ProviderConfig; -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; - -import org.springframework.context.annotation.AnnotationConfigApplicationContext; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; - -/** - * MergeProvider - */ -public class AnnotationProvider { - - public static void main(String[] args) throws Exception { - AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(ProviderConfiguration.class); - context.start(); - System.in.read(); - } - - @Configuration - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.annotation.impl") - @PropertySource("classpath:/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties") - static public class ProviderConfiguration { - @Bean - public ProviderConfig providerConfig() { - ProviderConfig providerConfig = new ProviderConfig(); - providerConfig.setTimeout(5000); - return providerConfig; - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/action/AnnotationAction.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/action/AnnotationAction.java deleted file mode 100644 index 7b401923a1..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/action/AnnotationAction.java +++ /dev/null @@ -1,37 +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.dubbo.examples.annotation.action; - -import com.alibaba.dubbo.config.annotation.Reference; -import com.alibaba.dubbo.examples.annotation.api.AnnotationService; - -import org.springframework.stereotype.Component; - -/** - * AnnotationAction - */ -@Component("annotationAction") -public class AnnotationAction { - - @Reference - private AnnotationService annotationService; - - public String doSayHello(String name) { - return annotationService.sayHello(name); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/api/AnnotationService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/api/AnnotationService.java deleted file mode 100644 index a42ebc7f97..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/api/AnnotationService.java +++ /dev/null @@ -1,26 +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.dubbo.examples.annotation.api; - -/** - * AsyncService - */ -public interface AnnotationService { - - String sayHello(String name); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties deleted file mode 100644 index af6094163a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-consumer.properties +++ /dev/null @@ -1,3 +0,0 @@ -dubbo.application.name=annotation-consumer -dubbo.registry.address=multicast://224.5.6.7:1234 -dubbo.consumer.consumer-id.timeout=3000 \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties deleted file mode 100644 index 4cd684ce7c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/dubbo-provider.properties +++ /dev/null @@ -1,4 +0,0 @@ -dubbo.application.name=xxx -dubbo.registry.address=multicast://224.5.6.7:1234 -dubbo.protocol.protocol-id.name=dubbo -dubbo.protocol.protocol-id.port=20883 \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/impl/AnnotationServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/impl/AnnotationServiceImpl.java deleted file mode 100644 index 2a84989202..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/annotation/impl/AnnotationServiceImpl.java +++ /dev/null @@ -1,34 +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.dubbo.examples.annotation.impl; - -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.examples.annotation.api.AnnotationService; - -/** - * AsyncServiceImpl - */ -@Service -public class AnnotationServiceImpl implements AnnotationService { - - @Override - public String sayHello(String name) { - System.out.println("async provider received: " + name); - return "annotation: hello, " + name; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncConsumer.java deleted file mode 100644 index fe224ebc2c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncConsumer.java +++ /dev/null @@ -1,59 +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.dubbo.examples.async; - -import com.alibaba.dubbo.examples.async.api.AsyncService; -import com.alibaba.dubbo.rpc.RpcContext; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - -/** - * CallbackConsumer - */ -public class AsyncConsumer { - - public static void main(String[] args) throws Exception { - String config = AsyncConsumer.class.getPackage().getName().replace('.', '/') + "/async-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - - final AsyncService asyncService = (AsyncService) context.getBean("asyncService"); - - Future f = RpcContext.getContext().asyncCall(new Callable() { - @Override - public String call() throws Exception { - return asyncService.sayHello("async call request"); - } - }); - - System.out.println("async call ret :" + f.get()); - - RpcContext.getContext().asyncCall(new Runnable() { - @Override - public void run() { - asyncService.sayHello("oneway call request1"); - asyncService.sayHello("oneway call request2"); - } - }); - - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncProvider.java deleted file mode 100644 index 5c1d1f3a32..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/AsyncProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.async; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * MergeProvider - */ -public class AsyncProvider { - - public static void main(String[] args) throws Exception { - String config = AsyncProvider.class.getPackage().getName().replace('.', '/') + "/async-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/api/AsyncService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/api/AsyncService.java deleted file mode 100644 index 7ac32413f8..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/api/AsyncService.java +++ /dev/null @@ -1,26 +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.dubbo.examples.async.api; - -/** - * AsyncService - */ -public interface AsyncService { - - String sayHello(String name); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-consumer.xml deleted file mode 100644 index e93c6874fe..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-provider.xml deleted file mode 100644 index a2e4673f70..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/async-provider.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/impl/AsyncServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/impl/AsyncServiceImpl.java deleted file mode 100644 index af724e3e2f..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/async/impl/AsyncServiceImpl.java +++ /dev/null @@ -1,32 +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.dubbo.examples.async.impl; - -import com.alibaba.dubbo.examples.async.api.AsyncService; - -/** - * AsyncServiceImpl - */ -public class AsyncServiceImpl implements AsyncService { - - @Override - public String sayHello(String name) { - System.out.println("async provider received: " + name); - return "hello, " + name; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheConsumer.java deleted file mode 100644 index 7be1f066bc..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheConsumer.java +++ /dev/null @@ -1,70 +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.dubbo.examples.cache; - -import com.alibaba.dubbo.examples.cache.api.CacheService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * CacheConsumer - */ -public class CacheConsumer { - - public static void main(String[] args) throws Exception { - String config = CacheConsumer.class.getPackage().getName().replace('.', '/') + "/cache-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - - CacheService cacheService = (CacheService) context.getBean("cacheService"); - - // verify cache, same result is returned for different invocations (in fact, the return value increases - // on every invocation on the server side) - String fix = null; - for (int i = 0; i < 5; i++) { - String result = cacheService.findCache("0"); - if (fix == null || fix.equals(result)) { - System.out.println("OK: " + result); - } else { - System.err.println("ERROR: " + result); - } - fix = result; - Thread.sleep(500); - } - - // default cache.size is 1000 for LRU, should have cache expired if invoke more than 1001 times - for (int n = 0; n < 1001; n++) { - String pre = null; - for (int i = 0; i < 10; i++) { - String result = cacheService.findCache(String.valueOf(n)); - if (pre != null && !pre.equals(result)) { - System.err.println("ERROR: " + result); - } - pre = result; - } - } - - // verify if the first cache item is expired in LRU cache - String result = cacheService.findCache("0"); - if (fix != null && !fix.equals(result)) { - System.out.println("OK: " + result); - } else { - System.err.println("ERROR: " + result); - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheProvider.java deleted file mode 100644 index 2b9465cb78..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/CacheProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.cache; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * CacheProvider - */ -public class CacheProvider { - - public static void main(String[] args) throws Exception { - String config = CacheProvider.class.getPackage().getName().replace('.', '/') + "/cache-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/api/CacheService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/api/CacheService.java deleted file mode 100644 index 8024b1857c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/api/CacheService.java +++ /dev/null @@ -1,26 +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.dubbo.examples.cache.api; - -/** - * ValidationService - */ -public interface CacheService { - - String findCache(String id); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-consumer.xml deleted file mode 100644 index 7b121e7fcf..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-provider.xml deleted file mode 100644 index 5686eb56e4..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/cache-provider.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/impl/CacheServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/impl/CacheServiceImpl.java deleted file mode 100644 index 7b20d8071a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache/impl/CacheServiceImpl.java +++ /dev/null @@ -1,35 +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.dubbo.examples.cache.impl; - -import com.alibaba.dubbo.examples.cache.api.CacheService; - -import java.util.concurrent.atomic.AtomicInteger; - -/** - * ValidationServiceImpl - */ -public class CacheServiceImpl implements CacheService { - - private final AtomicInteger i = new AtomicInteger(); - - @Override - public String findCache(String id) { - return "request: " + id + ", response: " + i.getAndIncrement(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackConsumer.java deleted file mode 100644 index 743b476028..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackConsumer.java +++ /dev/null @@ -1,43 +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.dubbo.examples.callback; - -import com.alibaba.dubbo.examples.callback.api.CallbackListener; -import com.alibaba.dubbo.examples.callback.api.CallbackService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * CallbackConsumer - */ -public class CallbackConsumer { - - public static void main(String[] args) throws Exception { - String config = CallbackConsumer.class.getPackage().getName().replace('.', '/') + "/callback-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - CallbackService callbackService = (CallbackService) context.getBean("callbackService"); - callbackService.addListener("foo.bar", new CallbackListener() { - @Override - public void changed(String msg) { - System.out.println("callback1:" + msg); - } - }); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackProvider.java deleted file mode 100644 index 6740b68195..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/CallbackProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.callback; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * MergeProvider - */ -public class CallbackProvider { - - public static void main(String[] args) throws Exception { - String config = CallbackProvider.class.getPackage().getName().replace('.', '/') + "/callback-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackListener.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackListener.java deleted file mode 100644 index 81fd38dc62..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackListener.java +++ /dev/null @@ -1,26 +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.dubbo.examples.callback.api; - -/** - * CallbackListener - */ -public interface CallbackListener { - - void changed(String msg); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackService.java deleted file mode 100644 index a35e12f5b4..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/api/CallbackService.java +++ /dev/null @@ -1,26 +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.dubbo.examples.callback.api; - -/** - * CallbackService - */ -public interface CallbackService { - - void addListener(String key, CallbackListener listener); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-consumer.xml deleted file mode 100644 index 8651848563..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-provider.xml deleted file mode 100644 index 727bb85d6b..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/callback-provider.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/impl/CallbackServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/impl/CallbackServiceImpl.java deleted file mode 100644 index 8912ae778f..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/callback/impl/CallbackServiceImpl.java +++ /dev/null @@ -1,68 +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.dubbo.examples.callback.impl; - -import com.alibaba.dubbo.examples.callback.api.CallbackListener; -import com.alibaba.dubbo.examples.callback.api.CallbackService; - -import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; - -/** - * CallbackServiceImpl - */ -public class CallbackServiceImpl implements CallbackService { - - private final Map listeners = new ConcurrentHashMap(); - - public CallbackServiceImpl() { - Thread t = new Thread(new Runnable() { - @Override - public void run() { - while (true) { - try { - for (Map.Entry entry : listeners.entrySet()) { - try { - entry.getValue().changed(getChanged(entry.getKey())); - } catch (Throwable t) { - listeners.remove(entry.getKey()); - } - } - Thread.sleep(5000); // timely trigger change event - } catch (Throwable t) { - t.printStackTrace(); - } - } - } - }); - t.setDaemon(true); - t.start(); - } - - @Override - public void addListener(String key, CallbackListener listener) { - listeners.put(key, listener); - listener.changed(getChanged(key)); // send notification for change - } - - private String getChanged(String key) { - return "Changed: " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericConsumer.java deleted file mode 100644 index 28a69f9b36..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericConsumer.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.dubbo.examples.generic; - -import com.alibaba.dubbo.examples.generic.api.IUserService; -import com.alibaba.dubbo.examples.generic.api.IUserService.Params; -import com.alibaba.dubbo.examples.generic.api.IUserService.User; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * GenericConsumer - */ -public class GenericConsumer { - - public static void main(String[] args) throws Exception { - String config = GenericConsumer.class.getPackage().getName().replace('.', '/') + "/generic-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - IUserService userservice = (IUserService) context.getBean("userservice"); - User user = userservice.get(new Params("a=b")); - System.out.println(user); - System.in.read(); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericProvider.java deleted file mode 100644 index 184731426a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/GenericProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.generic; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * GenericProvider - */ -public class GenericProvider { - - public static void main(String[] args) throws Exception { - String config = GenericProvider.class.getPackage().getName().replace('.', '/') + "/generic-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IService.java deleted file mode 100644 index 44e3d69c0e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IService.java +++ /dev/null @@ -1,21 +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.dubbo.examples.generic.api; - -public interface IService { - V get(P params); -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IUserService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IUserService.java deleted file mode 100644 index 0bfe3fb9ca..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/api/IUserService.java +++ /dev/null @@ -1,65 +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.dubbo.examples.generic.api; - -import com.alibaba.dubbo.examples.generic.api.IUserService.Params; -import com.alibaba.dubbo.examples.generic.api.IUserService.User; - -import java.io.Serializable; - -public interface IUserService extends IService { - - - public static class Params implements Serializable { - private static final long serialVersionUID = 1L; - - public Params(String query) { - } - } - - public static class User implements Serializable { - private static final long serialVersionUID = 1L; - private int id; - private String name; - public User(int id, String name) { - super(); - this.id = id; - this.name = name; - } - - public int getId() { - return id; - } - - public void setId(int id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User [id=" + id + ", name=" + name + "]"; - } - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-consumer.xml deleted file mode 100644 index 42f818c7d4..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-provider.xml deleted file mode 100644 index ba672b6ca2..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/generic-provider.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/impl/UserServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/impl/UserServiceImpl.java deleted file mode 100644 index 92cf923137..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/generic/impl/UserServiceImpl.java +++ /dev/null @@ -1,27 +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.dubbo.examples.generic.impl; - -import com.alibaba.dubbo.examples.generic.api.IUserService; - -public class UserServiceImpl implements IUserService { - - @Override - public User get(Params params) { - return new User(1, "charles"); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartBeatExchangeHandler.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartBeatExchangeHandler.java deleted file mode 100644 index e719fbc2d1..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartBeatExchangeHandler.java +++ /dev/null @@ -1,56 +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.dubbo.examples.heartbeat; - -import com.alibaba.dubbo.remoting.Channel; -import com.alibaba.dubbo.remoting.RemotingException; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.Request; -import com.alibaba.dubbo.remoting.exchange.Response; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeHandler; - -import java.util.concurrent.atomic.AtomicInteger; - -public class HeartBeatExchangeHandler extends HeaderExchangeHandler { - - private AtomicInteger heartBeatCounter = new AtomicInteger(0); - - public HeartBeatExchangeHandler(ExchangeHandler handler) { - super(handler); - } - - @Override - public void received(Channel channel, Object message) throws RemotingException { - if (message instanceof Request) { - Request req = (Request) message; - if (req.isHeartbeat()) { - heartBeatCounter.incrementAndGet(); - channel.setAttribute(KEY_READ_TIMESTAMP, System.currentTimeMillis()); - Response res = new Response(req.getId(), req.getVersion()); - res.setEvent(req.getData() == null ? null : req.getData().toString()); - channel.send(res); - } - } else { - super.received(channel, message); - } - } - - public int getHeartBeatCount() { - return heartBeatCounter.get(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatClient.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatClient.java deleted file mode 100644 index 5751b22dc6..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatClient.java +++ /dev/null @@ -1,92 +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.dubbo.examples.heartbeat; - -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Transporters; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeClient; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeServer; - -public class HeartbeatClient { - - private static final URL serverUrl = URL.valueOf("netty://" + NetUtils.getLocalHost() + ":9999") - .addParameter(Constants.CODEC_KEY, "exchange"); - - private static final ExchangeHandler handler = new ExchangeHandlerAdapter() { - - }; - - private static ExchangeServer exchangeServer; - - private static volatile boolean serverStarted = false; - - public static void main(String[] args) throws Exception { - - final HeartBeatExchangeHandler serverHandler = new HeartBeatExchangeHandler(handler); - - Thread serverThread = new Thread(new Runnable() { - - @Override - public void run() { - try { - exchangeServer = new HeaderExchangeServer( - Transporters.bind(serverUrl, serverHandler)); - serverStarted = true; - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - serverThread.setDaemon(true); - serverThread.start(); - - while (!serverStarted) { - Thread.sleep(1000); - } - - URL url = serverUrl.addParameter(Constants.HEARTBEAT_KEY, 1000); - - HeartBeatExchangeHandler clientHandler = new HeartBeatExchangeHandler(handler); - ExchangeClient exchangeClient = new HeaderExchangeClient(Transporters.connect(url, clientHandler),true); - - for (int i = 0; i < 10; i++) { - Thread.sleep(1000); - System.out.print("."); - } - - System.out.println(); - - if (serverHandler.getHeartBeatCount() > 0) { - System.out.printf("Server receives %d heartbeats", - serverHandler.getHeartBeatCount()); - } else { - throw new Exception("Client heartbeat does not work."); - } - - exchangeClient.close(); - exchangeServer.close(); - - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatConsumer.java deleted file mode 100644 index 3a2c8cfcf1..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatConsumer.java +++ /dev/null @@ -1,36 +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.dubbo.examples.heartbeat; - -import com.alibaba.dubbo.examples.heartbeat.api.HelloService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class HeartbeatConsumer { - - public static void main(String[] args) throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - HeartbeatConsumer.class.getPackage().getName().replace('.', '/') + "/heartbeat-consumer.xml"); - context.start(); - HelloService hello = (HelloService) context.getBean("helloService"); - for (int i = 0; i < Integer.MAX_VALUE; i++) { - System.out.println(hello.sayHello("kimi-" + i)); - Thread.sleep(10000); - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatProvider.java deleted file mode 100644 index eed8991ec5..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatProvider.java +++ /dev/null @@ -1,30 +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.dubbo.examples.heartbeat; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class HeartbeatProvider { - - public static void main(String[] args) throws Exception { - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext( - HeartbeatProvider.class.getPackage().getName().replace('.', '/') + "/heartbeat-provider.xml"); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatServer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatServer.java deleted file mode 100644 index a559ed5a6f..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/HeartbeatServer.java +++ /dev/null @@ -1,92 +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.dubbo.examples.heartbeat; - -import com.alibaba.dubbo.common.Constants; -import com.alibaba.dubbo.common.URL; -import com.alibaba.dubbo.common.utils.NetUtils; -import com.alibaba.dubbo.remoting.Transporters; -import com.alibaba.dubbo.remoting.exchange.ExchangeClient; -import com.alibaba.dubbo.remoting.exchange.ExchangeHandler; -import com.alibaba.dubbo.remoting.exchange.ExchangeServer; -import com.alibaba.dubbo.remoting.exchange.support.ExchangeHandlerAdapter; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeClient; -import com.alibaba.dubbo.remoting.exchange.support.header.HeaderExchangeServer; - -public class HeartbeatServer { - - private static final URL clientUrl = URL.valueOf("netty://" + NetUtils.getLocalHost() + ":9999") - .addParameter(Constants.CODEC_KEY, "exchange"); - - private static final ExchangeHandler handler = new ExchangeHandlerAdapter() { - - }; - - private static ExchangeServer exchangeServer; - - private static volatile boolean serverStarted = false; - - public static void main(String[] args) throws Exception { - - final HeartBeatExchangeHandler serverHandler = new HeartBeatExchangeHandler(handler); - - Thread serverThread = new Thread(new Runnable() { - - @Override - public void run() { - try { - exchangeServer = new HeaderExchangeServer( - Transporters.bind( - clientUrl.addParameter(Constants.HEARTBEAT_KEY, 1000), - serverHandler)); - serverStarted = true; - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - serverThread.setDaemon(true); - serverThread.start(); - - while (!serverStarted) { - Thread.sleep(1000); - } - - HeartBeatExchangeHandler clientHandler = new HeartBeatExchangeHandler(handler); - ExchangeClient exchangeClient = new HeaderExchangeClient(Transporters.connect(clientUrl, clientHandler),true); - - for (int i = 0; i < 10; i++) { - Thread.sleep(1000); - System.out.print("."); - } - - System.out.println(); - - if (clientHandler.getHeartBeatCount() > 0) { - System.out.printf("Client receives %d heartbeats", - clientHandler.getHeartBeatCount()); - } else { - throw new Exception("Server heartbeat does not work."); - } - - exchangeClient.close(); - exchangeServer.close(); - - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/api/HelloService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/api/HelloService.java deleted file mode 100644 index e19c3b4843..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/api/HelloService.java +++ /dev/null @@ -1,23 +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.dubbo.examples.heartbeat.api; - -public interface HelloService { - - public String sayHello(String name); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml deleted file mode 100644 index 38bb9dd442..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-consumer.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - - - - diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml deleted file mode 100644 index 7ce7228c38..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/heartbeat-provider.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/impl/HelloServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/impl/HelloServiceImpl.java deleted file mode 100644 index 3ab8612c33..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/heartbeat/impl/HelloServiceImpl.java +++ /dev/null @@ -1,27 +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.dubbo.examples.heartbeat.impl; - -import com.alibaba.dubbo.examples.heartbeat.api.HelloService; - -public class HelloServiceImpl implements HelloService { - - @Override - public String sayHello(String name) { - return "Hello, " + name + "!"; - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/MemcachedConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/MemcachedConsumer.java deleted file mode 100644 index 9ad3eecfcc..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/MemcachedConsumer.java +++ /dev/null @@ -1,49 +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.dubbo.examples.memcached; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.Map; - -/** - * GenericConsumer - */ -public class MemcachedConsumer { - - @SuppressWarnings("unchecked") - public static void main(String[] args) throws Exception { - String config = MemcachedConsumer.class.getPackage().getName().replace('.', '/') + "/memcached-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - Map cache = (Map) context.getBean("cache"); - cache.remove("hello"); - Object value = cache.get("hello"); - System.out.println(value); - if (value != null) { - throw new IllegalStateException(value + " != null"); - } - cache.put("hello", "world"); - value = cache.get("hello"); - System.out.println(value); - if (!"world".equals(value)) { - throw new IllegalStateException(value + " != world"); - } - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/memcached-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/memcached-consumer.xml deleted file mode 100644 index 76cc7603b9..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/memcached/memcached-consumer.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer.java deleted file mode 100644 index 059890f30e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer.java +++ /dev/null @@ -1,46 +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.dubbo.examples.merge; - -import com.alibaba.dubbo.examples.merge.api.MergeService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.List; - -/** - * MergeConsumer - */ -public class MergeConsumer { - - public static void main(String[] args) throws Exception { - String config = MergeConsumer.class.getPackage().getName().replace('.', '/') + "/merge-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - MergeService mergeService = (MergeService) context.getBean("mergeService"); - for (int i = 0; i < Integer.MAX_VALUE; i++) { - try { - List result = mergeService.mergeResult(); - System.out.println("(" + i + ") " + result); - Thread.sleep(1000); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer2.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer2.java deleted file mode 100644 index fba9e9ee35..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeConsumer2.java +++ /dev/null @@ -1,46 +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.dubbo.examples.merge; - -import com.alibaba.dubbo.examples.merge.api.MergeService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.List; - -/** - * MergeConsumer2 - */ -public class MergeConsumer2 { - - public static void main(String[] args) throws Exception { - String config = MergeConsumer2.class.getPackage().getName().replace('.', '/') + "/merge-consumer2.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - MergeService mergeService = (MergeService) context.getBean("mergeService"); - for (int i = 0; i < Integer.MAX_VALUE; i++) { - try { - List result = mergeService.mergeResult(); - System.out.println("(" + i + ") " + result); - Thread.sleep(1000); - } catch (Exception e) { - e.printStackTrace(); - } - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider.java deleted file mode 100644 index fb0896897c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.merge; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * MergeProvider - */ -public class MergeProvider { - - public static void main(String[] args) throws Exception { - String config = MergeProvider.class.getPackage().getName().replace('.', '/') + "/merge-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider2.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider2.java deleted file mode 100644 index c6fa7ffb56..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/MergeProvider2.java +++ /dev/null @@ -1,33 +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.dubbo.examples.merge; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * MergeProvider2 - */ -public class MergeProvider2 { - - public static void main(String[] args) throws Exception { - String config = MergeProvider2.class.getPackage().getName().replace('.', '/') + "/merge-provider2.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/api/MergeService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/api/MergeService.java deleted file mode 100644 index 5274b26c6c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/api/MergeService.java +++ /dev/null @@ -1,28 +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.dubbo.examples.merge.api; - -import java.util.List; - -/** - * MergeService - */ -public interface MergeService { - - List mergeResult(); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl.java deleted file mode 100644 index a675066cf8..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl.java +++ /dev/null @@ -1,37 +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.dubbo.examples.merge.impl; - -import com.alibaba.dubbo.examples.merge.api.MergeService; - -import java.util.ArrayList; -import java.util.List; - -/** - * MenuServiceImpl - */ -public class MergeServiceImpl implements MergeService { - - @Override - public List mergeResult() { - List menus = new ArrayList(); - menus.add("group-1.1"); - menus.add("group-1.2"); - return menus; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl2.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl2.java deleted file mode 100644 index 8ad1b157e1..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl2.java +++ /dev/null @@ -1,37 +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.dubbo.examples.merge.impl; - -import com.alibaba.dubbo.examples.merge.api.MergeService; - -import java.util.ArrayList; -import java.util.List; - -/** - * MenuServiceImpl - */ -public class MergeServiceImpl2 implements MergeService { - - @Override - public List mergeResult() { - List menus = new ArrayList(); - menus.add("group-2.1"); - menus.add("group-2.2"); - return menus; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl3.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl3.java deleted file mode 100644 index 0ec95a1a42..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/impl/MergeServiceImpl3.java +++ /dev/null @@ -1,37 +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.dubbo.examples.merge.impl; - -import com.alibaba.dubbo.examples.merge.api.MergeService; - -import java.util.ArrayList; -import java.util.List; - -/** - * MenuServiceImpl - */ -public class MergeServiceImpl3 implements MergeService { - - @Override - public List mergeResult() { - List menus = new ArrayList(); - menus.add("group-3.1"); - menus.add("group-3.2"); - return menus; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer.xml deleted file mode 100644 index 5912e78772..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer2.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer2.xml deleted file mode 100644 index be4646ff21..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-consumer2.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider.xml deleted file mode 100644 index db164393cd..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider2.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider2.xml deleted file mode 100644 index 2e28674d8a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge/merge-provider2.xml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/RedisConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/RedisConsumer.java deleted file mode 100644 index d430dd88ea..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/RedisConsumer.java +++ /dev/null @@ -1,48 +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.dubbo.examples.redis; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import java.util.Map; - -/** - * GenericConsumer - */ -public class RedisConsumer { - - @SuppressWarnings("unchecked") - public static void main(String[] args) throws Exception { - String config = RedisConsumer.class.getPackage().getName().replace('.', '/') + "/redis-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - Map cache = (Map) context.getBean("cache"); - cache.remove("hello"); - Object value = cache.get("hello"); - System.out.println(value); - if (value != null) { - throw new IllegalStateException(value + " != null"); - } - cache.put("hello", "world"); - value = cache.get("hello"); - System.out.println(value); - if (!"world".equals(value)) { - throw new IllegalStateException(value + " != world"); - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/redis-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/redis-consumer.xml deleted file mode 100644 index ccd63bb876..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/redis/redis-consumer.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/NonDubboRestConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/NonDubboRestConsumer.java deleted file mode 100644 index 7a22c92585..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/NonDubboRestConsumer.java +++ /dev/null @@ -1,91 +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.dubbo.examples.rest; - -import com.alibaba.dubbo.examples.rest.api.User; - -import javax.ws.rs.client.Client; -import javax.ws.rs.client.ClientBuilder; -import javax.ws.rs.client.Entity; -import javax.ws.rs.client.WebTarget; -import javax.ws.rs.core.MediaType; -import javax.ws.rs.core.Response; - -public class NonDubboRestConsumer { - - public static void main(String[] args) { - String port = "8888"; - - registerUser("http://localhost:" + port + "/services/users/register.json", MediaType.APPLICATION_JSON_TYPE); - - registerUser("http://localhost:" + port + "/services/users/register.xml", MediaType.TEXT_XML_TYPE); - - getUser("http://localhost:" + port + "/services/users/1.json"); - - getUser("http://localhost:" + port + "/services/users/2.xml"); - - registerUser("http://localhost:" + port + "/services/u/register.json", MediaType.APPLICATION_JSON_TYPE); - - registerUser("http://localhost:" + port + "/services/u/register.xml", MediaType.TEXT_XML_TYPE); - - getUser("http://localhost:" + port + "/services/u/1.json"); - - getUser("http://localhost:" + port + "/services/u/2.xml"); - - registerUser("http://localhost:" + port + "/services/customers/register.json", MediaType.APPLICATION_JSON_TYPE); - - registerUser("http://localhost:" + port + "/services/customers/register.xml", MediaType.TEXT_XML_TYPE); - - getUser("http://localhost:" + port + "/services/customers/1.json"); - - getUser("http://localhost:" + port + "/services/customers/2.xml"); - } - - private static void registerUser(String url, MediaType mediaType) { - System.out.println("Registering user via " + url); - User user = new User(1L, "larrypage"); - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(url); - Response response = target.request().post(Entity.entity(user, mediaType)); - - try { - if (response.getStatus() != 200) { - throw new RuntimeException("Failed with HTTP error code : " + response.getStatus()); - } - System.out.println("Successfully got result: " + response.readEntity(String.class)); - } finally { - response.close(); - client.close(); - } - } - - private static void getUser(String url) { - System.out.println("Getting user via " + url); - Client client = ClientBuilder.newClient(); - WebTarget target = client.target(url); - Response response = target.request().get(); - try { - if (response.getStatus() != 200) { - throw new RuntimeException("Failed with HTTP error code : " + response.getStatus()); - } - System.out.println("Successfully got result: " + response.readEntity(String.class)); - } finally { - response.close(); - client.close(); - } - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestConsumer.java deleted file mode 100644 index 06772ffc7e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestConsumer.java +++ /dev/null @@ -1,43 +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.dubbo.examples.rest; - -import com.alibaba.dubbo.examples.rest.api.User; -import com.alibaba.dubbo.examples.rest.api.facade.AnotherUserRestService; -import com.alibaba.dubbo.rpc.RpcContext; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class RestConsumer { - - public static void main(String[] args) throws Exception { - String config = RestConsumer.class.getPackage().getName().replace('.', '/') + "/rest-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - AnotherUserRestService userService = (AnotherUserRestService) context.getBean("anotherUserRestService"); - - - User user = new User(1L, "larrypage"); - System.out.println("SUCCESS: registered user with id " + userService.registerUser(user).getId()); - - RpcContext.getContext().setAttachment("clientName", "demo"); - RpcContext.getContext().setAttachment("clientImpl", "dubbo"); - System.out.println("SUCCESS: got user " + userService.getUser(1L)); - System.in.read(); - } - -} \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestProvider.java deleted file mode 100644 index 04eca05b8d..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/RestProvider.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.dubbo.examples.rest; - -import com.alibaba.dubbo.config.spring.context.annotation.EnableDubbo; - -import org.springframework.context.annotation.Configuration; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -public class RestProvider { - - public static void main(String[] args) throws Exception { - String config = RestProvider.class.getPackage().getName().replace('.', '/') + "/rest-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - - @Configuration - @EnableDubbo(scanBasePackages = "com.alibaba.dubbo.examples.rest.impl.facade") - static public class ProviderConfiguration { - - } - -} \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/User.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/User.java deleted file mode 100644 index 3bdfd26185..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/User.java +++ /dev/null @@ -1,75 +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.dubbo.examples.rest.api; - -import org.codehaus.jackson.annotate.JsonProperty; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; - -@XmlRootElement -@XmlAccessorType(XmlAccessType.FIELD) -public class User implements Serializable { - - @NotNull - @Min(1L) - private Long id; - - @JsonProperty("username") - @XmlElement(name = "username") - @NotNull - @Size(min = 6, max = 50) - private String name; - - public User() { - } - - public User(Long id, String name) { - this.id = id; - this.name = name; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public String toString() { - return "User (" + - "id=" + id + - ", name='" + name + '\'' + - ')'; - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/UserService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/UserService.java deleted file mode 100644 index 1c7d4a234e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/UserService.java +++ /dev/null @@ -1,23 +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.dubbo.examples.rest.api; - -public interface UserService { - User getUser(Long id); - - Long registerUser(User user); -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/ClientTraceFilter.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/ClientTraceFilter.java deleted file mode 100644 index e207cbb3b9..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/ClientTraceFilter.java +++ /dev/null @@ -1,37 +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.dubbo.examples.rest.api.extension; - -import javax.ws.rs.client.ClientRequestContext; -import javax.ws.rs.client.ClientRequestFilter; -import javax.ws.rs.client.ClientResponseContext; -import javax.ws.rs.client.ClientResponseFilter; -import java.io.IOException; - - -public class ClientTraceFilter implements ClientRequestFilter, ClientResponseFilter { - - @Override - public void filter(ClientRequestContext requestContext) throws IOException { - System.out.println("Client request filter invoked"); - } - - @Override - public void filter(ClientRequestContext clientRequestContext, ClientResponseContext clientResponseContext) throws IOException { - System.out.println("Client response filter invoked"); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/CustomExceptionMapper.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/CustomExceptionMapper.java deleted file mode 100644 index 3b7f457fb7..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/CustomExceptionMapper.java +++ /dev/null @@ -1,33 +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.dubbo.examples.rest.api.extension; - -import com.alibaba.dubbo.rpc.RpcContext; - -import javax.ws.rs.NotFoundException; -import javax.ws.rs.core.Response; -import javax.ws.rs.ext.ExceptionMapper; - -public class CustomExceptionMapper implements ExceptionMapper { - - @Override - public Response toResponse(NotFoundException e) { - System.out.println("Exception mapper successfully got an exception: " + e + ":" + e.getMessage()); - System.out.println("Client IP is " + RpcContext.getContext().getRemoteAddressString()); - return Response.status(Response.Status.NOT_FOUND).entity("Oops! the requested resource is not found!").type("text/plain").build(); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceBinding.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceBinding.java deleted file mode 100644 index 93593aa733..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceBinding.java +++ /dev/null @@ -1,29 +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.dubbo.examples.rest.api.extension; - -import javax.ws.rs.container.DynamicFeature; -import javax.ws.rs.container.ResourceInfo; -import javax.ws.rs.core.FeatureContext; - -public class DynamicTraceBinding implements DynamicFeature { - - @Override - public void configure(ResourceInfo resourceInfo, FeatureContext context) { - context.register(DynamicTraceInterceptor.class); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceInterceptor.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceInterceptor.java deleted file mode 100644 index 77f7318145..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/DynamicTraceInterceptor.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.dubbo.examples.rest.api.extension; - -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; -import java.io.IOException; - -@Priority(Priorities.USER) -public class DynamicTraceInterceptor implements ReaderInterceptor, WriterInterceptor { - - @Override - public Object aroundReadFrom(ReaderInterceptorContext readerInterceptorContext) throws IOException, WebApplicationException { - System.out.println("Dynamic reader interceptor invoked"); - return readerInterceptorContext.proceed(); - } - - @Override - public void aroundWriteTo(WriterInterceptorContext writerInterceptorContext) throws IOException, WebApplicationException { - System.out.println("Dynamic writer interceptor invoked"); - writerInterceptorContext.proceed(); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/LogFilter.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/LogFilter.java deleted file mode 100644 index c3aed43095..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/LogFilter.java +++ /dev/null @@ -1,31 +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.dubbo.examples.rest.api.extension; - -import com.alibaba.dubbo.rpc.Filter; -import com.alibaba.dubbo.rpc.Invocation; -import com.alibaba.dubbo.rpc.Invoker; -import com.alibaba.dubbo.rpc.Result; -import com.alibaba.dubbo.rpc.RpcException; - -public class LogFilter implements Filter { - @Override - public Result invoke(Invoker invoker, Invocation invocation) throws RpcException { - System.out.println(invocation.getMethodName() + "is invoked"); - return invoker.invoke(invocation); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceFilter.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceFilter.java deleted file mode 100644 index d01d016f75..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceFilter.java +++ /dev/null @@ -1,40 +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.dubbo.examples.rest.api.extension; - -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.container.ContainerRequestContext; -import javax.ws.rs.container.ContainerRequestFilter; -import javax.ws.rs.container.ContainerResponseContext; -import javax.ws.rs.container.ContainerResponseFilter; -import java.io.IOException; - -@Priority(Priorities.USER) -public class TraceFilter implements ContainerRequestFilter, ContainerResponseFilter { - - @Override - public void filter(ContainerRequestContext requestContext) throws IOException { - System.out.println("Request filter invoked: " + requestContext.getUriInfo().getAbsolutePath()); - } - - @Override - public void filter(ContainerRequestContext containerRequestContext, ContainerResponseContext containerResponseContext) throws IOException { - System.out.println("Response filter invoked."); - - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceInterceptor.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceInterceptor.java deleted file mode 100644 index 9c54e8aac4..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/extension/TraceInterceptor.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.dubbo.examples.rest.api.extension; - -import javax.annotation.Priority; -import javax.ws.rs.Priorities; -import javax.ws.rs.WebApplicationException; -import javax.ws.rs.ext.ReaderInterceptor; -import javax.ws.rs.ext.ReaderInterceptorContext; -import javax.ws.rs.ext.WriterInterceptor; -import javax.ws.rs.ext.WriterInterceptorContext; -import java.io.IOException; - -@Priority(Priorities.USER) -public class TraceInterceptor implements ReaderInterceptor, WriterInterceptor { - - @Override - public Object aroundReadFrom(ReaderInterceptorContext readerInterceptorContext) throws IOException, WebApplicationException { - System.out.println("Reader interceptor invoked"); - return readerInterceptorContext.proceed(); - } - - @Override - public void aroundWriteTo(WriterInterceptorContext writerInterceptorContext) throws IOException, WebApplicationException { - System.out.println("Writer interceptor invoked"); - writerInterceptorContext.proceed(); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/AnotherUserRestService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/AnotherUserRestService.java deleted file mode 100644 index 29b2b47f97..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/AnotherUserRestService.java +++ /dev/null @@ -1,43 +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.dubbo.examples.rest.api.facade; - -import com.alibaba.dubbo.examples.rest.api.User; -import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType; - -import javax.validation.constraints.Min; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Path("u") -@Consumes({MediaType.APPLICATION_JSON, MediaType.TEXT_XML}) -@Produces({ContentType.APPLICATION_JSON_UTF_8, ContentType.TEXT_XML_UTF_8}) -public interface AnotherUserRestService { - - @GET - @Path("{id : \\d+}") - User getUser(@PathParam("id") @Min(1L) Long id); - - @POST - @Path("register") - RegistrationResult registerUser(User user); -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/RegistrationResult.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/RegistrationResult.java deleted file mode 100644 index e888c3b409..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/RegistrationResult.java +++ /dev/null @@ -1,44 +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.dubbo.examples.rest.api.facade; - -import javax.xml.bind.annotation.XmlRootElement; -import java.io.Serializable; - -/** - * DTO to customize the returned message - */ -@XmlRootElement -public class RegistrationResult implements Serializable { - - private Long id; - - public RegistrationResult() { - } - - public RegistrationResult(Long id) { - this.id = id; - } - - public Long getId() { - return id; - } - - public void setId(Long id) { - this.id = id; - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/UserRestService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/UserRestService.java deleted file mode 100644 index 16eface6cb..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/api/facade/UserRestService.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.dubbo.examples.rest.api.facade; - -import com.alibaba.dubbo.examples.rest.api.User; - -import javax.validation.constraints.Min; - -/** - * This interface acts as some kind of service broker for the original UserService - *

    - * Here we want to simulate the twitter/weibo rest api, e.g. - *

    - * http://localhost:8888/user/1.json - * http://localhost:8888/user/1.xml - */ -public interface UserRestService { - - /** - * the request object is just used to test jax-rs injection. - */ - User getUser(@Min(value = 1L, message = "User ID must be greater than 1") Long id/*, HttpServletRequest request*/); - - RegistrationResult registerUser(User user); -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/UserServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/UserServiceImpl.java deleted file mode 100644 index 6de02c8d59..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/UserServiceImpl.java +++ /dev/null @@ -1,41 +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.dubbo.examples.rest.impl; - -import com.alibaba.dubbo.examples.rest.api.User; - -import org.springframework.stereotype.Service; - -import java.util.concurrent.atomic.AtomicLong; - -@Service("userService") -public class UserServiceImpl implements com.alibaba.dubbo.examples.rest.api.UserService { - - private final AtomicLong idGen = new AtomicLong(); - - @Override - public User getUser(Long id) { - return new User(id, "username" + id); - } - - - @Override - public Long registerUser(User user) { -// System.out.println("Username is " + user.getName()); - return idGen.incrementAndGet(); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java deleted file mode 100644 index e475081c8a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnnotationDrivenUserRestServiceImpl.java +++ /dev/null @@ -1,67 +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.dubbo.examples.rest.impl.facade; - -import com.alibaba.dubbo.config.annotation.Service; -import com.alibaba.dubbo.examples.rest.api.User; -import com.alibaba.dubbo.examples.rest.api.UserService; -import com.alibaba.dubbo.examples.rest.api.facade.RegistrationResult; -import com.alibaba.dubbo.examples.rest.api.facade.UserRestService; -import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType; - -import org.springframework.beans.factory.annotation.Autowired; - -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Service(protocol = {"rest", "dubbo"}, group = "annotationConfig", validation = "true") -@Path("customers") -@Consumes({MediaType.APPLICATION_JSON, MediaType.TEXT_XML}) -@Produces({ContentType.APPLICATION_JSON_UTF_8, ContentType.TEXT_XML_UTF_8}) -public class AnnotationDrivenUserRestServiceImpl implements UserRestService { - -// private static final Logger logger = LoggerFactory.getLogger(UserRestServiceImpl.class); - - @Autowired - private UserService userService; - - public void setUserService(UserService userService) { - this.userService = userService; - } - - @Override - @GET - @Path("{id : \\d+}") - public User getUser(@PathParam("id") Long id/*, @Context HttpServletRequest request*/) { - // test context injection -// System.out.println("Client address from @Context injection: " + (request != null ? request.getRemoteAddr() : "")); -// System.out.println("Client address from RpcContext: " + RpcContext.getContext().getRemoteAddressString()); - return userService.getUser(id); - } - - @Override - @POST - @Path("register") - public RegistrationResult registerUser(User user) { - return new RegistrationResult(userService.registerUser(user)); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnotherUserRestServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnotherUserRestServiceImpl.java deleted file mode 100644 index 99788466d7..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/AnotherUserRestServiceImpl.java +++ /dev/null @@ -1,49 +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.dubbo.examples.rest.impl.facade; - -import com.alibaba.dubbo.examples.rest.api.User; -import com.alibaba.dubbo.examples.rest.api.UserService; -import com.alibaba.dubbo.examples.rest.api.facade.AnotherUserRestService; -import com.alibaba.dubbo.examples.rest.api.facade.RegistrationResult; -import com.alibaba.dubbo.rpc.RpcContext; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -@Service("anotherUserRestService") -public class AnotherUserRestServiceImpl implements AnotherUserRestService { - - @Autowired - private UserService userService; - - public void setUserService(UserService userService) { - this.userService = userService; - } - - @Override - public User getUser(Long id) { - System.out.println("Client name is " + RpcContext.getContext().getAttachment("clientName")); - System.out.println("Client impl is " + RpcContext.getContext().getAttachment("clientImpl")); - return userService.getUser(id); - } - - @Override - public RegistrationResult registerUser(User user) { - return new RegistrationResult(userService.registerUser(user)); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/UserRestServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/UserRestServiceImpl.java deleted file mode 100644 index 49fdb469e9..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/impl/facade/UserRestServiceImpl.java +++ /dev/null @@ -1,76 +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.dubbo.examples.rest.impl.facade; - -import com.alibaba.dubbo.examples.rest.api.User; -import com.alibaba.dubbo.examples.rest.api.UserService; -import com.alibaba.dubbo.examples.rest.api.facade.RegistrationResult; -import com.alibaba.dubbo.examples.rest.api.facade.UserRestService; -import com.alibaba.dubbo.rpc.RpcContext; -import com.alibaba.dubbo.rpc.protocol.rest.support.ContentType; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.ws.rs.Consumes; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.core.MediaType; - -@Service("userRestService") -@Path("users") -@Consumes({MediaType.APPLICATION_JSON, MediaType.TEXT_XML}) -@Produces({ContentType.APPLICATION_JSON_UTF_8, ContentType.TEXT_XML_UTF_8}) -public class UserRestServiceImpl implements UserRestService { - -// private static final Logger logger = LoggerFactory.getLogger(UserRestServiceImpl.class); - - @Autowired - private UserService userService; - - public void setUserService(UserService userService) { - this.userService = userService; - } - - @Override - @GET - @Path("{id : \\d+}") - public User getUser(@PathParam("id") Long id/*, @Context HttpServletRequest request*/) { - // test context injection -// System.out.println("Client address from @Context injection: " + (request != null ? request.getRemoteAddr() : "")); - System.out.println("Client address from RpcContext: " + RpcContext.getContext().getRemoteAddressString()); - if (RpcContext.getContext().getRequest(HttpServletRequest.class) != null) { - System.out.println("Client IP address from RpcContext: " + RpcContext.getContext().getRequest(HttpServletRequest.class).getRemoteAddr()); - } - if (RpcContext.getContext().getResponse(HttpServletResponse.class) != null) { - System.out.println("Response object from RpcContext: " + RpcContext.getContext().getResponse(HttpServletResponse.class)); - } - return userService.getUser(id); - } - - @Override - @POST - @Path("register") - public RegistrationResult registerUser(User user) { - return new RegistrationResult(userService.registerUser(user)); - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-consumer.xml deleted file mode 100644 index bacd51341d..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-consumer.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-provider.xml deleted file mode 100644 index 006c132f0e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/rest/rest-provider.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationConsumer.java deleted file mode 100644 index 83b731547e..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationConsumer.java +++ /dev/null @@ -1,77 +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.dubbo.examples.validation; - -import com.alibaba.dubbo.examples.validation.api.ValidationParameter; -import com.alibaba.dubbo.examples.validation.api.ValidationService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import java.util.Date; -import java.util.Set; - -/** - * ValidationConsumer - */ -public class ValidationConsumer { - - public static void main(String[] args) throws Exception { - String config = ValidationConsumer.class.getPackage().getName().replace('.', '/') + "/validation-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - - ValidationService validationService = (ValidationService) context.getBean("validationService"); - - // Save OK - ValidationParameter parameter = new ValidationParameter(); - parameter.setName("liangfei"); - parameter.setEmail("liangfei@liang.fei"); - parameter.setAge(50); - parameter.setLoginDate(new Date(System.currentTimeMillis() - 1000000)); - parameter.setExpiryDate(new Date(System.currentTimeMillis() + 1000000)); - validationService.save(parameter); - System.out.println("Validation Save OK"); - - // Save Error - try { - parameter = new ValidationParameter(); - validationService.save(parameter); - System.err.println("Validation Save ERROR"); - } catch (Exception e) { - ConstraintViolationException ve = (ConstraintViolationException) e; - Set> violations = ve.getConstraintViolations(); - System.out.println(violations); - } - - // Delete OK - validationService.delete(2, "abc"); - System.out.println("Validation Delete OK"); - - // Delete Error - try { - validationService.delete(0, "abc"); - System.err.println("Validation Delete ERROR"); - } catch (Exception e) { - ConstraintViolationException ve = (ConstraintViolationException) e; - Set> violations = ve.getConstraintViolations(); - System.out.println(violations); - } - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationProvider.java deleted file mode 100644 index 55f1724a4f..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/ValidationProvider.java +++ /dev/null @@ -1,34 +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.dubbo.examples.validation; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * ValidationProvider - */ -public class ValidationProvider { - - public static void main(String[] args) throws Exception { - System.setProperty("java.net.preferIPv4Stack", "true"); - String config = ValidationProvider.class.getPackage().getName().replace('.', '/') + "/validation-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationParameter.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationParameter.java deleted file mode 100644 index 802ab7f3b2..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationParameter.java +++ /dev/null @@ -1,94 +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.dubbo.examples.validation.api; - -import javax.validation.constraints.Future; -import javax.validation.constraints.Max; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Past; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; -import java.io.Serializable; -import java.util.Date; - -/** - * ValidationParameter - */ -public class ValidationParameter implements Serializable { - - private static final long serialVersionUID = 7158911668568000392L; - - @NotNull // disallow null - @Size(min = 2, max = 20) // min and max - private String name; - - @NotNull(groups = ValidationService.Save.class) // disallow null when save, but allow null when update, that is: not update - @Pattern(regexp = "^\\s*\\w+(?:\\.{0,1}[\\w-]+)*@[a-zA-Z0-9]+(?:[-.][a-zA-Z0-9]+)*\\.[a-zA-Z]+\\s*$") - private String email; - - @Min(18) // min - @Max(100) // max - private int age; - - @Past // must be a past time - private Date loginDate; - - @Future // must be a future time - private Date expiryDate; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getEmail() { - return email; - } - - public void setEmail(String email) { - this.email = email; - } - - public int getAge() { - return age; - } - - public void setAge(int age) { - this.age = age; - } - - public Date getLoginDate() { - return loginDate; - } - - public void setLoginDate(Date loginDate) { - this.loginDate = loginDate; - } - - public Date getExpiryDate() { - return expiryDate; - } - - public void setExpiryDate(Date expiryDate) { - this.expiryDate = expiryDate; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationService.java deleted file mode 100644 index 3b60d83ac3..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/api/ValidationService.java +++ /dev/null @@ -1,53 +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.dubbo.examples.validation.api; - -import javax.validation.constraints.Min; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; - - -/** - * ValidationService - *

    - * Use service interface to distinguish validation scenario, for example: @NotNull(groups = ValidationService.class) - */ -public interface ValidationService { - - void save(ValidationParameter parameter); - - void update(ValidationParameter parameter); - - void delete(@Min(1) long id, @NotNull @Size(min = 2, max = 16) @Pattern(regexp = "^[a-zA-Z]+$") String operator); - - /** - * annotation which has the same name with the method but has the first letter in capital - * used for distinguish validation scenario, for example: @NotNull(groups = ValidationService.Save.class) - * optional - */ - @interface Save { - } - - /** - * annotation which has the same name with the method but has the first letter in capital - * used for distinguish validation scenario, for example: @NotNull(groups = ValidationService.Update.class) - * optional - */ - @interface Update { - } -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/impl/ValidationServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/impl/ValidationServiceImpl.java deleted file mode 100644 index 051d29f42c..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/impl/ValidationServiceImpl.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.dubbo.examples.validation.impl; - -import com.alibaba.dubbo.examples.validation.api.ValidationParameter; -import com.alibaba.dubbo.examples.validation.api.ValidationService; - -/** - * ValidationServiceImpl - */ -public class ValidationServiceImpl implements ValidationService { - - @Override - public void save(ValidationParameter parameter) { - } - - @Override - public void update(ValidationParameter parameter) { - } - - @Override - public void delete(long id, String operator) { - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-consumer.xml deleted file mode 100644 index 2eab5c37bd..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-consumer.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-provider.xml deleted file mode 100644 index 3041d33358..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation/validation-provider.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionConsumer.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionConsumer.java deleted file mode 100644 index 7c674f24fc..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionConsumer.java +++ /dev/null @@ -1,41 +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.dubbo.examples.version; - -import com.alibaba.dubbo.examples.version.api.VersionService; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * VersionConsumer - */ -public class VersionConsumer { - - public static void main(String[] args) throws Exception { - String config = VersionConsumer.class.getPackage().getName().replace('.', '/') + "/version-consumer.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - VersionService versionService = (VersionService) context.getBean("versionService"); - for (int i = 0; i < 10000; i++) { - String hello = versionService.sayHello("world"); - System.out.println(hello); - Thread.sleep(2000); - } - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider.java deleted file mode 100644 index 982a9bd5fb..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider.java +++ /dev/null @@ -1,33 +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.dubbo.examples.version; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * VersionProvider - */ -public class VersionProvider { - - public static void main(String[] args) throws Exception { - String config = VersionProvider.class.getPackage().getName().replace('.', '/') + "/version-provider.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider2.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider2.java deleted file mode 100644 index e02d4c5906..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/VersionProvider2.java +++ /dev/null @@ -1,33 +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.dubbo.examples.version; - -import org.springframework.context.support.ClassPathXmlApplicationContext; - -/** - * VersionProvider2 - */ -public class VersionProvider2 { - - public static void main(String[] args) throws Exception { - String config = VersionProvider2.class.getPackage().getName().replace('.', '/') + "/version-provider2.xml"; - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(config); - context.start(); - System.in.read(); - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/api/VersionService.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/api/VersionService.java deleted file mode 100644 index a0a9245dac..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/api/VersionService.java +++ /dev/null @@ -1,23 +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.dubbo.examples.version.api; - -public interface VersionService { - - String sayHello(String name); - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl.java deleted file mode 100644 index 00e5a062df..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl.java +++ /dev/null @@ -1,28 +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.dubbo.examples.version.impl; - -import com.alibaba.dubbo.examples.version.api.VersionService; - -public class VersionServiceImpl implements VersionService { - - @Override - public String sayHello(String name) { - return "hello, " + name; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl2.java b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl2.java deleted file mode 100644 index adabc99af8..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/impl/VersionServiceImpl2.java +++ /dev/null @@ -1,28 +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.dubbo.examples.version.impl; - -import com.alibaba.dubbo.examples.version.api.VersionService; - -public class VersionServiceImpl2 implements VersionService { - - @Override - public String sayHello(String name) { - return "hello2, " + name; - } - -} diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-consumer.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-consumer.xml deleted file mode 100644 index b871589c9d..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-consumer.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider.xml deleted file mode 100644 index 7f03db4c6f..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider2.xml b/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider2.xml deleted file mode 100644 index 3e6037e388..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/version/version-provider2.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/dubbo-test/dubbo-test-examples/src/main/resources/log4j.xml b/dubbo-test/dubbo-test-examples/src/main/resources/log4j.xml deleted file mode 100644 index 2dee9c853a..0000000000 --- a/dubbo-test/dubbo-test-examples/src/main/resources/log4j.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - - - - - - - diff --git a/dubbo-test/dubbo-test-examples/src/test/java/com/alibaba/dubbo/examples/validation/ValidationTest.java b/dubbo-test/dubbo-test-examples/src/test/java/com/alibaba/dubbo/examples/validation/ValidationTest.java deleted file mode 100644 index b33110d4ba..0000000000 --- a/dubbo-test/dubbo-test-examples/src/test/java/com/alibaba/dubbo/examples/validation/ValidationTest.java +++ /dev/null @@ -1,128 +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.dubbo.examples.validation; - -import com.alibaba.dubbo.examples.validation.api.ValidationParameter; -import com.alibaba.dubbo.examples.validation.api.ValidationService; - -import org.junit.Assert; -import org.junit.Test; -import org.springframework.context.support.ClassPathXmlApplicationContext; - -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; -import java.util.Date; -import java.util.Set; - -/** - * ValidationTest - * - */ -public class ValidationTest { - - @Test - public void testValidation() { - ClassPathXmlApplicationContext providerContext = new ClassPathXmlApplicationContext(ValidationTest.class.getPackage().getName().replace('.', '/') + "/validation-provider.xml"); - providerContext.start(); - try { - ClassPathXmlApplicationContext consumerContext = new ClassPathXmlApplicationContext(ValidationTest.class.getPackage().getName().replace('.', '/') + "/validation-consumer.xml"); - consumerContext.start(); - try { - ValidationService validationService = (ValidationService) consumerContext.getBean("validationService"); - - // Save OK - ValidationParameter parameter = new ValidationParameter(); - parameter.setName("liangfei"); - parameter.setEmail("liangfei@liang.fei"); - parameter.setAge(50); - parameter.setLoginDate(new Date(System.currentTimeMillis() - 1000000)); - parameter.setExpiryDate(new Date(System.currentTimeMillis() + 1000000)); - validationService.save(parameter); - - try { - parameter = new ValidationParameter(); - parameter.setName("l"); - parameter.setEmail("liangfei@liang.fei"); - parameter.setAge(50); - parameter.setLoginDate(new Date(System.currentTimeMillis() - 1000000)); - parameter.setExpiryDate(new Date(System.currentTimeMillis() + 1000000)); - validationService.save(parameter); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - } - - // Save Error - try { - parameter = new ValidationParameter(); - validationService.save(parameter); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - } - - // Delete OK - validationService.delete(2, "abc"); - - // Delete Error - try { - validationService.delete(2, "a"); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - Assert.assertEquals(1, violations.size()); - } - - // Delete Error - try { - validationService.delete(0, "abc"); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - Assert.assertEquals(1, violations.size()); - } - try { - validationService.delete(2, null); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - Assert.assertEquals(1, violations.size()); - } - try { - validationService.delete(0, null); - Assert.fail(); - } catch (ConstraintViolationException ve) { - Set> violations = ve.getConstraintViolations(); - Assert.assertNotNull(violations); - Assert.assertEquals(2, violations.size()); - } - } finally { - consumerContext.stop(); - consumerContext.close(); - } - } finally { - providerContext.stop(); - providerContext.close(); - } - } - -} diff --git a/dubbo-test/pom.xml b/dubbo-test/pom.xml index 4f93f24266..c1c05846fe 100644 --- a/dubbo-test/pom.xml +++ b/dubbo-test/pom.xml @@ -29,10 +29,8 @@ true - dubbo-test-benchmark dubbo-test-compatibility dubbo-test-integration - dubbo-test-examples