Allow a user to configure a pool name through config

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@758728 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
index edbbe7c..5403bb0 100644 (file)
--- a/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
+++ b/modules/jdbc-pool/java/org/apache/tomcat/jdbc/pool/DataSourceFactory.java
@@ -107,6 +107,8 @@ public class DataSourceFactory implements ObjectFactory {
     protected static final String PROP_USE_EQUALS = "useEquals";
     
     public static final int UNKNOWN_TRANSACTIONISOLATION = -1;
+    
+    public static final String OBJECT_NAME = "object_name";
 
 
     protected final static String[] ALL_PROPERTIES = {
@@ -143,7 +145,8 @@ public class DataSourceFactory implements ObjectFactory {
         PROP_INTERCEPTORS,
         PROP_JMX_ENABLED,
         PROP_FAIR_QUEUE,
-        PROP_USE_EQUALS
+        PROP_USE_EQUALS,
+        OBJECT_NAME
     };
 
     // -------------------------------------------------- ObjectFactory Methods
@@ -400,6 +403,12 @@ public class DataSourceFactory implements ObjectFactory {
         if (value != null) {
             poolProperties.setUseEquals(Boolean.parseBoolean(value));
         }
+
+        value = properties.getProperty(OBJECT_NAME);
+        if (value != null) {
+            poolProperties.setName(value);
+        }
+
         return poolProperties;
         
     }