svn commit: r1567876 - in /commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2: BasicDataSource.java Constants.java PoolableConnectionFactory.java

[markt]

Author: markt
Date: Thu Feb 13 10:18:01 2014
New Revision: 1567876

URL: http://svn.apache.org/r1567876
Log:
Further work on DBCP-219

Added:
    
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java 
  (with props)
Modified:
    
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
    
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java

Modified: 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java?rev=1567876&r1=1567875&r2=1567876&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/BasicDataSource.java
 Thu Feb 13 10:18:01 2014
@@ -2176,9 +2176,9 @@ public class BasicDataSource
             return;
         }
         StringBuilder base = new StringBuilder(registeredJmxName.toString());
-        base.append(",pool=");
+        base.append(Constants.JMX_CONNECTION_POOL_BASE_EXT);
         config.setJmxNameBase(base.toString());
-        config.setJmxNamePrefix("connections");
+        config.setJmxNamePrefix(Constants.JMX_CONNECTION_POOL_PREFIX);
     }
 
     protected ObjectName getRegisteredJmxName() {

Added: 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java?rev=1567876&view=auto
==============================================================================
--- 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java 
(added)
+++ 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java 
Thu Feb 13 10:18:01 2014
@@ -0,0 +1,31 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.commons.dbcp2;
+
+public class Constants {
+    public static final String JMX_CONNECTION_POOL_BASE_EXT = 
",connectionpool=";
+    public static final String JMX_CONNECTION_POOL_PREFIX = "connections";
+
+    public static final String JMX_CONNECTION_BASE_EXT =
+            JMX_CONNECTION_POOL_BASE_EXT +
+            JMX_CONNECTION_POOL_PREFIX +
+            ",connection=";
+
+    public static final String JMX_STATEMENT_POOL_BASE_EXT =
+            JMX_CONNECTION_BASE_EXT;
+    public static final String JMX_STATEMENT_POOL_PREFIX = 
",statementpool=statements";
+}

Propchange: 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/Constants.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
URL: 
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java?rev=1567876&r1=1567875&r2=1567876&view=diff
==============================================================================
--- 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 (original)
+++ 
commons/proper/dbcp/trunk/src/main/java/org/apache/commons/dbcp2/PoolableConnectionFactory.java
 Thu Feb 13 10:18:01 2014
@@ -212,9 +212,10 @@ public class PoolableConnectionFactory
             config.setMaxTotal(maxOpenPreparedStatements);
             if (dataSourceJmxName != null) {
                 StringBuilder base = new 
StringBuilder(dataSourceJmxName.toString());
-                base.append(",connection=");
+                base.append(Constants.JMX_CONNECTION_BASE_EXT);
+                base.append(Long.toString(connIndex));
                 config.setJmxNameBase(base.toString());
-                config.setJmxNamePrefix(Long.toString(connIndex) + 
",pool=statements");
+                config.setJmxNamePrefix(Constants.JMX_STATEMENT_POOL_PREFIX);
             }
             KeyedObjectPool<PStmtKey,DelegatingPreparedStatement> stmtPool =
                     new GenericKeyedObjectPool<>((PoolingConnection)conn, 
config);
@@ -227,7 +228,7 @@ public class PoolableConnectionFactory
         // Register this connection with JMX
         if (dataSourceJmxName != null) {
             StringBuilder connectionJmxName = new 
StringBuilder(dataSourceJmxName.toString());
-            connectionJmxName.append(",connection=");
+            connectionJmxName.append(Constants.JMX_CONNECTION_BASE_EXT);
             connectionJmxName.append(connIndex);
             jmxRegister(pc, connectionJmxName.toString());
         }