From 0a9fef5bb78b9001ed2b2111c58f2fe6b0eca30e Mon Sep 17 00:00:00 2001 From: wusheng Date: Sat, 19 Mar 2016 22:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9PLUGIN=E4=B8=8D=E5=90=88?= =?UTF-8?q?=E7=90=86=E7=9A=84=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84=E3=80=82?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0CI=E6=B5=8B=E8=AF=95=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .travis.yml | 4 ++++ .../pom.xml | 0 .../rest/attachment/DubboxRestHeadSetterAttachment.java | 0 .../src/main/resources/skywalking-plugin.def | 0 .../v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/sky-walking.auth | 0 .../{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/pom.xml | 0 .../java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java | 0 .../org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java | 0 .../skywalking/jedis/v2/plugin/define/JedisPluginDefine.java | 0 .../src/main/resources/skywalking-plugin.def | 0 .../test/java/org/skywalking/jedis/v2/plugin/JedisTest.java | 0 .../src/test/resources/log4j2.xml | 0 .../src/test/resources/sky-walking.auth | 0 15 files changed, 4 insertions(+) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/pom.xml (100%) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java (100%) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/src/main/resources/skywalking-plugin.def (100%) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java (100%) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/src/test/resources/log4j2.xml (100%) rename skywalking-sdk-plugin/{skywalking-httpClient-4.x-plugin-dubbox-rest-attachment => httpClient-4.x-plugin-dubbox-rest-attachment}/src/test/resources/sky-walking.auth (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/pom.xml (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/main/java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/main/java/org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/main/java/org/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/main/resources/skywalking-plugin.def (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/test/java/org/skywalking/jedis/v2/plugin/JedisTest.java (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/test/resources/log4j2.xml (100%) rename skywalking-sdk-plugin/{skywalking-jedis-2.x-plugin => jedis-2.x-plugin}/src/test/resources/sky-walking.auth (100%) diff --git a/.travis.yml b/.travis.yml index 25e973ec5..60ff15b09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,6 +12,10 @@ script: - cd skywalking-api - mvn install -Dmaven.test.skip=true + - cd .. + - cd skywalking-sdk-plugin + - mvn install -Dmaven.test.skip=true + - cd .. - cd skywalking-server - mvn install -Dmaven.test.skip=true diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/pom.xml diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/java/org/skywalking/httpClient/v4/plugin/dubbox/rest/attachment/DubboxRestHeadSetterAttachment.java diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/java/test/skywalking/httpClient/v4x/plugin/dubbox/rest/attachment/TestHttpClientV43.java diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth b/skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/skywalking-httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth rename to skywalking-sdk-plugin/httpClient-4.x-plugin-dubbox-rest-attachment/src/test/resources/sky-walking.auth diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/pom.xml b/skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/pom.xml rename to skywalking-sdk-plugin/jedis-2.x-plugin/pom.xml diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java b/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/JedisInterceptor.java diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java b/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/RedisBuriedPointType.java diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java b/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/main/java/org/skywalking/jedis/v2/plugin/define/JedisPluginDefine.java diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/resources/skywalking-plugin.def b/skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/main/resources/skywalking-plugin.def rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/main/resources/skywalking-plugin.def diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/java/org/skywalking/jedis/v2/plugin/JedisTest.java b/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/jedis/v2/plugin/JedisTest.java similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/java/org/skywalking/jedis/v2/plugin/JedisTest.java rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/test/java/org/skywalking/jedis/v2/plugin/JedisTest.java diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/resources/log4j2.xml b/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/resources/log4j2.xml rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/log4j2.xml diff --git a/skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/resources/sky-walking.auth b/skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth similarity index 100% rename from skywalking-sdk-plugin/skywalking-jedis-2.x-plugin/src/test/resources/sky-walking.auth rename to skywalking-sdk-plugin/jedis-2.x-plugin/src/test/resources/sky-walking.auth