This is an automated email from the ASF dual-hosted git repository.
iluo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 2a91684 Fix license issues (#3382)
2a91684 is described below
commit 2a91684355476e57496e1158ee7e9eaee884969a
Author: Huxing Zhang <[email protected]>
AuthorDate: Thu Jan 31 11:26:49 2019 +0800
Fix license issues (#3382)
* Fix license issues
* revert change to Netty's copyright
---
LICENSE | 9 --
.../dubbo/common/concurrent/ExecutionList.java | 180 ---------------------
.../dubbo/common/concurrent/ExecutionListTest.java | 95 -----------
dubbo-common/src/test/resources/log4j.xml | 27 ++--
dubbo-monitor/dubbo-monitor-api/pom.xml | 27 ++--
dubbo-remoting/dubbo-remoting-netty/pom.xml | 27 ++--
dubbo-remoting/dubbo-remoting-zookeeper/pom.xml | 27 ++--
dubbo-rpc/dubbo-rpc-rest/pom.xml | 27 ++--
dubbo-test/dubbo-test-compatibility/pom.xml | 27 ++--
9 files changed, 84 insertions(+), 362 deletions(-)
diff --git a/LICENSE b/LICENSE
index b856223..a35e3b9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -208,15 +208,6 @@ Apache Dubbo includes a number of submodules with separate
copyright notices
and license terms. Your use of these submodules is subject to the terms and
conditions of the following licenses.
-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.
-
- * com.google.common.util.concurrent.ExecutionList
- * com.google.common.util.concurrent.ListenableFuture
- * com.google.common.util.concurrent.ListenableFutureTask
-
For the package org.apache.dubbo.common.threadlocal and
org.apache.dubbo.common.timer:
This product contains a modified portion of 'Netty', an event-driven
asynchronous network application framework also
diff --git
a/dubbo-common/src/main/java/org/apache/dubbo/common/concurrent/ExecutionList.java
b/dubbo-common/src/main/java/org/apache/dubbo/common/concurrent/ExecutionList.java
deleted file mode 100644
index c88626c..0000000
---
a/dubbo-common/src/main/java/org/apache/dubbo/common/concurrent/ExecutionList.java
+++ /dev/null
@@ -1,180 +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 org.apache.dubbo.common.concurrent;
-
-import org.apache.dubbo.common.logger.Logger;
-import org.apache.dubbo.common.logger.LoggerFactory;
-import org.apache.dubbo.common.utils.NamedThreadFactory;
-
-import java.util.concurrent.Executor;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
-/**
- * <p>A list of listeners, each with an associated {@code Executor}, that
- * guarantees that every {@code Runnable} that is {@linkplain #add added} will
- * be executed after {@link #execute()} is called. Any {@code Runnable} added
- * after the call to {@code execute} is still guaranteed to execute. There is
no
- * guarantee, however, that listeners will be executed in the order that they
- * are added.
- * <p>
- * <p>Exceptions thrown by a listener will be propagated up to the executor.
- * Any exception thrown during {@code Executor.execute} (e.g., a {@code
- * RejectedExecutionException} or an exception thrown by {@linkplain
- * MoreExecutors#sameThreadExecutor inline execution}) will be caught and
- * logged.
- */
-public final class ExecutionList {
- // Logger to log exceptions caught when running runnables.
- static final Logger logger =
LoggerFactory.getLogger(ExecutionList.class.getName());
-
- /**
- * The runnable, executor pairs to execute. This acts as a stack threaded
through the
- * {@link RunnableExecutorPair#next} field.
- */
- private RunnableExecutorPair runnables;
-
- private boolean executed;
-
- private static final Executor DEFAULT_EXECUTOR = new ThreadPoolExecutor(1,
10, 60000L, TimeUnit.MILLISECONDS, new SynchronousQueue<Runnable>(), new
NamedThreadFactory("DubboFutureCallbackDefault", true));
-
- /**
- * Creates a new, empty {@link ExecutionList}.
- */
- public ExecutionList() {
- }
-
- /**
- * Adds the {@code Runnable} and accompanying {@code Executor} to the list
of
- * listeners to execute. If execution has already begun, the listener is
- * executed immediately.
- * <p>
- * <p>Note: For fast, lightweight listeners that would be safe to execute
in
- * any thread, consider {@link MoreExecutors#sameThreadExecutor}. For
heavier
- * listeners, {@code sameThreadExecutor()} carries some caveats: First, the
- * thread that the listener runs in depends on whether the {@code
- * ExecutionList} has been executed at the time it is added. In particular,
- * listeners may run in the thread that calls {@code add}. Second, the
thread
- * that calls {@link #execute} may be an internal implementation thread,
such
- * as an RPC network thread, and {@code sameThreadExecutor()} listeners may
- * run in this thread. Finally, during the execution of a {@code
- * sameThreadExecutor} listener, all other registered but unexecuted
- * listeners are prevented from running, even if those listeners are to run
- * in other executors.
- */
- public void add(Runnable runnable, Executor executor) {
- // Fail fast on a null. We throw NPE here because the contract of
- // Executor states that it throws NPE on null listener, so we propagate
- // that contract up into the add method as well.
- if (runnable == null) {
- throw new NullPointerException("Runnable can not be null!");
- }
- if (executor == null) {
- logger.info("Executor for listenablefuture is null, will use
default executor!");
- executor = DEFAULT_EXECUTOR;
- }
- // Lock while we check state. We must maintain the lock while adding
the
- // new pair so that another thread can't run the list out from under
us.
- // We only add to the list if we have not yet started execution.
- synchronized (this) {
- if (!executed) {
- runnables = new RunnableExecutorPair(runnable, executor,
runnables);
- return;
- }
- }
- // Execute the runnable immediately. Because of scheduling this may
end up
- // getting called before some of the previously added runnables, but
we're
- // OK with that. If we want to change the contract to guarantee
ordering
- // among runnables we'd have to modify the logic here to allow it.
- executeListener(runnable, executor);
- }
-
- /**
- * Runs this execution list, executing all existing pairs in the order they
- * were added. However, note that listeners added after this point may be
- * executed before those previously added, and note that the execution
order
- * of all listeners is ultimately chosen by the implementations of the
- * supplied executors.
- * <p>
- * <p>This method is idempotent. Calling it several times in parallel is
- * semantically equivalent to calling it exactly once.
- *
- * @since 10.0 (present in 1.0 as {@code run})
- */
- public void execute() {
- // Lock while we update our state so the add method above will finish
adding
- // any listeners before we start to run them.
- RunnableExecutorPair list;
- synchronized (this) {
- if (executed) {
- return;
- }
- executed = true;
- list = runnables;
- runnables = null; // allow GC to free listeners even if this
stays around for a while.
- }
- // If we succeeded then list holds all the runnables we to execute.
The pairs in the stack are
- // in the opposite order from how they were added so we need to
reverse the list to fulfill our
- // contract.
- // This is somewhat annoying, but turns out to be very fast in
practice. Alternatively, we
- // could drop the contract on the method that enforces this queue like
behavior since depending
- // on it is likely to be a bug anyway.
-
- // N.B. All writes to the list and the next pointers must have
happened before the above
- // synchronized block, so we can iterate the list without the lock
held here.
- RunnableExecutorPair reversedList = null;
- while (list != null) {
- RunnableExecutorPair tmp = list;
- list = list.next;
- tmp.next = reversedList;
- reversedList = tmp;
- }
- while (reversedList != null) {
- executeListener(reversedList.runnable, reversedList.executor);
- reversedList = reversedList.next;
- }
- }
-
- /**
- * Submits the given runnable to the given {@link Executor} catching and
logging all
- * {@linkplain RuntimeException runtime exceptions} thrown by the executor.
- */
- private static void executeListener(Runnable runnable, Executor executor) {
- try {
- executor.execute(runnable);
- } catch (RuntimeException e) {
- // Log it and keep going, bad runnable and/or executor. Don't
- // punish the other runnables if we're given a bad one. We only
- // catch RuntimeException because we want Errors to propagate up.
- logger.error("RuntimeException while executing runnable "
- + runnable + " with executor " + executor, e);
- }
- }
-
- private static final class RunnableExecutorPair {
- final Runnable runnable;
- final Executor executor;
- RunnableExecutorPair next;
-
- RunnableExecutorPair(Runnable runnable, Executor executor,
RunnableExecutorPair next) {
- this.runnable = runnable;
- this.executor = executor;
- this.next = next;
- }
- }
-}
diff --git
a/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java
b/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java
deleted file mode 100644
index a1675ac..0000000
---
a/dubbo-common/src/test/java/org/apache/dubbo/common/concurrent/ExecutionListTest.java
+++ /dev/null
@@ -1,95 +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 org.apache.dubbo.common.concurrent;
-
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.Executor;
-
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.doThrow;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
-
-public class ExecutionListTest {
- private ExecutionList executionList;
-
- @BeforeEach
- public void setUp() throws Exception {
- this.executionList = new ExecutionList();
- }
-
- @Test
- public void testAddNullRunnable() {
- Assertions.assertThrows(NullPointerException.class, () ->
this.executionList.add(null, mock(Executor.class)));
- }
-
- @Test
- public void testAddRunnableToExecutor() {
- Executor mockedExecutor = mock(Executor.class);
-
- this.executionList.add(mock(Runnable.class), mockedExecutor);
- this.executionList.execute();
-
- verify(mockedExecutor).execute(any(Runnable.class));
- }
-
- @Test
- public void testExecuteRunnableWithDefaultExecutor() throws
InterruptedException {
- final CountDownLatch countDownLatch = new CountDownLatch(1);
- this.executionList.add(countDownLatch::countDown, null);
-
- this.executionList.execute();
- countDownLatch.await();
- }
-
- @Test
- public void testExceptionForExecutor() {
- Executor mockedExecutor = mock(Executor.class);
- doThrow(new
RuntimeException()).when(mockedExecutor).execute(any(Runnable.class));
-
- this.executionList.add(mock(Runnable.class), mockedExecutor);
- this.executionList.execute();
- }
-
- @Test
- public void testNotRunSameRunnableTwice() {
- Executor mockedExecutor = mock(Executor.class);
-
- this.executionList.add(mock(Runnable.class), mockedExecutor);
-
- this.executionList.execute();
- this.executionList.execute();
-
- verify(mockedExecutor).execute(any(Runnable.class));
- }
-
- @Test
- public void testRunImmediatelyAfterExecuted() {
- Executor mockedExecutor = mock(Executor.class);
-
- this.executionList.add(mock(Runnable.class), mockedExecutor);
- this.executionList.execute();
- this.executionList.add(mock(Runnable.class), mockedExecutor);
-
- verify(mockedExecutor, times(2)).execute(any(Runnable.class));
- }
-}
\ No newline at end of file
diff --git a/dubbo-common/src/test/resources/log4j.xml
b/dubbo-common/src/test/resources/log4j.xml
index 260e5c9..bfb523c 100644
--- a/dubbo-common/src/test/resources/log4j.xml
+++ b/dubbo-common/src/test/resources/log4j.xml
@@ -1,18 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
<log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/";>
diff --git a/dubbo-monitor/dubbo-monitor-api/pom.xml
b/dubbo-monitor/dubbo-monitor-api/pom.xml
index 1e966c5..dce8268 100644
--- a/dubbo-monitor/dubbo-monitor-api/pom.xml
+++ b/dubbo-monitor/dubbo-monitor-api/pom.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-remoting/dubbo-remoting-netty/pom.xml
b/dubbo-remoting/dubbo-remoting-netty/pom.xml
index 2cefab0..cfa8262 100644
--- a/dubbo-remoting/dubbo-remoting-netty/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-netty/pom.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
index 66f44dd..97ce12a 100644
--- a/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
+++ b/dubbo-remoting/dubbo-remoting-zookeeper/pom.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-rpc/dubbo-rpc-rest/pom.xml b/dubbo-rpc/dubbo-rpc-rest/pom.xml
index 2b6deba..126b26d 100644
--- a/dubbo-rpc/dubbo-rpc-rest/pom.xml
+++ b/dubbo-rpc/dubbo-rpc-rest/pom.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
diff --git a/dubbo-test/dubbo-test-compatibility/pom.xml
b/dubbo-test/dubbo-test-compatibility/pom.xml
index 49363ed..c6d2e1e 100644
--- a/dubbo-test/dubbo-test-compatibility/pom.xml
+++ b/dubbo-test/dubbo-test-compatibility/pom.xml
@@ -1,17 +1,18 @@
<!--
- - Copyright 1999-2011 Alibaba Group.
- -
- - Licensed under the Apache License, Version 2.0 (the "License");
- - you may not use this file except in compliance with the License.
- - You may obtain a copy of the License at
- -
- - http://www.apache.org/licenses/LICENSE-2.0
- -
- - Unless required by applicable law or agreed to in writing, software
- - distributed under the License is distributed on an "AS IS" BASIS,
- - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- - See the License for the specific language governing permissions and
- - limitations under the License.
+ 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.
-->
<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
<modelVersion>4.0.0</modelVersion>
