From e2cc8e4eee273191689b2aed955397a5dd87e7d4 Mon Sep 17 00:00:00 2001
From: zhangxin10 <curtain.xin@gmail.com>
Date: Wed, 23 Dec 2015 17:29:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=202.=20=E7=A7=BB?=
 =?UTF-8?q?=E9=99=A4=E6=97=A0=E7=94=A8=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/spring/application-jdbc.xml     | 45 +++++++++----------
 .../src/main/resources/test.properties        | 20 ---------
 2 files changed, 20 insertions(+), 45 deletions(-)
 delete mode 100644 skywalking-webui/src/main/resources/test.properties

diff --git a/skywalking-webui/src/main/resources/spring/application-jdbc.xml b/skywalking-webui/src/main/resources/spring/application-jdbc.xml
index 265dbc87c..175b4f427 100644
--- a/skywalking-webui/src/main/resources/spring/application-jdbc.xml
+++ b/skywalking-webui/src/main/resources/spring/application-jdbc.xml
@@ -1,22 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beans xmlns="http://www.springframework.org/schema/beans"
-	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	   xmlns:context="http://www.springframework.org/schema/context"	   
-	   xmlns:tx="http://www.springframework.org/schema/tx"
-       xmlns:lang="http://www.springframework.org/schema/lang"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xmlns:tx="http://www.springframework.org/schema/tx"
        xmlns:aop="http://www.springframework.org/schema/aop"
-	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+       xsi:schemaLocation="http://www.springframework.org/schema/beans
 				http://www.springframework.org/schema/beans/spring-beans-3.0.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
 				http://www.springframework.org/schema/tx
      	   		http://www.springframework.org/schema/tx/spring-tx-3.0.xsd
      	   		http://www.springframework.org/schema/aop   
-              	http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
-     	   		http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
-  
+              	http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
+
     <!--  配置数据源 -->
     <bean id="dataSource" class="org.apache.commons.dbcp2.BasicDataSource">
         <property name="driverClassName" value="${jdbc.driverClassName}"/>
@@ -28,27 +23,27 @@
         <property name="maxWaitMillis" value="${jdbc.maxWaitMillis}"/>
         <property name="defaultAutoCommit" value="${jdbc.defaultAutoCommit}"/>
     </bean>
-    
-    <bean id="jdbcTemplate"  
-        class="org.springframework.jdbc.core.JdbcTemplate">  
-        <property name="dataSource" ref="dataSource" />  
-    </bean>
-	
-	 <bean id="transactionManager"  
-       class="org.springframework.jdbc.datasource.DataSourceTransactionManager">  
-        <property name="dataSource" ref="dataSource" />  
-    </bean>  
 
-	 <!--AOP 事务配置-->
+    <bean id="jdbcTemplate"
+          class="org.springframework.jdbc.core.JdbcTemplate">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <bean id="transactionManager"
+          class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
+        <property name="dataSource" ref="dataSource"/>
+    </bean>
+
+    <!--AOP 事务配置-->
     <tx:advice id="txAdvice" transaction-manager="transactionManager">
         <tx:attributes>
             <tx:method name="*" propagation="REQUIRED"/>
         </tx:attributes>
     </tx:advice>
-    
+
     <aop:config>
-    	<aop:pointcut id="servicePointcut" expression="execution(* com.ai.cloud.service.inter.*.*(..))" />
-    	<aop:advisor pointcut-ref="servicePointcut" advice-ref="txAdvice"/>
+        <aop:pointcut id="servicePointcut" expression="execution(* com.ai.cloud.service.inter.*.*(..))"/>
+        <aop:advisor pointcut-ref="servicePointcut" advice-ref="txAdvice"/>
     </aop:config>
-    
+
 </beans>
\ No newline at end of file
diff --git a/skywalking-webui/src/main/resources/test.properties b/skywalking-webui/src/main/resources/test.properties
deleted file mode 100644
index 270cd9b08..000000000
--- a/skywalking-webui/src/main/resources/test.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-#test
-#Wed Dec 23 15:24:10 CST 2015
-buriedpoint.businesskey_max_length=300
-sender.retry_get_sender_wait_interval=2000
-buffer.pool_size=5
-senderchecker.check_polling_time=200
-sender.is_off=false
-sender.max_send_length=20000
-consumer.max_consumer=2
-consumer.max_wait_time=5
-sender.max_copy_num=2
-skywalking.application_code=test
-consumer.consumer_fail_retry_wait_interval=50
-skywalking.user_id=1
-buriedpoint.printf=false
-buriedpoint.exclusive_exceptions=
-buriedpoint.max_exception_stack_length=4000
-sender.connect_percent=100
-buffer.buffer_max_size=18000
-sender.servers_addr=127.0.0.1\:34000;