Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java?rev=1180721&r1=1180720&r2=1180721&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java Sun Oct 9 21:38:17 2011 @@ -134,26 +134,32 @@ public class ConnectionPool extends Noti // POOL STATS //================================================================= + @Override public int getSize() { return pool.getSize(); } + @Override public int getIdle() { return pool.getIdle(); } + @Override public int getActive() { return pool.getActive(); } + @Override public int getNumIdle() { return getIdle(); } + @Override public int getNumActive() { return getActive(); } + @Override public int getWaitCount() { return pool.getWaitCount(); } @@ -161,14 +167,17 @@ public class ConnectionPool extends Noti //================================================================= // POOL OPERATIONS //================================================================= + @Override public void checkIdle() { pool.checkIdle(); } + @Override public void checkAbandoned() { pool.checkAbandoned(); } + @Override public void testIdle() { pool.testAllIdle(); } @@ -180,67 +189,83 @@ public class ConnectionPool extends Noti //========================================================= + @Override public String getConnectionProperties() { return getPoolProperties().getConnectionProperties(); } + @Override public Properties getDbProperties() { return PoolUtilities.cloneWithoutPassword(getPoolProperties().getDbProperties()); } + @Override public String getDefaultCatalog() { return getPoolProperties().getDefaultCatalog(); } + @Override public int getDefaultTransactionIsolation() { return getPoolProperties().getDefaultTransactionIsolation(); } + @Override public String getDriverClassName() { return getPoolProperties().getDriverClassName(); } + @Override public int getInitialSize() { return getPoolProperties().getInitialSize(); } + @Override public String getInitSQL() { return getPoolProperties().getInitSQL(); } + @Override public String getJdbcInterceptors() { return getPoolProperties().getJdbcInterceptors(); } + @Override public int getMaxActive() { return getPoolProperties().getMaxActive(); } + @Override public int getMaxIdle() { return getPoolProperties().getMaxIdle(); } + @Override public int getMaxWait() { return getPoolProperties().getMaxWait(); } + @Override public int getMinEvictableIdleTimeMillis() { return getPoolProperties().getMinEvictableIdleTimeMillis(); } + @Override public int getMinIdle() { return getPoolProperties().getMinIdle(); } + @Override public long getMaxAge() { return getPoolProperties().getMaxAge(); } + @Override public String getName() { return this.getPoolName(); } + @Override public int getNumTestsPerEvictionRun() { return getPoolProperties().getNumTestsPerEvictionRun(); } @@ -248,31 +273,38 @@ public class ConnectionPool extends Noti /** * @return DOES NOT RETURN THE PASSWORD, IT WOULD SHOW UP IN JMX */ + @Override public String getPassword() { return "Password not available as DataSource/JMX operation."; } + @Override public int getRemoveAbandonedTimeout() { return getPoolProperties().getRemoveAbandonedTimeout(); } + @Override public int getTimeBetweenEvictionRunsMillis() { return getPoolProperties().getTimeBetweenEvictionRunsMillis(); } + @Override public String getUrl() { return getPoolProperties().getUrl(); } + @Override public String getUsername() { return getPoolProperties().getUsername(); } + @Override public long getValidationInterval() { return getPoolProperties().getValidationInterval(); } + @Override public String getValidationQuery() { return getPoolProperties().getValidationQuery(); } @@ -281,6 +313,7 @@ public class ConnectionPool extends Noti * {@inheritDoc} */ + @Override public String getValidatorClassName() { return getPoolProperties().getValidatorClassName(); } @@ -289,283 +322,340 @@ public class ConnectionPool extends Noti * {@inheritDoc} */ + @Override public Validator getValidator() { return getPoolProperties().getValidator(); } + @Override public boolean isAccessToUnderlyingConnectionAllowed() { return getPoolProperties().isAccessToUnderlyingConnectionAllowed(); } + @Override public Boolean isDefaultAutoCommit() { return getPoolProperties().isDefaultAutoCommit(); } + @Override public Boolean isDefaultReadOnly() { return getPoolProperties().isDefaultReadOnly(); } + @Override public boolean isLogAbandoned() { return getPoolProperties().isLogAbandoned(); } + @Override public boolean isPoolSweeperEnabled() { return getPoolProperties().isPoolSweeperEnabled(); } + @Override public boolean isRemoveAbandoned() { return getPoolProperties().isRemoveAbandoned(); } + @Override public int getAbandonWhenPercentageFull() { return getPoolProperties().getAbandonWhenPercentageFull(); } + @Override public boolean isTestOnBorrow() { return getPoolProperties().isTestOnBorrow(); } + @Override public boolean isTestOnConnect() { return getPoolProperties().isTestOnConnect(); } + @Override public boolean isTestOnReturn() { return getPoolProperties().isTestOnReturn(); } + @Override public boolean isTestWhileIdle() { return getPoolProperties().isTestWhileIdle(); } + @Override public Boolean getDefaultAutoCommit() { return getPoolProperties().getDefaultAutoCommit(); } + @Override public Boolean getDefaultReadOnly() { return getPoolProperties().getDefaultReadOnly(); } + @Override public InterceptorDefinition[] getJdbcInterceptorsAsArray() { return getPoolProperties().getJdbcInterceptorsAsArray(); } + @Override public boolean getUseLock() { return getPoolProperties().getUseLock(); } + @Override public boolean isFairQueue() { return getPoolProperties().isFairQueue(); } + @Override public boolean isJmxEnabled() { return getPoolProperties().isJmxEnabled(); } + @Override public boolean isUseEquals() { return getPoolProperties().isUseEquals(); } + @Override public void setAbandonWhenPercentageFull(int percentage) { getPoolProperties().setAbandonWhenPercentageFull(percentage); } + @Override public void setAccessToUnderlyingConnectionAllowed(boolean accessToUnderlyingConnectionAllowed) { getPoolProperties().setAccessToUnderlyingConnectionAllowed(accessToUnderlyingConnectionAllowed); } + @Override public void setDbProperties(Properties dbProperties) { getPoolProperties().setDbProperties(dbProperties); } + @Override public void setDefaultReadOnly(Boolean defaultReadOnly) { getPoolProperties().setDefaultReadOnly(defaultReadOnly); } + @Override public void setMaxAge(long maxAge) { getPoolProperties().setMaxAge(maxAge); } + @Override public void setName(String name) { getPoolProperties().setName(name); } + @Override public String getPoolName() { return getPoolProperties().getName(); } + @Override public void setConnectionProperties(String connectionProperties) { getPoolProperties().setConnectionProperties(connectionProperties); } + @Override public void setDefaultAutoCommit(Boolean defaultAutoCommit) { getPoolProperties().setDefaultAutoCommit(defaultAutoCommit); } + @Override public void setDefaultCatalog(String defaultCatalog) { getPoolProperties().setDefaultCatalog(defaultCatalog); } + @Override public void setDefaultTransactionIsolation(int defaultTransactionIsolation) { getPoolProperties().setDefaultTransactionIsolation(defaultTransactionIsolation); } + @Override public void setDriverClassName(String driverClassName) { getPoolProperties().setDriverClassName(driverClassName); } + @Override public void setFairQueue(boolean fairQueue) { getPoolProperties().setFairQueue(fairQueue); } + @Override public void setInitialSize(int initialSize) { // TODO Auto-generated method stub } + @Override public void setInitSQL(String initSQL) { // TODO Auto-generated method stub } + @Override public void setJdbcInterceptors(String jdbcInterceptors) { // TODO Auto-generated method stub } + @Override public void setJmxEnabled(boolean jmxEnabled) { // TODO Auto-generated method stub } + @Override public void setLogAbandoned(boolean logAbandoned) { // TODO Auto-generated method stub } + @Override public void setMaxActive(int maxActive) { // TODO Auto-generated method stub } + @Override public void setMaxIdle(int maxIdle) { // TODO Auto-generated method stub } + @Override public void setMaxWait(int maxWait) { // TODO Auto-generated method stub } + @Override public void setMinEvictableIdleTimeMillis(int minEvictableIdleTimeMillis) { // TODO Auto-generated method stub } + @Override public void setMinIdle(int minIdle) { // TODO Auto-generated method stub } + @Override public void setNumTestsPerEvictionRun(int numTestsPerEvictionRun) { // TODO Auto-generated method stub } + @Override public void setPassword(String password) { // TODO Auto-generated method stub } + @Override public void setRemoveAbandoned(boolean removeAbandoned) { // TODO Auto-generated method stub } + @Override public void setRemoveAbandonedTimeout(int removeAbandonedTimeout) { // TODO Auto-generated method stub } + @Override public void setTestOnBorrow(boolean testOnBorrow) { // TODO Auto-generated method stub } + @Override public void setTestOnConnect(boolean testOnConnect) { // TODO Auto-generated method stub } + @Override public void setTestOnReturn(boolean testOnReturn) { // TODO Auto-generated method stub } + @Override public void setTestWhileIdle(boolean testWhileIdle) { // TODO Auto-generated method stub } + @Override public void setTimeBetweenEvictionRunsMillis(int timeBetweenEvictionRunsMillis) { // TODO Auto-generated method stub } + @Override public void setUrl(String url) { // TODO Auto-generated method stub } + @Override public void setUseEquals(boolean useEquals) { // TODO Auto-generated method stub } + @Override public void setUseLock(boolean useLock) { // TODO Auto-generated method stub } + @Override public void setUsername(String username) { // TODO Auto-generated method stub } + @Override public void setValidationInterval(long validationInterval) { // TODO Auto-generated method stub } + @Override public void setValidationQuery(String validationQuery) { // TODO Auto-generated method stub @@ -575,6 +665,7 @@ public class ConnectionPool extends Noti * {@inheritDoc} */ + @Override public void setValidatorClassName(String className) { getPoolProperties().setValidatorClassName(className); } @@ -583,6 +674,7 @@ public class ConnectionPool extends Noti * {@inheritDoc} */ + @Override public int getSuspectTimeout() { return getPoolProperties().getSuspectTimeout(); } @@ -591,6 +683,7 @@ public class ConnectionPool extends Noti * {@inheritDoc} */ + @Override public void setSuspectTimeout(int seconds) { //no op } @@ -598,6 +691,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public void setDataSource(Object ds) { getPoolProperties().setDataSource(ds); } @@ -605,6 +699,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public Object getDataSource() { return getPoolProperties().getDataSource(); } @@ -613,6 +708,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public void setDataSourceJNDI(String jndiDS) { //noop } @@ -620,6 +716,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public String getDataSourceJNDI() { return getPoolProperties().getDataSourceJNDI(); } @@ -627,6 +724,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public boolean isAlternateUsernameAllowed() { return getPoolProperties().isAlternateUsernameAllowed(); } @@ -634,6 +732,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public void setAlternateUsernameAllowed(boolean alternateUsernameAllowed) { //noop } @@ -641,6 +740,7 @@ public class ConnectionPool extends Noti /** * {@inheritDoc} */ + @Override public void setValidator(Validator validator) { //noop }
Modified: tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java URL: http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java?rev=1180721&r1=1180720&r2=1180721&view=diff ============================================================================== --- tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java (original) +++ tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPoolMBean.java Sun Oct 9 21:38:17 2011 @@ -29,8 +29,6 @@ public interface ConnectionPoolMBean ext public int getActive(); - public boolean isPoolSweeperEnabled(); - public int getNumIdle(); public int getNumActive(); --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
