Skip to content

Commit

Permalink
Repackage to org apache (apache#1941)
Browse files Browse the repository at this point in the history 
* remove dubbo-test-examples and dubbo-test-benchmark

* rename package to org.apache.dubbo

* support old SPI file

* remove final for RpcException and URL

* add debug sysout in UT

* add debug info in UT

* ignore 2 cases temporary

* add finally clear for SHUTDOWN_WAIT_KEY property

* clear SHUTDOWN_WAIT_KEY before test
  • Loading branch information
@jerrick-zhu @beiwei30
jerrick-zhu authored and beiwei30 committed Jun 15, 2018
1 parent 928292b commit e92a553
Show file tree
Hide file tree
Showing 1,624 changed files with 6,621 additions and 12,153 deletions.
4 changes: 2 additions & 2 deletions LICENSE
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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:
Expand Down
62 changes: 31 additions & 31 deletions all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -428,117 +428,117 @@
</artifactSet>
<transformers>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.compiler.Compiler
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.compiler.Compiler
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>
META-INF/dubbo/internal/com.alibaba.dubbo.common.extension.ExtensionFactory
META-INF/dubbo/internal/org.apache.dubbo.common.extension.ExtensionFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.serialize.Serialization
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.serialize.Serialization
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.status.StatusChecker
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.status.StatusChecker
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.threadpool.ThreadPool
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.threadpool.ThreadPool
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Dispatcher</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.Dispatcher</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Codec2</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.Codec2</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.Transporter</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.Transporter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.exchange.Exchanger
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.exchange.Exchanger
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.http.HttpBinder
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.http.HttpBinder
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.p2p.Networker
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.p2p.Networker
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.remoting.telnet.TelnetHandler
<resource>META-INF/dubbo/internal/org.apache.dubbo.remoting.telnet.TelnetHandler
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>
META-INF/dubbo/internal/com.alibaba.dubbo.remoting.zookeeper.ZookeeperTransporter
META-INF/dubbo/internal/org.apache.dubbo.remoting.zookeeper.ZookeeperTransporter
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Protocol</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.Protocol</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.Filter</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.Filter</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.InvokerListener</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.InvokerListener</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ExporterListener</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.ExporterListener</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.ProxyFactory</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.ProxyFactory</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Cluster</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Cluster</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.LoadBalance
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.LoadBalance
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.Merger</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.Merger</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.RouterFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.RouterFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>
META-INF/dubbo/internal/com.alibaba.dubbo.rpc.cluster.ConfiguratorFactory
META-INF/dubbo/internal/org.apache.dubbo.rpc.cluster.ConfiguratorFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.container.Container</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.container.Container</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.monitor.MonitorFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.monitor.MonitorFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.registry.RegistryFactory
<resource>META-INF/dubbo/internal/org.apache.dubbo.registry.RegistryFactory
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.validation.Validation</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.validation.Validation</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.cache.CacheFactory</resource>
<resource>META-INF/dubbo/internal/org.apache.dubbo.cache.CacheFactory</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.store.DataStore
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.store.DataStore
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.common.logger.LoggerAdapter
<resource>META-INF/dubbo/internal/org.apache.dubbo.common.logger.LoggerAdapter
</resource>
</transformer>
<transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
<resource>META-INF/dubbo/internal/com.alibaba.dubbo.qos.command.BaseCommand
<resource>META-INF/dubbo/internal/org.apache.dubbo.qos.command.BaseCommand
</resource>
</transformer>
</transformers>
Expand Down
4 changes: 2 additions & 2 deletions dubbo-bootstrap/src/main/java/org/apache/dubbo/bootstrap/DubboBootstrap.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
12 changes: 6 additions & 6 deletions ...om/alibaba/dubbo/rpc/cluster/Cluster.java → ...org/apache/dubbo/rpc/cluster/Cluster.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions ...ibaba/dubbo/rpc/cluster/Configurator.java → ...pache/dubbo/rpc/cluster/Configurator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
8 changes: 4 additions & 4 deletions ...ubbo/rpc/cluster/ConfiguratorFactory.java → ...ubbo/rpc/cluster/ConfiguratorFactory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions .../alibaba/dubbo/rpc/cluster/Directory.java → ...g/apache/dubbo/rpc/cluster/Directory.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -28,7 +28,7 @@
* <p>
* <a href="http://en.wikipedia.org/wiki/Directory_service">Directory Service</a>
*
* @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory)
* @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory)
*/
public interface Directory<T> extends Node {

Expand Down
18 changes: 9 additions & 9 deletions ...libaba/dubbo/rpc/cluster/LoadBalance.java → ...apache/dubbo/rpc/cluster/LoadBalance.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -31,7 +31,7 @@
* <p>
* <a href="http://en.wikipedia.org/wiki/Load_balancing_(computing)">Load-Balancing</a>
*
* @see com.alibaba.dubbo.rpc.cluster.Cluster#join(Directory)
* @see org.apache.dubbo.rpc.cluster.Cluster#join(Directory)
*/
@SPI(RandomLoadBalance.NAME)
public interface LoadBalance {
Expand Down
4 changes: 2 additions & 2 deletions ...com/alibaba/dubbo/rpc/cluster/Merger.java → .../org/apache/dubbo/rpc/cluster/Merger.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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<T> {
Expand Down
14 changes: 7 additions & 7 deletions ...com/alibaba/dubbo/rpc/cluster/Router.java → .../org/apache/dubbo/rpc/cluster/Router.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand All @@ -28,8 +28,8 @@
* <p>
* <a href="http://en.wikipedia.org/wiki/Routing">Routing</a>
*
* @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<Router> {

Expand Down
Loading

0 comments on commit e92a553

Please sign in to comment.