diff --git a/NOTICE b/NOTICE index 6c60cd013e..cbff3d58be 100644 --- a/NOTICE +++ b/NOTICE @@ -1,11 +1,12 @@ -Copyright 1999-2012 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 - +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. @@ -46,9 +47,9 @@ Mina: Grizzly: * LICENSE: - * http://www.gnu.org/licenses/gpl-2.0.html (General Public License 2.0) + * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1) * HOMEPAGE: - * http://grizzly.java.net + * https://javaee.github.io/grizzly/ HttpClient: @@ -76,7 +77,7 @@ FastJson: * LICENSE: * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) * HOMEPAGE: - * http://code.alibabatech.com/wiki/fastjson + * https://github.com/alibaba/fastjson Zookeeper: @@ -88,9 +89,9 @@ Zookeeper: Jedis: * LICENSE: - * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * https://opensource.org/licenses/MIT (MIT) * HOMEPAGE: - * http://code.google.com/p/jedis + * https://github.com/xetorthio/jedis XMemcached: @@ -141,6 +142,13 @@ JFreeChart: * HOMEPAGE: * http://www.jfree.org +validation-api: + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * http://beanvalidation.org + HibernateValidator: * LICENSE: @@ -167,4 +175,95 @@ Log4j: * LICENSE: * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) * HOMEPAGE: - * http://log4j.apache.org \ No newline at end of file + * http://log4j.apache.org + +Tomcat: + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * http://tomcat.apache.org + +cache-api: + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * https://github.com/jsr107/jsr107spec + +easymock + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * http://easymock.org + +cglib-nodep + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * https://sourceforge.net/projects/cglib/ + +resteasy + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * http://resteasy.jboss.org/ + +fst + + * LICENSE: + * http://www.apache.org/licenses/LICENSE-2.0 (Apache License 2.0) + * HOMEPAGE: + * http://ruedigermoeller.github.io/fast-serialization + +jmockit + + * LICENSE: + * https://opensource.org/licenses/MIT (MIT) + * HOMEPAGE: + * http://www.jmockit.org + +jedis + + * LICENSE: + * https://opensource.org/licenses/MIT (MIT) + * HOMEPAGE: + * http://www.jmockit.org + +javax.servlet-api: + + * LICENSE: + * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1) + * HOMEPAGE: + * http://servlet-spec.java.net + +javax.el: + + * LICENSE: + * https://opensource.org/licenses/cddl-1.0 (CDDL 1.1) + * HOMEPAGE: + * https://javaee.github.io/uel-ri/ + +logback-classic: + + * LICENSE: + * http://www.eclipse.org/legal/epl-v10.html (EPL 1.0) + * HOMEPAGE: + * https://logback.qos.ch/ + +junit: + + * LICENSE: + * http://www.eclipse.org/legal/epl-v10.html (EPL 1.0) + * HOMEPAGE: + * http://www.junit.org + +kryo: + + * LICENSE: + * https://opensource.org/licenses/BSD-3-Clause (BSD 3-clause) + * HOMEPAGE: + * https://github.com/EsotericSoftware/kryo \ No newline at end of file diff --git a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java index 8a7123693f..fb249a1601 100644 --- a/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java +++ b/dubbo-config/dubbo-config-spring/src/main/java/com/alibaba/dubbo/config/spring/schema/AnnotationBeanDefinitionParser.java @@ -1,3 +1,19 @@ +/* + * 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 com.alibaba.dubbo.config.spring.schema; import com.alibaba.dubbo.config.spring.AnnotationBean; @@ -19,7 +35,6 @@ import static org.springframework.util.StringUtils.trimArrayElements; /** * {@link AnnotationBean} {@link BeanDefinitionParser} * - * @author Mercy * @see ServiceAnnotationBeanPostProcessor * @see ReferenceAnnotationBeanPostProcessor * @since 2.5.9 diff --git a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java index d47c16f307..fd70e821c0 100644 --- a/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java +++ b/dubbo-config/dubbo-config-spring/src/test/java/com/alibaba/dubbo/config/spring/context/annotation/provider/DefaultHelloService.java @@ -1,3 +1,19 @@ +/* + * 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 com.alibaba.dubbo.config.spring.context.annotation.provider; import com.alibaba.dubbo.config.spring.api.HelloService; @@ -7,7 +23,6 @@ import org.springframework.stereotype.Service; * Default {@link HelloService} annotation with Spring's {@link Service} * and Dubbo's {@link com.alibaba.dubbo.config.annotation.Service} * - * @author Mercy * @since TODO */ @Service diff --git a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml index ac54f188f0..47dd9659da 100644 --- a/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml +++ b/dubbo-config/dubbo-config-spring/src/test/resources/META-INF/spring/dubbo-annotation-consumer.xml @@ -1,18 +1,19 @@ + + + * eg: Map serialize & deserialize * - * @author jason.shang@hotmail.com */ @Override public Object readMap(AbstractHessianInput in, Class expectKeyType, Class expectValueType) throws IOException { diff --git a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/BaseUser.java b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/BaseUser.java index bedc4b34b5..f0b36ce379 100644 --- a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/BaseUser.java +++ b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/BaseUser.java @@ -1,9 +1,24 @@ +/* + * 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 com.alibaba.com.caucho.hessian.io.beans; import java.io.Serializable; /** - * @author WangXin */ public class BaseUser implements Serializable { private static final long serialVersionUID = 9104092580669691633L; diff --git a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/GrandsonUser.java b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/GrandsonUser.java index 9410d99ca3..c9bb635dc5 100644 --- a/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/GrandsonUser.java +++ b/hessian-lite/src/test/java/com/alibaba/com/caucho/hessian/io/beans/GrandsonUser.java @@ -1,9 +1,24 @@ +/* + * 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 com.alibaba.com.caucho.hessian.io.beans; import java.io.Serializable; /** - * @author WangXin */ public class GrandsonUser extends SubUser implements Serializable { private static final long serialVersionUID = 5013145666993778451L;