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

Better License to comply with AL2 #1866

Merged
merged 22 commits into from May 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0807761
SerializerFactory 获取Serializer时,锁住整个hashmap,导致整个过程被block
carryxyh Jan 10, 2018
65438b4
单元测试。保证一个class只有一个serializer和deserializer。单线程和多线程测试
carryxyh Jan 10, 2018
7291963
增加线程数 50 模拟多个线程来获取serializer和deserializer
carryxyh Jan 10, 2018
ed2ff0f
当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
carryxyh Jan 11, 2018
f97db80
当cores线程数全都使用的情况下,默认线程池会把任务放入到队列中。队列满则再创建线程(总数不会超过Max线程数)
carryxyh Jan 11, 2018
a224bb0
Merge remote-tracking branch 'upstream/master'
carryxyh Jan 12, 2018
49aecfb
补全单元测试,测试扩展是否生效
carryxyh Jan 17, 2018
561397f
Merge remote-tracking branch 'upstream/master'
carryxyh Feb 7, 2018
60c2993
错误命名
carryxyh Feb 7, 2018
af29757
Merge remote-tracking branch 'upstream/master'
carryxyh Feb 26, 2018
4be8d61
增加@Override注解
carryxyh Feb 27, 2018
5cfe610
修复单元测试
carryxyh Feb 27, 2018
7830079
Merge remote-tracking branch 'upstream/master'
carryxyh Apr 8, 2018
a1a42c0
Merge remote-tracking branch 'upstream/master'
carryxyh Apr 25, 2018
be1418f
remove enhanced
carryxyh Apr 25, 2018
9653553
remove enhanced
carryxyh Apr 25, 2018
e28aa17
Merge remote-tracking branch 'upstream/master'
carryxyh May 5, 2018
3896eaf
Merge remote-tracking branch 'upstream/master'
carryxyh May 21, 2018
570fbc1
Merge remote-tracking branch 'upstream/master'
carryxyh May 25, 2018
6c68c7a
Merge remote-tracking branch 'upstream/master'
carryxyh May 31, 2018
6c7b65a
sth to supplement apache 2.0 license
carryxyh May 31, 2018
e70a40d
sth to supplement apache 2.0 license
carryxyh May 31, 2018
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 10 additions & 1 deletion LICENSE
Expand Up @@ -263,4 +263,13 @@ This product bundles and repackages the following code in Google Guava 16.0.1, w

* com.google.common.util.concurrent.ExecutionList
* com.google.common.util.concurrent.ListenableFuture
* com.google.common.util.concurrent.ListenableFutureTask
* com.google.common.util.concurrent.ListenableFutureTask

For the package com.alibaba.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:

* io.netty.util.concurrent.FastThreadLocal
* io.netty.util.internal.InternalThreadLocalMap

@@ -1,18 +1,17 @@
/*
* 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
* Copyright 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* The Netty Project 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.
* 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.threadlocal;
Expand Down
@@ -1,18 +1,17 @@
/*
* 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
* Copyright 2014 The Netty Project
*
* http://www.apache.org/licenses/LICENSE-2.0
* The Netty Project 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.
* 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.threadlocal;
Expand Down
3 changes: 3 additions & 0 deletions pom.xml
Expand Up @@ -494,6 +494,9 @@
<exclude>**/resources/META-INF/**</exclude>
<!-- exclude the hessian-lite files -->
<exclude>**/com/caucho/hessian/**</exclude>
<!-- exclude the internal threadlocal files -->
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocal.java</exclude>
<exclude>**/com/alibaba/common/threadlocal/InternalThreadLocalMap.java</exclude>
</excludes>
</configuration>
</execution>
Expand Down