Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Dubbo-3764]Merge dubbo rpc xmlrpc (#3764) #3775

Merged
merged 27 commits into from
May 14, 2019

Conversation

danielamorais
Copy link

@danielamorais danielamorais commented Mar 29, 2019

What is the purpose of the change

Merge dubbo-rpc-xmlrpc into incubator-dubbo (#3764)

Brief changelog

XXXXX

Verifying this change

XXXXX

Follow this checklist to help us incorporate your contribution quickly and easily:

  • Make sure there is a GITHUB_issue field for the change (usually before you start working on it). Trivial changes like typos do not require a GITHUB issue. Your pull request should address just this issue, without pulling in other changes - one PR resolves one issue.
  • Format the pull request title like [Dubbo-XXX] Fix UnknownException when host config not exist #XXX. Each commit in the pull request should have a meaningful subject line and body.
  • Write a pull request description that is detailed enough to understand what the pull request does, how, and why.
  • Write necessary unit-test to verify your logic correction, more mock a little better when cross module dependency exist. If the new feature or significant change is committed, please remember to add integration-test in test module.
  • Run mvn clean install -DskipTests=false & mvn clean test-compile failsafe:integration-test to make sure unit-test and integration-test pass.
  • If this contribution is large, please follow the Software Donation Guide.

@danielamorais danielamorais changed the title [Dubbo-3764]Merge dubbo rpc xmlrpc [Dubbo-3764][WIP]Merge dubbo rpc xmlrpc Mar 29, 2019
@danielamorais danielamorais changed the title [Dubbo-3764][WIP]Merge dubbo rpc xmlrpc [Dubbo-3764]Merge dubbo rpc xmlrpc Mar 29, 2019
@ralf0131
Copy link
Contributor

ralf0131 commented Apr 2, 2019

Hi, could you please check the UT failure first?

@danielamorais danielamorais changed the title [Dubbo-3764]Merge dubbo rpc xmlrpc [Dubbo-3764][WIP]Merge dubbo rpc xmlrpc Apr 2, 2019
@codecov-io
Copy link

codecov-io commented Apr 2, 2019

Codecov Report

Merging #3775 into master will decrease coverage by 0.02%.
The diff coverage is 57.14%.

Impacted file tree graph

@@             Coverage Diff             @@
##             master   #3775      +/-   ##
===========================================
- Coverage     63.42%   63.4%   -0.03%     
+ Complexity      564     544      -20     
===========================================
  Files           755     757       +2     
  Lines         32425   32530     +105     
  Branches       5145    5158      +13     
===========================================
+ Hits          20567   20626      +59     
- Misses         9496    9539      +43     
- Partials       2362    2365       +3
Impacted Files Coverage Δ Complexity Δ
.../dubbo/xml/rpc/protocol/xmlrpc/XmlRpcProtocol.java 53.84% <53.84%> (ø) 5 <5> (?)
...ml/rpc/protocol/xmlrpc/XmlRpcProxyFactoryBean.java 66.66% <66.66%> (ø) 5 <5> (?)
.../remoting/transport/netty4/NettyServerHandler.java 61.9% <0%> (-9.53%) 0% <0%> (ø)
...ng/transport/dispatcher/all/AllChannelHandler.java 51.42% <0%> (-5.72%) 0% <0%> (ø)
...mmon/threadpool/support/AbortPolicyWithReport.java 83.33% <0%> (-5.56%) 0% <0%> (ø)
.../org/apache/dubbo/remoting/ExecutionException.java 15.78% <0%> (-5.27%) 0% <0%> (ø)
...exchange/support/header/HeaderExchangeHandler.java 59.84% <0%> (-2.37%) 0% <0%> (ø)
...dubbo/remoting/exchange/support/DefaultFuture.java 73.46% <0%> (-1.37%) 0% <0%> (ø)
.../java/org/apache/dubbo/config/ReferenceConfig.java 59.48% <0%> (-0.37%) 0% <0%> (ø)
... and 5 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 6a1dd65...14d77b7. Read the comment docs.

@danielamorais danielamorais changed the title [Dubbo-3764][WIP]Merge dubbo rpc xmlrpc [Dubbo-3764]Merge dubbo rpc xmlrpc Apr 2, 2019
@danielamorais
Copy link
Author

danielamorais commented Apr 3, 2019

Thank you for your help @lovepoem

Copy link
Contributor

@ralf0131 ralf0131 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please also add this dependency to dubbo-bom/pom.xml

dubbo-rpc/dubbo-rpc-xml/README.md Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/README.md Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/README.md Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/pom.xml Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/pom.xml Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/pom.xml Outdated Show resolved Hide resolved
dubbo-rpc/dubbo-rpc-xml/pom.xml Outdated Show resolved Hide resolved
Copy link
Contributor

@ralf0131 ralf0131 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the LICENSE of your dependencies? Could you please list them?

dubbo-rpc/dubbo-rpc-xml/pom.xml Outdated Show resolved Hide resolved
@danielamorais
Copy link
Author

List of dependencies and the LICENSE:

  • javax.servlet: CDDL + GPLv2 with classpath exception (https://apache.org/legal/resolved.html#category-x says we can't include GPLv2 but "special exceptions to the GNU GPL (e.g. GNU Classpath) unless otherwise permitted elsewhere on this page." so I think there's no problem)
  • javax.portlet: Apache 2.0
  • junit: EPL 1.0
  • org.eclipse.jetty: Apache 2.0 + EPL 1.0
  • org.mortbay.jetty: Apache 2.0 + EPL 1.0

@ralf0131
Copy link
Contributor

ralf0131 commented Apr 6, 2019

List of dependencies and the LICENSE:

  • javax.servlet: CDDL + GPLv2 with classpath exception (https://apache.org/legal/resolved.html#category-x says we can't include GPLv2 but "special exceptions to the GNU GPL (e.g. GNU Classpath) unless otherwise permitted elsewhere on this page." so I think there's no problem)
  • javax.portlet: Apache 2.0
  • junit: EPL 1.0
  • org.eclipse.jetty: Apache 2.0 + EPL 1.0
  • org.mortbay.jetty: Apache 2.0 + EPL 1.0

Yes, I think the license are fine. If a dependency is dual/multi-license, we can choose the most permissive one.

@chickenlj
Copy link
Contributor

Please also add the following dependency to dubbo-bom.xml

<dependency>
            <groupId>org.apache.dubbo</groupId>
            <artifactId>dubbo-rpc-xml</artifactId>
            <version>${project.version}</version>
            <scope>compile</scope>
            <optional>true</optional>
        </dependency>

@ralf0131
Copy link
Contributor

ralf0131 commented May 9, 2019

@danielamorais The pull request is almost ready to be merged, there are still some issues pending to be resolved, would you please take a loot at it?

@danielamorais
Copy link
Author

@ralf0131 I'm sorry about delayed. Is there any issue on Travis CI with oraclejdk 11? The build is failing just in oraclejdk 11

[ERROR] Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.027 s <<< FAILURE! - in org.apache.dubbo.remoting.transport.netty.ClientReconnectTest
[ERROR] testReconnect Time elapsed: 0.026 s <<< FAILURE!
org.opentest4j.AssertionFailedError: expected: but was:
at org.apache.dubbo.remoting.transport.netty.ClientReconnectTest.testReconnect(ClientReconnectTest.java:48)

@CrazyHZM
Copy link
Member

@ralf0131 I'm sorry about delayed. Is there any issue on Travis CI with oraclejdk 11? The build is failing just in oraclejdk 11

[ERROR] Tests run: 1, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 0.027 s <<< FAILURE! - in org.apache.dubbo.remoting.transport.netty.ClientReconnectTest
[ERROR] testReconnect Time elapsed: 0.026 s <<< FAILURE!
org.opentest4j.AssertionFailedError: expected: but was:
at org.apache.dubbo.remoting.transport.netty.ClientReconnectTest.testReconnect(ClientReconnectTest.java:48)

I have already started the ci build for you again.

@danielamorais
Copy link
Author

@CrazyHZM Worked it! Was a bug? Thank u

@danielamorais danielamorais changed the title [Dubbo-3764]Merge dubbo rpc xmlrpc [Dubbo-3764]Merge dubbo rpc xmlrpc (#3764) May 12, 2019
@ralf0131
Copy link
Contributor

@chickenlj What's your opinion?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants