提交1.0b的完整代码，用于版本发布。

apache · May 28, 2016 · 4e01d77 · 4e01d77
1 parent b504fa0
commit 4e01d77
Show file tree

Hide file tree

Showing 49 changed files with 176 additions and 162 deletions.
diff --git a/BUILD_DOC.md b/BUILD_DOC.md
@@ -181,7 +181,7 @@ $cd github/sky-walking/skywalking-analysis
 $mvn package -Dmaven.test.skip=true
 ```
 
-- 上传skywalking-analysis-1.0-RELEASE.jar. Upload the skywalking-analysis-1.0-RELEASE.jar
+- 上传skywalking-analysis-1.0b.jar. Upload the skywalking-analysis-1.0b.jar
 - 上传start-analysis.sh. Upload the start-analysis.sh
 - 修改权限. Change mode start-analysis.sh
 ```

diff --git a/HOW_TO_FIND_TID.md b/HOW_TO_FIND_TID.md
@@ -1,6 +1,7 @@
 ## 通过扩展log4j或log4j2，在应用日志中，显示trace-id
 ### log4j
-- 编译并发布skywalking-log/log4j-1.x-plugin
+- 编译并发布skywalking-log/log4j-1.x-plugin,或通过公网仓库[https://dl.bintray.com/wu-sheng/skywalking](https://dl.bintray.com/wu-sheng/skywalking)下载。
+[ ![Download](https://api.bintray.com/packages/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-1.x-plugin/images/download.svg) ](https://bintray.com/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-1.x-plugin/_latestVersion)
 ```xml
 <dependency>
     <groupId>com.ai.cloud</groupId>
@@ -16,7 +17,8 @@ log4j.appender.A1.layout.ConversionPattern=[%x] %-d{yyyy-MM-dd HH:mm:ss.SSS} %c
 ```
 
 ### log4j2
-- 编译并发布skywalking-log/log4j-2.x-plugin
+- 编译并发布skywalking-log/log4j-2.x-plugin,或通过公网仓库[https://dl.bintray.com/wu-sheng/skywalking](https://dl.bintray.com/wu-sheng/skywalking)下载。
+ [ ![Download](https://api.bintray.com/packages/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-2.x-plugin/images/download.svg) ](https://bintray.com/wu-sheng/skywalking/com.ai.cloud.skywalking-log4j-2.x-plugin/_latestVersion)
 - 引用所需的日志插件
 ```xml
 <dependency>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>com.ai.cloud</groupId>
 	<artifactId>skywalking</artifactId>
-	<version>1.0-RELEASE</version>
+	<version>1.0b</version>
 	<modules>
 		<module>samples/skywalking-auth</module>
 		<module>skywalking-protocol</module>

diff --git a/samples/skywalking-auth/pom.xml b/samples/skywalking-auth/pom.xml
@@ -4,7 +4,7 @@
 
   <groupId>com.ai.cloud</groupId>
   <artifactId>skywalking-auth</artifactId>
-  <version>1.0-RELEASE</version>
+  <version>1.0b</version>
   <packaging>jar</packaging>
 
   <name>skywalking-auth</name>

diff --git a/samples/skywalking-example/account-application/account-impl/pom.xml b/samples/skywalking-example/account-application/account-impl/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-account-impl</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-account-impl</name>
     <url>http://maven.apache.org</url>
@@ -119,7 +119,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-account-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>
@@ -137,12 +137,12 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-spring-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-dubbo-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
 
         <dependency>
@@ -153,14 +153,14 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-jdbc-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
 
         <!-- -->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-httpClient-4.2.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -170,12 +170,12 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-1.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-2.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
     </dependencies>
 

diff --git a/samples/skywalking-example/account-application/account-interfaces/pom.xml b/samples/skywalking-example/account-application/account-interfaces/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-account-interfaces</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-account-interfaces</name>
     <url>http://maven.apache.org</url>

diff --git a/samples/skywalking-example/account-application/pom.xml b/samples/skywalking-example/account-application/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-account</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-account</name>
     <url>http://maven.apache.org</url>

diff --git a/samples/skywalking-example/mail-application/pom.xml b/samples/skywalking-example/mail-application/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-mail</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-mail</name>
     <url>http://maven.apache.org</url>
@@ -44,7 +44,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-web-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.springframework</groupId>
@@ -59,7 +59,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-spring-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
@@ -74,7 +74,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-1.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
     </dependencies>
 

diff --git a/samples/skywalking-example/order-application/order-impl/pom.xml b/samples/skywalking-example/order-application/order-impl/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-order-impl</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-order-impl</name>
     <url>http://maven.apache.org</url>
@@ -91,13 +91,13 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-order-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <!-- resource dubbo interfaces -->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-resource-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <!--  mybatis -->
         <dependency>
@@ -124,12 +124,12 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-spring-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-dubbo-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>mysql</groupId>
@@ -139,12 +139,12 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-account-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-jdbc-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -154,7 +154,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-1.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
     </dependencies>
 

diff --git a/samples/skywalking-example/order-application/order-interfaces/pom.xml b/samples/skywalking-example/order-application/order-interfaces/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-order-interfaces</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-order-interfaces</name>
     <url>http://maven.apache.org</url>

diff --git a/samples/skywalking-example/order-application/pom.xml b/samples/skywalking-example/order-application/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-order</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-order</name>
     <url>http://maven.apache.org</url>

diff --git a/samples/skywalking-example/pom.xml b/samples/skywalking-example/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <modules>
         <module>account-application</module>

diff --git a/samples/skywalking-example/resources-application/pom.xml b/samples/skywalking-example/resources-application/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-resources</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <modules>
         <module>resource-impl</module>

diff --git a/samples/skywalking-example/resources-application/resource-impl/pom.xml b/samples/skywalking-example/resources-application/resource-impl/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-resource-impl</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-resource-impl</name>
     <url>http://maven.apache.org</url>
@@ -83,24 +83,24 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-resource-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
 
         <!-- -->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-spring-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-dubbo-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-jdbc-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -110,12 +110,12 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-1.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-2.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
     </dependencies>
 

diff --git a/samples/skywalking-example/resources-application/resource-interfaces/pom.xml b/samples/skywalking-example/resources-application/resource-interfaces/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-resource-interfaces</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-resource-interfaces</name>
     <url>http://maven.apache.org</url>

diff --git a/samples/skywalking-example/web-application/pom.xml b/samples/skywalking-example/web-application/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.ai.cloud</groupId>
     <artifactId>skywalking-example-web</artifactId>
-    <version>1.0-RELEASE</version>
+    <version>1.0b</version>
 
     <name>skywalking-example-web</name>
     <url>http://maven.apache.org</url>
@@ -76,25 +76,25 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-web-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <!-- SkyWalking dubbo filter -->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-dubbo-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <!-- SkyWalking spring plugin-->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-spring-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <!--Save order Dubbo server -->
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-example-order-interfaces</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -104,7 +104,7 @@
         <dependency>
             <groupId>com.ai.cloud</groupId>
             <artifactId>skywalking-log4j-1.x-plugin</artifactId>
-            <version>1.0-RELEASE</version>
+            <version>1.0b</version>
         </dependency>
     </dependencies>
 

diff --git a/skywalking-alarm/pom.xml b/skywalking-alarm/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.ai.cloud</groupId>
 	<artifactId>skywalking-alarm</artifactId>
-	<version>1.0-RELEASE</version>
+	<version>1.0b</version>
 	<packaging>jar</packaging>
 
 	<name>skywalking-alarm</name>

diff --git a/skywalking-analysis/bin/start-analysis.sh b/skywalking-analysis/bin/start-analysis.sh
@@ -97,7 +97,7 @@ END_TIME=`date --date='10 minute ago' "+%Y-%m-%d/%H:%M:%S"`
 ## execute command
 echo "Begin to analysis the buried point data between ${START_TIME} to ${END_TIME}."
 export HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath`
-nohup ${HADOOP_HOME}/bin/hadoop jar skywalking-analysis-1.0-RELEASE.jar -Dskywalking.analysis.mode=${SW_ANALYSIS_MODE} ${START_TIME} ${END_TIME} > ${SW_RT_LOG_DIR}/map-reduce.log 2>&1 &
+nohup ${HADOOP_HOME}/bin/hadoop jar skywalking-analysis-1.0b.jar -Dskywalking.analysis.mode=${SW_ANALYSIS_MODE} ${START_TIME} ${END_TIME} > ${SW_RT_LOG_DIR}/map-reduce.log 2>&1 &
 
 CURRENT_PID=`echo $!`