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

[Enhancement] inline the source code of spring-context-support #3225

Merged
merged 56 commits into from Feb 25, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
562a126
Merge pull request #15 from alibaba/master
mercyblitz Nov 6, 2017
926baab
Merge remote-tracking branch 'upstream/master'
mercyblitz Dec 26, 2017
562ce4f
Merge branch 'master' of https://github.com/mercyblitz/dubbo
mercyblitz Mar 12, 2018
4f34540
Manually merge pull request #1486, to make travis ci and codecov work…
chickenlj Mar 20, 2018
1e5b28f
Polish alibaba/dubbo#1306
mercyblitz Mar 30, 2018
24ebffc
Merge remote-tracking branch 'dubbo_remote/master'
mercyblitz Apr 15, 2018
4239a19
Merge branch 'master' into 2.5.x
mercyblitz Apr 15, 2018
0a570b7
Merge branch 'master' into 2.5.x
mercyblitz Apr 15, 2018
feac608
Merge pull request #21 from mercyblitz/2.5.x
mercyblitz Apr 15, 2018
93591f0
Optimize imports
mercyblitz Apr 15, 2018
d57343e
Optimize imports
mercyblitz Apr 15, 2018
d428f5f
Remove invalid JavaDoc
mercyblitz Apr 23, 2018
5d72ddf
Update DubboConfigBinder.java
mercyblitz Apr 23, 2018
a7d176f
Merge remote-tracking branch 'origin/master'
mercyblitz Apr 23, 2018
4d6b1fa
Merge remote-tracking branch 'upstream/master'
mercyblitz Apr 23, 2018
5bab141
Fix apache/incubator-dubbo#1653
mercyblitz Apr 23, 2018
677be3b
Merge remote-tracking branch 'upstream/master'
mercyblitz May 9, 2018
37293eb
Merge branch 'master' of https://github.com/alibaba/dubbo into 2.6.x
mercyblitz May 10, 2018
31acca8
Fixed apache/incubator-dubbo#1772
mercyblitz May 10, 2018
fd1c5f3
Merge branch 'master' of https://github.com/alibaba/dubbo into 2.6.x
mercyblitz May 15, 2018
43e6952
Merge remote-tracking branch 'upstream/master' into 2.6.x
mercyblitz May 18, 2018
d26978d
Merge remote-tracking branch 'dubbo_remote/2.6.x' into 2.6.x
mercyblitz Aug 10, 2018
185545e
Reactor ReferenceAnnotationBeanPostProcessor
mercyblitz Aug 13, 2018
3f99fe1
Fixed incubator-dubbo-spring-boot-project#243
Aug 13, 2018
b066ccf
Add ServiceBeanNameBuilder
Aug 13, 2018
80b6277
Polish apache/incubator-dubbo/#2235
mercyblitz Aug 13, 2018
cac7021
Polish incubator-dubbo#2251
mercyblitz Aug 14, 2018
a8f4f73
Update spring-context-supprt version to be release
mercyblitz Aug 14, 2018
593ce64
Rename ServiceBeanExportEvent to be ServiceBeanExportedEvent
mercyblitz Aug 14, 2018
c0928d8
Poblish apache/incubator-dubbo#2297
mercyblitz Aug 14, 2018
cba31b9
Polish apache/incubator-dubbo#2301
mercyblitz Aug 15, 2018
9d7fe24
Polish apache/incubator-dubbo#2315
mercyblitz Aug 17, 2018
5fda4bc
Sync upstream/2.6.x
mercyblitz Dec 7, 2018
fa7130b
Polish apache/incubator-dubbo#2897 : DubboConfigConfigurationSelector…
mercyblitz Dec 7, 2018
b41ee81
Polish apache/incubator-dubbo#2897 : implements ImportBeanDefinitionR…
mercyblitz Dec 7, 2018
b328a7d
Polish apache/incubator-dubbo#2897 : rename DubboConfigConfigurationS…
mercyblitz Dec 7, 2018
e7a843f
Polish apache/incubator-dubbo#3192 : inline the source code of spring…
mercyblitz Jan 14, 2019
143b342
Fixed the issues of the test-cases
mercyblitz Jan 15, 2019
989963e
Polish apache/incubator-dubbo#3193 : [Enhancement] Change the default…
mercyblitz Jan 16, 2019
688bef3
Polish apache/incubator-dubbo#3192 : inline the source code of spring…
mercyblitz Jan 16, 2019
85b0b54
Polish apache/incubator-dubbo#3189 Simplify externalized configuratio…
mercyblitz Jan 18, 2019
ed95815
Merge remote-tracking branch 'upstream/2.6.x' into 2.6.6
mercyblitz Jan 25, 2019
1f74e52
Polish apache/incubator-dubbo#3193
mercyblitz Jan 26, 2019
19ee833
Polish apache/incubator-dubbo#2987
mercyblitz Jan 26, 2019
8ff4f37
Polish apache/incubator-dubbo#3355 : Add the "protocol" attribute
mercyblitz Jan 27, 2019
ebeb1dd
Polish apache/incubator-dubbo#3355 : Still exists the issues in servi…
mercyblitz Jan 27, 2019
5026c70
Polish apache/incubator-dubbo#3355 : fix the issues in samples
mercyblitz Jan 29, 2019
4ad9aeb
Polish apache/incubator-dubbo#3355 : fix the issues in samples
mercyblitz Jan 30, 2019
dc0bf44
Polish apache/incubator-dubbo#3296 : Merge and enhancement dubbo-regi…
mercyblitz Jan 30, 2019
debeb88
Polish apache/incubator-dubbo#3251 : @Service supports the hierarchic…
mercyblitz Jan 30, 2019
cb8ad13
Merge remote-tracking branch 'upstream/2.6.x' into 2.6.6
mercyblitz Feb 22, 2019
31ecb9d
Polish apache/incubator-dubbo#3275 : ReferenceBeanInvocationHandler d…
mercyblitz Feb 22, 2019
7afef6a
Polish apache/incubator-dubbo#3429 : Fix the NPE
mercyblitz Feb 22, 2019
3238d88
add license header
nzomkxia Feb 25, 2019
a5e439f
Polish apache/incubator-dubbo#3296 : Supports Docker
mercyblitz Feb 25, 2019
4498d21
Merge remote-tracking branch 'origin/2.6.6' into 2.6.6
mercyblitz Feb 25, 2019
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
12 changes: 4 additions & 8 deletions dependencies-bom/pom.xml
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<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/xsd/maven-4.0.0.xsd">
<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/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
Expand Down Expand Up @@ -101,6 +102,7 @@
<rs_api_version>2.0</rs_api_version>
<resteasy_version>3.0.19.Final</resteasy_version>
<tomcat_embed_version>8.5.31</tomcat_embed_version>

<!-- Log libs -->
<slf4j_version>1.7.25</slf4j_version>
<jcl_version>1.2</jcl_version>
Expand Down Expand Up @@ -302,6 +304,7 @@
<artifactId>tomcat-embed-logging-juli</artifactId>
<version>${tomcat_embed_version}</version>
</dependency>

<!-- Log libs -->
<dependency>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -363,13 +366,6 @@

<!-- Alibaba extensions -->

<!-- Spring Context Support -->
<dependency>
<groupId>com.alibaba.spring</groupId>
<artifactId>spring-context-support</artifactId>
<version>${alibaba_spring_context_support_version}</version>
</dependency>

<!-- YAML -->
<dependency>
<groupId>org.yaml</groupId>
Expand Down
@@ -1,115 +1,123 @@
/*
* 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.annotation;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Reference
*
* @export
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
public @interface Reference {

Class<?> interfaceClass() default void.class;

String interfaceName() default "";

String version() default "";

String group() default "";

String url() default "";

String client() default "";

boolean generic() default false;

boolean injvm() default false;

boolean check() default true;

boolean init() default false;

boolean lazy() default false;

boolean stubevent() default false;

String reconnect() default "";

boolean sticky() default false;

String proxy() default "";

String stub() default "";

String cluster() default "";

int connections() default 0;

int callbacks() default 0;

String onconnect() default "";

String ondisconnect() default "";

String owner() default "";

String layer() default "";

int retries() default 2;

String loadbalance() default "";

boolean async() default false;

int actives() default 0;

boolean sent() default false;

String mock() default "";

String validation() default "";

int timeout() default 0;

String cache() default "";

String[] filter() default {};

String[] listener() default {};

String[] parameters() default {};

String application() default "";

String module() default "";

String consumer() default "";

String monitor() default "";

String[] registry() default {};

}
/*
* 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.annotation;

import java.lang.annotation.Documented;
import java.lang.annotation.ElementType;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;

/**
* Reference
*
* @export
*/
@Documented
@Retention(RetentionPolicy.RUNTIME)
@Target({ElementType.FIELD, ElementType.METHOD, ElementType.ANNOTATION_TYPE})
public @interface Reference {

Class<?> interfaceClass() default void.class;

String interfaceName() default "";

String version() default "";

String group() default "";

String url() default "";

String client() default "";

boolean generic() default false;

boolean injvm() default false;

boolean check() default true;

boolean init() default false;

boolean lazy() default false;

boolean stubevent() default false;

String reconnect() default "";

boolean sticky() default false;

String proxy() default "";

String stub() default "";

String cluster() default "";

int connections() default 0;

int callbacks() default 0;

String onconnect() default "";

String ondisconnect() default "";

String owner() default "";

String layer() default "";

int retries() default 2;

String loadbalance() default "";

boolean async() default false;

int actives() default 0;

boolean sent() default false;

String mock() default "";

String validation() default "";

int timeout() default 0;

String cache() default "";

String[] filter() default {};

String[] listener() default {};

String[] parameters() default {};

String application() default "";

String module() default "";

String consumer() default "";

String monitor() default "";

String[] registry() default {};

/**
* The communication protocol of Dubbo Service
*
* @return the default value is ""
* @since 2.6.6
*/
String protocol() default "";

}