From 5b87d7a2c44deef1aaa26df018bff49f9a810382 Mon Sep 17 00:00:00 2001
From: ascrutae <ascrutae@gmail.com>
Date: Fri, 8 Jul 2016 14:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D=20?=
 =?UTF-8?q?=E5=B0=86logback=E5=8A=A0=E5=85=A5=E5=88=B0module=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 skywalking-collector/skywalking-log/pom.xml               | 1 +
 .../skywalking-sdk-plugin/dubbo-plugin/pom.xml            | 2 +-
 .../skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml   | 2 +-
 .../v4/plugin/HttpClientExecuteInterceptor.java           | 2 +-
 .../httpClient/v4/plugin/WebBuriedPointType.java          | 2 +-
 .../v4/plugin/define/AbstractHttpClientPluginDefine.java  | 2 +-
 .../plugin/define/DefaultRequestDirectorPluginDefine.java | 2 +-
 .../v4/plugin/define/HttpClientPluginDefine.java          | 4 ++--
 .../v4/plugin/define/InternalHttpClientPluginDefine.java  | 2 +-
 .../v4/plugin/define/MinimalHttpClientPluginDefine.java   | 2 +-
 .../src/main/resources/skywalking-plugin.def              | 8 ++++----
 .../httpClient/v4/plugin/TestHttpClientV42.java           | 4 ++--
 .../httpClient/v4/plugin/TestHttpClientV43.java           | 4 ++--
 13 files changed, 19 insertions(+), 18 deletions(-)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java (98%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/WebBuriedPointType.java (92%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java (91%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java (91%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java (74%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java (89%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java (89%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/TestHttpClientV42.java (94%)
 rename skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/{org => com/ai/cloud}/skywalking/httpClient/v4/plugin/TestHttpClientV43.java (93%)

diff --git a/skywalking-collector/skywalking-log/pom.xml b/skywalking-collector/skywalking-log/pom.xml
index 107c7f4b4..c455ba916 100644
--- a/skywalking-collector/skywalking-log/pom.xml
+++ b/skywalking-collector/skywalking-log/pom.xml
@@ -13,6 +13,7 @@
         <module>log4j-1.x-plugin</module>
         <module>log4j-2.x-plugin</module>
         <module>example</module>
+        <module>logback-plugin</module>
     </modules>
     <packaging>pom</packaging>
 
diff --git a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml
index cb37523b6..c4ff7e408 100644
--- a/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml
+++ b/skywalking-collector/skywalking-sdk-plugin/dubbo-plugin/pom.xml
@@ -114,7 +114,7 @@
             <groupId>com.alibaba</groupId>
             <artifactId>dubbo</artifactId>
             <version>2.5.3</version>
-            <scope>compile</scope>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
index bd5cc1755..ecf5a988b 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/pom.xml
@@ -31,7 +31,7 @@
 			<groupId>org.apache.httpcomponents</groupId>
 			<artifactId>httpclient</artifactId>
 			<version>4.3</version>
-			<scope>compile</scope>
+			<scope>provided</scope>
 		</dependency>
 		<!--
 		<dependency>
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java
similarity index 98%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java
index f1b668dbe..0bfb22165 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/HttpClientExecuteInterceptor.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin;
+package com.ai.cloud.skywalking.httpClient.v4.plugin;
 
 import org.apache.http.HttpHost;
 import org.apache.http.HttpRequest;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/WebBuriedPointType.java
similarity index 92%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/WebBuriedPointType.java
index 63b19d975..c8d19ee9e 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/WebBuriedPointType.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/WebBuriedPointType.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin;
+package com.ai.cloud.skywalking.httpClient.v4.plugin;
 
 import com.ai.cloud.skywalking.api.IBuriedPointType;
 import com.ai.cloud.skywalking.protocol.common.CallType;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
similarity index 91%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
index bfc560385..f7022dabb 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/AbstractHttpClientPluginDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin.define;
+package com.ai.cloud.skywalking.httpClient.v4.plugin.define;
 
 import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher;
 import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
similarity index 91%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
index d713d8e21..9a451b363 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/DefaultRequestDirectorPluginDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin.define;
+package com.ai.cloud.skywalking.httpClient.v4.plugin.define;
 
 import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher;
 import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java
similarity index 74%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java
index 1365a01cd..ed396d9e6 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/HttpClientPluginDefine.java
@@ -1,6 +1,6 @@
-package org.skywalking.httpClient.v4.plugin.define;
+package com.ai.cloud.skywalking.httpClient.v4.plugin.define;
 
-import org.skywalking.httpClient.v4.plugin.HttpClientExecuteInterceptor;
+import com.ai.cloud.skywalking.httpClient.v4.plugin.HttpClientExecuteInterceptor;
 
 import com.ai.cloud.skywalking.plugin.interceptor.enhance.ClassInstanceMethodsEnhancePluginDefine;
 import com.ai.cloud.skywalking.plugin.interceptor.enhance.IntanceMethodsAroundInterceptor;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
similarity index 89%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
index ebe4973b6..4e7f145ae 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/InternalHttpClientPluginDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin.define;
+package com.ai.cloud.skywalking.httpClient.v4.plugin.define;
 
 import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher;
 import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
similarity index 89%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
index 17bc9adc3..8dae67f5e 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/org/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/java/com/ai/cloud/skywalking/httpClient/v4/plugin/define/MinimalHttpClientPluginDefine.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin.define;
+package com.ai.cloud.skywalking.httpClient.v4.plugin.define;
 
 import com.ai.cloud.skywalking.plugin.interceptor.MethodMatcher;
 import com.ai.cloud.skywalking.plugin.interceptor.matcher.SimpleMethodMatcher;
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
index 7840ba779..7f692d2b0 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/main/resources/skywalking-plugin.def
@@ -1,4 +1,4 @@
-org.skywalking.httpClient.v4.plugin.define.AbstractHttpClientPluginDefine
-org.skywalking.httpClient.v4.plugin.define.InternalHttpClientPluginDefine
-org.skywalking.httpClient.v4.plugin.define.MinimalHttpClientPluginDefine
-org.skywalking.httpClient.v4.plugin.define.DefaultRequestDirectorPluginDefine
\ No newline at end of file
+AbstractHttpClientPluginDefine
+InternalHttpClientPluginDefine
+MinimalHttpClientPluginDefine
+DefaultRequestDirectorPluginDefine
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java
similarity index 94%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java
index fc800e282..ef43176d9 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV42.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV42.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin;
+package com.ai.cloud.skywalking.httpClient.v4.plugin;
 
 import com.ai.cloud.skywalking.plugin.TracingBootstrap;
 import com.ai.skywalking.testframework.api.RequestSpanAssert;
@@ -20,7 +20,7 @@ import java.sql.SQLException;
 public class TestHttpClientV42 {
     @Test
     public void testsql() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
-        TracingBootstrap.main(new String[] {"org.skywalking.httpClient.v4.plugin.TestHttpClientV42"});
+        TracingBootstrap.main(new String[] {"TestHttpClientV42"});
     }
 
     public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException, ClientProtocolException, IOException {
diff --git a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java
similarity index 93%
rename from skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java
rename to skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java
index 75c4264cf..19a43d6a2 100644
--- a/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/org/skywalking/httpClient/v4/plugin/TestHttpClientV43.java
+++ b/skywalking-collector/skywalking-sdk-plugin/httpClient-4.x-plugin/src/test/java/com/ai/cloud/skywalking/httpClient/v4/plugin/TestHttpClientV43.java
@@ -1,4 +1,4 @@
-package org.skywalking.httpClient.v4.plugin;
+package com.ai.cloud.skywalking.httpClient.v4.plugin;
 
 import com.ai.cloud.skywalking.plugin.TracingBootstrap;
 import com.ai.skywalking.testframework.api.RequestSpanAssert;
@@ -17,7 +17,7 @@ import java.sql.SQLException;
 public class TestHttpClientV43 {
     @Test
     public void testsql() throws IllegalAccessException, IllegalArgumentException, InvocationTargetException, NoSuchMethodException, SecurityException, ClassNotFoundException {
-        TracingBootstrap.main(new String[] {"org.skywalking.httpClient.v4.plugin.TestHttpClientV43"});
+        TracingBootstrap.main(new String[] {"TestHttpClientV43"});
     }
 
     public static void main(String[] args) throws ClassNotFoundException, SQLException, InterruptedException {