From 2cfc6e7295dc8cfb0abed368538d9ab0db0d1db5 Mon Sep 17 00:00:00 2001
From: wenshao <szujobs@hotmail.com>
Date: Fri, 13 May 2011 11:41:26 +0000
Subject: [PATCH] =?UTF-8?q?JNDI=E6=94=AF=E6=8C=81Filter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://code.alibabatech.com/svn/druid/trunk@55 b9813039-fb51-4c41-a8b9-e21c2acb5095
---
 .../com/alibaba/druid/pool/DruidDataSourceFactory.java   | 9 ++++++++-
 .../resources/com/alibaba/druid/pool/spring-config-1.xml | 5 ++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
index 5c795275ec..0714f0fb6b 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSourceFactory.java
@@ -69,6 +69,7 @@ public class DruidDataSourceFactory implements ObjectFactory {
     private final static String   PROP_POOLPREPAREDSTATEMENTS              = "poolPreparedStatements";
     private final static String   PROP_MAXOPENPREPAREDSTATEMENTS           = "maxOpenPreparedStatements";
     private final static String   PROP_CONNECTIONPROPERTIES                = "connectionProperties";
+    private final static String   PROP_FILTERS                             = "filters";
 
     private final static String[] ALL_PROPERTIES                           = { PROP_DEFAULTAUTOCOMMIT,
             PROP_DEFAULTREADONLY, PROP_DEFAULTTRANSACTIONISOLATION, PROP_DEFAULTCATALOG, PROP_DRIVERCLASSNAME,
@@ -77,7 +78,8 @@ public class DruidDataSourceFactory implements ObjectFactory {
             PROP_MINEVICTABLEIDLETIMEMILLIS, PROP_TESTWHILEIDLE, PROP_PASSWORD, PROP_URL, PROP_USERNAME,
             PROP_VALIDATIONQUERY, PROP_VALIDATIONQUERY_TIMEOUT, PROP_INITCONNECTIONSQLS,
             PROP_ACCESSTOUNDERLYINGCONNECTIONALLOWED, PROP_REMOVEABANDONED, PROP_REMOVEABANDONEDTIMEOUT,
-            PROP_LOGABANDONED, PROP_POOLPREPAREDSTATEMENTS, PROP_MAXOPENPREPAREDSTATEMENTS, PROP_CONNECTIONPROPERTIES };
+            PROP_LOGABANDONED, PROP_POOLPREPAREDSTATEMENTS, PROP_MAXOPENPREPAREDSTATEMENTS, PROP_CONNECTIONPROPERTIES,
+            PROP_FILTERS                                                  };
 
     @Override
     public Object getObjectInstance(Object obj, Name name, Context nameCtx, Hashtable<?, ?> environment)
@@ -272,6 +274,11 @@ public class DruidDataSourceFactory implements ObjectFactory {
         if (value != null) {
             dataSource.setMaxOpenPreparedStatements(Integer.parseInt(value));
         }
+        
+        value = properties.getProperty(PROP_FILTERS);
+        if (value != null) {
+            dataSource.setFilters(value);
+        }
 
         value = properties.getProperty(PROP_INITCONNECTIONSQLS);
         if (value != null) {
diff --git a/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml b/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml
index 12575f0780..5a7dba126e 100644
--- a/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml
+++ b/src/test/resources/com/alibaba/druid/pool/spring-config-1.xml
@@ -6,8 +6,7 @@
 http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd"
 	default-lazy-init="true">
-	
-	<bean id="test-filter" class="com.alibaba.druid.bvt.pool.SpringFilterTest$TestFilter">
+	<bean id="stat-filter" class="com.alibaba.druid.filter.stat.StatFilter">
 	</bean>
 
 	<bean id="dataSource" class="com.alibaba.druid.pool.DruidDataSource" destroy-method="close">
@@ -22,7 +21,7 @@ http://www.springframework.org/schema/aop http://www.springframework.org/schema/
 		</property>
 		<property name="filters">
 			<list>
-				<ref bean="test-filter"/>
+				<ref bean="stat-filter"/>
 			</list>
 		</property>
 	</bean>