You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@skywalking.apache.org by ke...@apache.org on 2020/12/29 15:46:39 UTC
[skywalking] branch envoy/mal updated (434c476 -> f2cc92a)
This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch envoy/mal
in repository https://gitbox.apache.org/repos/asf/skywalking.git.
from 434c476 Set up the E2E skeleton first
add c010481 Checkstyle plugin checks test codes (#6003)
add f4b739c Fix CVE of UninstrumentedGateways in Dynamic Configuration activation. (#6098)
add f2cc92a Merge branch 'master' into envoy/mal
No new revisions were added by this update.
Summary of changes:
.github/workflows/plugins-jdk14-test.0.yaml | 11 +++-
.github/workflows/plugins-test.0.yaml | 2 +
.github/workflows/plugins-test.1.yaml | 2 +
.github/workflows/plugins-test.2.yaml | 2 +
.github/workflows/plugins-test.3.yaml | 4 ++
CHANGES.md | 1 +
.../trace/UninstrumentedGatewaysConfig.java | 21 ++++--
.../trace/UninstrumentedGatewaysConfigTest.java | 77 ++++++++++++++++++++++
.../agent-analyzer/src/test/resources/gateways.yml | 30 ++-------
oap-server/server-library/library-util/pom.xml | 4 ++
.../library/util/yaml/ClassFilterConstructor.java | 31 +++++----
test/plugin/pom.xml | 65 +++++++++++++++++-
test/plugin/run.sh | 8 +++
.../test/helper/AbstractRunningGenerator.java | 1 -
.../plugin/test/helper/ConfigurationImpl.java | 6 +-
.../helper/DockerContainerRunningGenerator.java | 1 -
.../plugin/test/helper/vo/CaseConfiguration.java | 7 +-
.../plugin/test/helper/vo/DependencyComponent.java | 7 +-
.../plugin/test/helper/vo/DockerService.java | 2 +-
.../runner-helper/src/main/resources/scenario.sh | 18 ++---
.../src/test/resources/docker-compose-test.yml | 4 +-
.../config/expectedData.yaml | 16 ++---
.../apm/testcase/toolkit}/Application.java | 2 +-
.../toolkit/controller/TestController.java | 2 +-
.../testcase/toolkit/controller/TestService.java | 2 +-
.../baidu.brpc/controller/CaseController.java | 3 -
.../baidu.brpc/service/EchoServiceImpl.java | 1 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 ++---
.../provider/interceptor/ProviderInterceptor.java | 10 +--
.../config/customize_enhance.xml | 6 +-
.../customize-scenario/config/expectedData.yaml | 2 +-
.../apm/testcase/customize/Application.java | 2 +-
.../customize/controller/CustomizeController.java | 10 +--
.../apm/testcase/customize/model/Model0.java | 2 +-
.../apm/testcase/customize/model/Model1.java | 2 +-
.../testcase/customize/service/TestService1.java | 5 +-
.../testcase/customize/service/TestService2.java | 2 +-
.../skywalking/apm/testcase/cxf/Application.java | 3 -
.../apm/testcase/cxf/service/UserService.java | 9 +--
.../skywalking/apm/testcase/dbcp/MysqlConfig.java | 22 +++----
.../testcase/dbcp/controller/CaseController.java | 4 +-
.../apm/testcase/dbcp/service/CaseService.java | 6 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../testcase/dubbo/controller/CaseController.java | 2 +-
.../apm/testcase/elasticjob/job/DemoSimpleJob.java | 4 +-
.../elasticsearch/RestHighLevelClientCase.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../config/TransportClientConfig.java | 2 +-
.../elasticsearch/config/ElasticsearchConfig.java | 2 +-
.../elasticsearch/controller/CaseController.java | 2 +-
.../bin/startup.sh | 2 +-
.../config/expectedData.yaml | 22 +++----
.../apm/testcase/exceptionchecker/Application.java | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exceptionchecker/service/TestService.java | 10 +--
.../config/expectedData.yaml | 22 +++----
.../configuration.yml | 2 +-
.../controller/CaseController.java | 4 +-
.../exception/TestAnnotatedException.java | 2 +-
.../exceptionchecker/exception/TestException.java | 2 +-
.../exception/TestHierarchyListedException.java | 2 +-
.../exception/TestListedException.java | 2 +-
.../exception/TestOtherClassLoaderException.java | 4 +-
.../exceptionchecker/service/TestService.java | 10 +--
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/RestController.java | 10 +--
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../testcase/finagle/FinagleRpcApplication.java | 2 -
.../finagle/controller/CaseController.java | 3 +-
.../finagle/service/FinagleRpcDemoServiceImpl.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../projectB/controller/TestController.java | 1 -
.../graphql/configuration/GraphSchema.java | 2 -
.../testcase/grpc/consumr/ConsumerInterceptor.java | 18 ++---
.../testcase/grpc/controller/CaseController.java | 6 +-
.../provider/interceptor/ProviderInterceptor.java | 12 ++--
.../testcase/hbase/controller/HBaseController.java | 26 ++++++--
.../influxdb/controller/CaseController.java | 16 ++---
.../influxdb/executor/InfluxDBExecutor.java | 58 ++++++++--------
.../jdk-threading-scenario/bin/startup.sh | 2 +-
.../config/expectedData.yaml | 4 +-
.../apm/testcase/jdk/threading/Application.java | 2 +-
.../apm/testcase/kafka}/Application.java | 2 +-
.../testcase/kafka/controller/CaseController.java | 2 +-
.../testcase/logger/controller/CaseController.java | 6 +-
.../testcase/logger/controller/CaseController.java | 9 +--
.../testcase/logger/controller/CaseController.java | 8 +--
.../apm/testcase/mariadb/MariadbConfig.java | 18 ++---
.../mariadb/controller/CaseController.java | 2 -
.../mongodb/controller/CaseController.java | 6 +-
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 ++---
.../skywalking/apm/testcase/mssql/MssqlConfig.java | 18 ++---
.../skywalking/apm/testcase/mysql/MysqlConfig.java | 18 ++---
.../testcase/mysql/controller/CaseController.java | 2 -
.../apm/testcase/pulsar/Application.java | 4 +-
.../testcase/pulsar/controller/CaseController.java | 2 +-
.../apm/testcase/quartzscheduler/job/DemoJob.java | 4 +-
.../testcase/quartzscheduler/job/QuartzConfig.java | 10 ++-
.../apm/testcase/redisson/Application.java | 2 +-
.../redisson/controller/CaseController.java | 2 +-
.../apm/testcase/retransform}/Application.java | 2 +-
.../apm/testcase/retransform}/RetransformUtil.java | 12 ++--
.../retransform}/controller/CaseController.java | 7 +-
.../apm/testcase/retransform}/CaseController.java | 7 +-
.../apm/testcase/retransform}/RetransformUtil.java | 12 ++--
.../apm/testcase/retransform}/StartupListener.java | 2 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../repository/jdbc/JDBCOrderRepositoryImpl.java | 6 +-
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 9 +--
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 --
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../apm/testcase/shardingsphere/Application.java | 7 --
...dingDatabasesAndTablesConfigurationPrecise.java | 8 +--
.../service/utility/config/DataSourceUtil.java | 6 +-
.../sofarpc/controller/CaseController.java | 2 +-
.../spring-3.0.x-scenario/config/expectedData.yaml | 6 +-
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-3.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 16 ++---
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.1.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 16 ++---
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../spring-4.3.x-scenario/config/expectedData.yaml | 6 +-
.../skywalking/apm/testcase/entity/User.java | 2 +-
.../implinterface/TestCaseController.java} | 19 ++++--
.../testcase/implinterface/TestCaseInterface.java} | 22 +++----
.../apm/testcase/inherit/ChildController.java} | 13 ++--
.../apm/testcase/inherit/ParentController.java} | 22 +++----
.../apm/testcase/restapi/RestCaseController.java | 12 ++--
.../resttemplate/RestTemplateController.java | 22 +++----
.../apm/testcase/spring3/CaseController.java | 4 +-
.../spring3/component/TestComponentBean.java | 2 +-
.../testcase/spring3/dao/TestRepositoryBean.java | 2 +-
.../testcase/spring3/service/TestServiceBean.java | 6 +-
.../testcase/implinterface/TestCaseController.java | 36 ----------
.../testcase/implinterface/TestCaseInterface.java | 31 ---------
.../apm/testcase/inherit/ChildController.java | 29 --------
.../apm/testcase/inherit/ParentController.java | 33 ----------
.../src/main/webapp/WEB-INF/spring-mvc-servlet.xml | 2 +-
.../testcase/feign/controller/BackController.java | 18 +++--
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 5 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../apm/testcase/spring/kafka/Application.java | 2 +-
.../spring/kafka/controller/CaseController.java | 2 +-
.../scheduled/controller/CaseController.java | 2 +-
.../spring/scheduled/job/SchedulingJob.java | 8 +--
.../spring-tx-scenario/config/expectedData.yaml | 2 +-
.../testcase/spring/transaction/Application.java | 2 +-
.../spring/transaction/config/JdbcConfig.java | 2 +-
.../transaction/config/TransactionConfig.java | 2 +-
.../transaction/controller/CaseController.java | 4 +-
.../testcase/spring/transaction/dao/DemoDao.java | 2 +-
.../spring/transaction/dao/impl/DemoDaoImpl.java | 4 +-
.../spring/transaction/service/DemoService.java | 2 +-
.../transaction/service/impl/DemoServiceImpl.java | 6 +-
.../apm/testcase/thrift/client/Application.java | 4 +-
.../thrift/client/controller/CaseController.java | 2 +-
.../thrift/client/service/AsyncClient.java | 6 +-
.../testcase/thrift/client/service/HttpClient.java | 1 -
.../testcase/thrift/server/service/IServer.java | 1 -
.../apm/testcase/vertxeventbus/Application.java | 1 +
.../vertxeventbus/controller/ClusterReceiver.java | 1 +
.../vertxeventbus/controller/LocalReceiver.java | 1 +
.../controller/VertxEventbusController.java | 5 +-
.../testcase/vertxeventbus/util/CustomMessage.java | 1 +
.../vertxeventbus/util/CustomMessageCodec.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../apm/testcase/vertxweb/Application.java | 1 +
.../vertxweb/controller/VertxWebController.java | 1 +
.../controller/TestAnnotationController.java | 4 +-
.../sc/webflux/projectB/route/TestHandler.java | 2 +-
.../xxl-job-2.x-scenario/config/expectedData.yaml | 4 +-
.../apm/testcase/xxljob/job/XXLJobConfig.java | 2 +-
.../apm/testcase/xxljob/job/BeanJob.java | 2 +-
207 files changed, 771 insertions(+), 731 deletions(-)
create mode 100644 oap-server/analyzer/agent-analyzer/src/test/java/org/apache/skywalking/oap/server/analyzer/provider/trace/UninstrumentedGatewaysConfigTest.java
copy test/plugin/runner-helper/src/test/resources/docker-compose-test.yml => oap-server/analyzer/agent-analyzer/src/test/resources/gateways.yml (55%)
mode change 100644 => 100755
copy test/plugin/scenarios/spring-tx-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java => oap-server/server-library/library-util/src/main/java/org/apache/skywalking/oap/server/library/util/yaml/ClassFilterConstructor.java (52%)
rename test/plugin/scenarios/{kafka-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/kafka => apm-toolkit-trace-scenario/src/main/java/test/apache/skywalking/apm/testcase/toolkit}/Application.java (95%)
rename test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/toolkit/controller/TestController.java (98%)
rename test/plugin/scenarios/apm-toolkit-trace-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/toolkit/controller/TestService.java (97%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/Application.java (95%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/controller/CustomizeController.java (87%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/model/Model0.java (96%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/model/Model1.java (94%)
rename test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/service/TestService1.java (89%)
copy test/plugin/scenarios/customize-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/customize/service/TestService2.java (93%)
rename test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/Application.java (94%)
rename test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java (93%)
rename test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org => exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java (95%)
rename test/plugin/scenarios/exception-checker-spring-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java (95%)
rename test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org => exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java (95%)
rename test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org => exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java (95%)
rename test/plugin/scenarios/{exception-checker-tomcat-scenario/src/main/java/test/org => exception-checker-spring-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java (74%)
rename test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/controller/CaseController.java (93%)
rename test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org => exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestAnnotatedException.java (95%)
rename test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/exception/TestException.java (95%)
rename test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org => exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestHierarchyListedException.java (95%)
rename test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org => exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/exception/TestListedException.java (95%)
rename test/plugin/scenarios/exception-checker-tomcat-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/exceptionchecker/exception/TestOtherClassLoaderException.java (95%)
rename test/plugin/scenarios/{exception-checker-spring-scenario/src/main/java/test/org => exception-checker-tomcat-scenario/src/main/java/test}/apache/skywalking/apm/testcase/exceptionchecker/service/TestService.java (74%)
rename test/plugin/scenarios/jdk-threading-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/jdk/threading/Application.java (97%)
rename test/plugin/scenarios/{apm-toolkit-trace-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/toolkit => kafka-scenario/src/main/java/test/apache/skywalking/apm/testcase/kafka}/Application.java (95%)
rename test/plugin/scenarios/kafka-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/kafka/controller/CaseController.java (99%)
rename test/plugin/scenarios/pulsar-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/pulsar/Application.java (91%)
rename test/plugin/scenarios/pulsar-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/pulsar/controller/CaseController.java (98%)
rename test/plugin/scenarios/redisson-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/redisson/Application.java (94%)
rename test/plugin/scenarios/redisson-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/redisson/controller/CaseController.java (97%)
rename test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class => org/apache/skywalking/apm/testcase/retransform}/Application.java (95%)
rename test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class => org/apache/skywalking/apm/testcase/retransform}/RetransformUtil.java (86%)
rename test/plugin/scenarios/retransform-class-scenario/src/main/java/{test/org/apache/skywalking/apm/testcase/retransform_class => org/apache/skywalking/apm/testcase/retransform}/controller/CaseController.java (92%)
rename test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class => apache/skywalking/apm/testcase/retransform}/CaseController.java (90%)
rename test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class => apache/skywalking/apm/testcase/retransform}/RetransformUtil.java (84%)
rename test/plugin/scenarios/retransform-class-tomcat-scenario/src/main/java/test/{org/apache/skywalking/apm/testcase/retransform_class => apache/skywalking/apm/testcase/retransform}/StartupListener.java (94%)
rename test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/CaseController.java (91%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org => spring-3.0.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java (93%)
copy test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/spring-3.0.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org => spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java (95%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org => spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/restapi/RestCaseController.java (90%)
rename test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/CaseController.java (90%)
rename test/plugin/scenarios/spring-3.1.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java (93%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org => spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/{spring-4.1.x-scenario/src/main/java/test/org => spring-3.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
rename test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/org => spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java (95%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org => spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/restapi/RestCaseController.java (90%)
rename test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/spring-4.1.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/CaseController.java (90%)
rename test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/org => spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java (93%)
rename test/plugin/scenarios/{spring-4.3.x-scenario/src/main/java/test/org => spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org => spring-4.1.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org => spring-4.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/entity/User.java (95%)
copy test/plugin/scenarios/{vertx-eventbus-3.x-scenario/src/main/java/org/apache/skywalking/apm/testcase/vertxeventbus/controller/LocalReceiver.java => spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseController.java} (65%)
copy test/plugin/scenarios/{customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java => spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java} (67%)
rename test/plugin/scenarios/{spring-3.0.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java => spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ChildController.java} (73%)
rename test/plugin/scenarios/{customize-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/customize/service/TestService2.java => spring-4.3.x-scenario/src/main/java/test/apache/skywalking/apm/testcase/inherit/ParentController.java} (69%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/restapi/RestCaseController.java (91%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/resttemplate/RestTemplateController.java (81%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/CaseController.java (90%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/component/TestComponentBean.java (93%)
rename test/plugin/scenarios/{spring-3.1.x-scenario/src/main/java/test/org => spring-4.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring3/dao/TestRepositoryBean.java (94%)
rename test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring3/service/TestServiceBean.java (84%)
delete mode 100644 test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseController.java
delete mode 100644 test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/implinterface/TestCaseInterface.java
delete mode 100644 test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ChildController.java
delete mode 100644 test/plugin/scenarios/spring-4.3.x-scenario/src/main/java/test/org/apache/skywalking/apm/testcase/inherit/ParentController.java
rename test/plugin/scenarios/{spring-kafka-2.2.x-scenario/src/main/java/test/org => spring-kafka-1.3.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring/kafka/Application.java (85%)
rename test/plugin/scenarios/spring-kafka-1.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java (98%)
rename test/plugin/scenarios/{spring-kafka-1.3.x-scenario/src/main/java/test/org => spring-kafka-2.2.x-scenario/src/main/java/test}/apache/skywalking/apm/testcase/spring/kafka/Application.java (85%)
rename test/plugin/scenarios/spring-kafka-2.2.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java (98%)
rename test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/kafka/Application.java (94%)
rename test/plugin/scenarios/spring-kafka-2.3.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/kafka/controller/CaseController.java (98%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/Application.java (94%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/config/JdbcConfig.java (95%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/config/TransactionConfig.java (94%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/controller/CaseController.java (93%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/dao/DemoDao.java (92%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/dao/impl/DemoDaoImpl.java (88%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/service/DemoService.java (91%)
rename test/plugin/scenarios/spring-tx-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/spring/transaction/service/impl/DemoServiceImpl.java (83%)
rename test/plugin/scenarios/xxl-job-2.x-scenario/src/main/java/test/{org => }/apache/skywalking/apm/testcase/xxljob/job/BeanJob.java (96%)