From 91f1cd59fd01ac41415406183cb813bf6c6af6d2 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Mon, 28 Dec 2015 22:05:27 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=B7=BB=E5=8A=A0=E6=B5=8B=E8=AF=95=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../plugin/spring/{ => test}/TestBean.java    |  6 ++-
 .../src/test/resources/jdbc.properties        |  8 ++++
 .../test/resources/springConfig-common.xml    | 42 +++++++++++++++++--
 3 files changed, 51 insertions(+), 5 deletions(-)
 rename skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/{ => test}/TestBean.java (79%)
 create mode 100644 skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties

diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/TestBean.java b/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java
similarity index 79%
rename from skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/TestBean.java
rename to skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java
index 96511be85..a54b0a499 100644
--- a/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/TestBean.java
+++ b/skywalking-sdk-plugin/spring-plugin/src/test/java/com/ai/cloud/skywalking/plugin/spring/test/TestBean.java
@@ -1,7 +1,11 @@
-package com.ai.cloud.skywalking.plugin.spring;
+package com.ai.cloud.skywalking.plugin.spring.test;
 
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+@Service
+@Transactional
 public class TestBean {
     private String value;
 
diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties b/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties
new file mode 100644
index 000000000..fcbb2a288
--- /dev/null
+++ b/skywalking-sdk-plugin/spring-plugin/src/test/resources/jdbc.properties
@@ -0,0 +1,8 @@
+jdbc.driverClassName=com.mysql.jdbc.Driver
+jdbc.url=jdbc:mysql://10.1.241.20:31306/sw_db
+jdbc.username=sw_dbusr01
+jdbc.password=sw_dbusr01
+jdbc.maxTotal=200
+jdbc.maxIdle=50
+jdbc.maxWaitMillis=1000
+jdbc.defaultAutoCommit=false
\ No newline at end of file
diff --git a/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml b/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml
index 56d9a7cfa..5eeb4bf5d 100644
--- a/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml
+++ b/skywalking-sdk-plugin/spring-plugin/src/test/resources/springConfig-common.xml
@@ -3,14 +3,48 @@
         xmlns="http://www.springframework.org/schema/beans"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns:skywalking="http://cloud.asiainfo.com/schema/skywalking"
+        xmlns:tx="http://www.springframework.org/schema/tx"
+        xmlns:context="http://www.springframework.org/schema/context"
         xsi:schemaLocation="http://www.springframework.org/schema/beans
                     http://www.springframework.org/schema/beans/spring-beans-2.5.xsd 
                     http://cloud.asiainfo.com/schema/skywalking
-				http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd">
+				http://cloud.asiainfo.com/schema/skywalking/skywalking.xsd
+				http://www.springframework.org/schema/context
+				http://www.springframework.org/schema/context/spring-context-3.0.xsd
+				http://www.springframework.org/schema/tx
+     	   		http://www.springframework.org/schema/tx/spring-tx-3.0.xsd	">
 
-    <skywalking:trace className="TestBean" method="testPrintln*" packageName="*"/>
-    <bean class="com.ai.cloud.skywalking.plugin.spring.TestBean">
-        <property name="value" value="Hello World"/>
+
+    <context:component-scan base-package="com.ai.cloud.skywalking.plugin.spring.test"/>
+    <bean id="jdbcConfig"
+          class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer">
+        <property name="order" value="1" />
+        <property name="ignoreUnresolvablePlaceholders" value="true" />
+        <property name="systemPropertiesModeName" value="SYSTEM_PROPERTIES_MODE_OVERRIDE" />
+        <property name="locations" value="classpath:jdbc.properties" />
     </bean>
 
+    <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
+        <property name="url" value="${jdbc.url}"/>
+        <property name="username" value="${jdbc.username}"/>
+        <property name="password" value="${jdbc.password}"/>
+    </bean>
+
+    <bean id="transactionManager"
+          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+    <!-- 注解事务类 -->
+    <tx:annotation-driven transaction-manager="transactionManager" proxy-target-class="true"/>
+
+    <!--AOP 事务配置-->
+    <tx:advice id="txAdvice" transaction-manager="transactionManager">
+        <tx:attributes>
+            <tx:method name="*" propagation="REQUIRED"/>
+        </tx:attributes>
+    </tx:advice>
+
+    <skywalking:trace className="TestBean*" method="*" packageName="*"/>
+
 </beans>
\ No newline at end of file