This is an automated email from the ASF dual-hosted git repository.
jerrick pushed a commit to branch 2.6.3-release
in repository https://gitbox.apache.org/repos/asf/incubator-dubbo.git
The following commit(s) were added to refs/heads/2.6.3-release by this push:
new b6b5415 complete LICENSE for test xml, fix checkstyle problem
b6b5415 is described below
commit b6b5415068a4d97e5f2d1ce0845232aae9acefba
Author: zhuyong <yong.z...@alibaba-inc.com>
AuthorDate: Fri Aug 24 15:23:52 2018 +0800
complete LICENSE for test xml, fix checkstyle problem
---
all/pom.xml | 29 ----------------------
.../alibaba/dubbo/rpc/cluster/RouterFactory.java | 5 ++--
.../dubbo/common/concurrent/ListenableFuture.java | 3 +--
.../src/test/resources/applicationContext.xml | 16 ++++++++++++
.../test/resources/webapps/test/WEB-INF/web.xml | 16 ++++++++++++
.../test/resources/webapps/test2/WEB-INF/web.xml | 16 ++++++++++++
.../test/resources/webapps/test3/WEB-INF/web.xml | 16 ++++++++++++
.../java/com/alibaba/dubbo/registry/Registry.java | 3 +--
.../com/alibaba/dubbo/remoting/Transporter.java | 6 ++---
.../com/alibaba/dubbo/rpc/InvokerListener.java | 3 +--
pom.xml | 15 +++--------
11 files changed, 74 insertions(+), 54 deletions(-)
diff --git a/all/pom.xml b/all/pom.xml
index 68e28d8..e39b85c 100644
--- a/all/pom.xml
+++ b/all/pom.xml
@@ -548,35 +548,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven_javadoc_version}</version>
- <executions>
- <execution>
- <id>attach-javadoc</id>
- <goals>
- <goal>jar</goal>
- </goals>
- <configuration>
- <doclint>none</doclint>
- </configuration>
- </execution>
- </executions>
- <configuration>
- <includeDependencySources>true</includeDependencySources>
- <dependencySourceIncludes>
-
<dependencySourceInclude>com.alibaba:dubbo-*</dependencySourceInclude>
-
<dependencySourceExclude>com.alibaba:hessian-*</dependencySourceExclude>
- </dependencySourceIncludes>
- <show>public</show>
- <charset>UTF-8</charset>
- <encoding>UTF-8</encoding>
- <docencoding>UTF-8</docencoding>
- <links>
- <link>http://docs.oracle.com/javase/7/docs/api</link>
- </links>
- </configuration>
- </plugin>
</plugins>
</build>
</project>
\ No newline at end of file
diff --git
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java
index 35e57a7..468cdd6 100644
---
a/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java
+++
b/dubbo-cluster/src/main/java/com/alibaba/dubbo/rpc/cluster/RouterFactory.java
@@ -19,15 +19,14 @@ package com.alibaba.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;
/**
* RouterFactory. (SPI, Singleton, ThreadSafe)
* <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 Cluster#join(Directory)
+ * @see Directory#list(com.alibaba.dubbo.rpc.Invocation)
*/
@SPI
public interface RouterFactory {
diff --git
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/concurrent/ListenableFuture.java
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/concurrent/ListenableFuture.java
index c79454e..91f2f46 100644
---
a/dubbo-common/src/main/java/com/alibaba/dubbo/common/concurrent/ListenableFuture.java
+++
b/dubbo-common/src/main/java/com/alibaba/dubbo/common/concurrent/ListenableFuture.java
@@ -17,7 +17,6 @@
package com.alibaba.dubbo.common.concurrent;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
import java.util.concurrent.FutureTask;
import java.util.concurrent.RejectedExecutionException;
@@ -66,7 +65,7 @@ import java.util.concurrent.RejectedExecutionException;
* <ul>
* <li>If they are returned from an {@code ExecutorService}, convert that
* service to a {@link ListeningExecutorService}, usually by calling {@link
- * MoreExecutors#listeningDecorator(ExecutorService)
+ * MoreExecutors#listeningDecorator(java.util.concurrent.ExecutorService)
* MoreExecutors.listeningDecorator}. (Custom executors may find it more
* convenient to use {@link ListenableFutureTask} directly.)
* <li>If they are manually filled in by a call to {@link FutureTask#set} or a
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/applicationContext.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/applicationContext.xml
index 977a8a4..5c9f657 100644
--- a/dubbo-config/dubbo-config-spring/src/test/resources/applicationContext.xml
+++ b/dubbo-config/dubbo-config-spring/src/test/resources/applicationContext.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
<beans xmlns="http://www.springframework.org/schema/beans";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://www.springframework.org/schema/beans
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test/WEB-INF/web.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test/WEB-INF/web.xml
index 25214e2..e02982a 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test/WEB-INF/web.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
<web-app version="3.1">
<display-name>dubbo-demo</display-name>
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test2/WEB-INF/web.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test2/WEB-INF/web.xml
index 0da8d8a..fcbc83a 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test2/WEB-INF/web.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test2/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
<web-app version="3.1">
<display-name>dubbo-demo</display-name>
diff --git
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test3/WEB-INF/web.xml
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test3/WEB-INF/web.xml
index 81a5a13..b6a8d89 100644
---
a/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test3/WEB-INF/web.xml
+++
b/dubbo-config/dubbo-config-spring/src/test/resources/webapps/test3/WEB-INF/web.xml
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+ -->
<web-app version="3.1" metadata-complete="true">
<display-name>dubbo-demo</display-name>
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/com/alibaba/dubbo/registry/Registry.java
index 94b519d..c899ed5 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/com/alibaba/dubbo/registry/Registry.java
@@ -17,12 +17,11 @@
package com.alibaba.dubbo.registry;
import com.alibaba.dubbo.common.Node;
-import com.alibaba.dubbo.common.URL;
/**
* Registry. (SPI, Prototype, ThreadSafe)
*
- * @see com.alibaba.dubbo.registry.RegistryFactory#getRegistry(URL)
+ * @see
com.alibaba.dubbo.registry.RegistryFactory#getRegistry(com.alibaba.dubbo.common.URL)
* @see com.alibaba.dubbo.registry.support.AbstractRegistry
*/
public interface Registry extends Node, RegistryService {
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/com/alibaba/dubbo/remoting/Transporter.java
index 308355a..a86583a 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/com/alibaba/dubbo/remoting/Transporter.java
@@ -21,8 +21,6 @@ import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.common.extension.Adaptive;
import com.alibaba.dubbo.common.extension.SPI;
-import javax.sound.midi.Receiver;
-
/**
* Transporter. (SPI, Singleton, ThreadSafe)
* <p>
@@ -41,7 +39,7 @@ public interface Transporter {
* @param handler
* @return server
* @throws RemotingException
- * @see com.alibaba.dubbo.remoting.Transporters#bind(URL, Receiver,
ChannelHandler)
+ * @see com.alibaba.dubbo.remoting.Transporters#bind(URL,
ChannelHandler...)
*/
@Adaptive({Constants.SERVER_KEY, Constants.TRANSPORTER_KEY})
Server bind(URL url, ChannelHandler handler) throws RemotingException;
@@ -53,7 +51,7 @@ public interface Transporter {
* @param handler
* @return client
* @throws RemotingException
- * @see com.alibaba.dubbo.remoting.Transporters#connect(URL, Receiver,
ChannelListener)
+ * @see com.alibaba.dubbo.remoting.Transporters#connect(URL,
ChannelHandler...)
*/
@Adaptive({Constants.CLIENT_KEY, Constants.TRANSPORTER_KEY})
Client connect(URL url, ChannelHandler handler) throws RemotingException;
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/com/alibaba/dubbo/rpc/InvokerListener.java
index 022b51d..6e5ea57 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/com/alibaba/dubbo/rpc/InvokerListener.java
@@ -16,7 +16,6 @@
*/
package com.alibaba.dubbo.rpc;
-import com.alibaba.dubbo.common.URL;
import com.alibaba.dubbo.common.extension.SPI;
/**
@@ -30,7 +29,7 @@ public interface InvokerListener {
*
* @param invoker
* @throws RpcException
- * @see com.alibaba.dubbo.rpc.Protocol#refer(Class, URL)
+ * @see com.alibaba.dubbo.rpc.Protocol#refer(Class,
com.alibaba.dubbo.common.URL)
*/
void referred(Invoker<?> invoker) throws RpcException;
diff --git a/pom.xml b/pom.xml
index 0e5766a..60c6ba1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -259,11 +259,11 @@
<configuration>
<configLocation>codestyle/checkstyle.xml</configLocation>
<suppressionsLocation>codestyle/checkstyle-suppressions.xml</suppressionsLocation>
-
<headerLocation>codestyle/checkstyle-header.txt</headerLocation>
<linkXRef>false</linkXRef>
<encoding>UTF-8</encoding>
<consoleOutput>true</consoleOutput>
<failOnViolation>true</failOnViolation>
+ <excludes>**/JSONWriter.java</excludes>
</configuration>
<goals>
<goal>check</goal>
@@ -323,20 +323,11 @@
<!-- Used for packaging NOTICE & LICENSE to each sub-module jar-->
<resources>
<resource>
- <directory>src/main/resources/</directory>
+ <directory>src/main/resources</directory>
<filtering>false</filtering>
</resource>
<resource>
- <directory>../</directory>
- <targetPath>META-INF/</targetPath>
- <filtering>false</filtering>
- <includes>
- <include>NOTICE</include>
- <include>LICENSE</include>
- </includes>
- </resource>
- <resource>
- <directory>../../</directory>
+ <directory>${maven.multiModuleProjectDirectory}</directory>
<targetPath>META-INF/</targetPath>
<filtering>false</filtering>
<includes>
