Author: kkolinko
Date: Wed Jan 18 12:33:47 2012
New Revision: 1232855
URL: http://svn.apache.org/viewvc?rev=1232855&view=rev
Log:
Replace tab characters and remove trailing whitespaces in jdbc-pool, as advised
by Checkstyle
Modified:
tomcat/trunk/modules/jdbc-pool/build.properties.default
tomcat/trunk/modules/jdbc-pool/build.xml
tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
tomcat/trunk/modules/jdbc-pool/doc/package.xsl
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/jmx/ConnectionPool.java
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java
Modified: tomcat/trunk/modules/jdbc-pool/build.properties.default
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.properties.default?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.properties.default (original)
+++ tomcat/trunk/modules/jdbc-pool/build.properties.default Wed Jan 18 12:33:47
2012
@@ -16,7 +16,7 @@
# -----------------------------------------------------------------------------
# build.properties.sample
#
-# This is an example "build.properties" file, used to customize building
+# This is an example "build.properties" file, used to customize building
# Tomcat JDBC Pool for your local environment. It defines the location of all
external
# modules that Tomcat JDBC Pool depends on. Copy this file to
"build.properties"
# in the top-level source directory, and customize it as needed.
@@ -60,7 +60,7 @@ testdb.validationQuery=SELECT 1
# Derby
#testdb.url=jdbc:derby:derbyDB;create=true
#testdb.driverClassName=org.apache.derby.jdbc.EmbeddedDriver
-#testdb.validationQuery=VALUES 1
+#testdb.validationQuery=VALUES 1
# ----- JUnit Unit Test Suite, version 3.7 or later -----
junit.home=${base.path}/junit3.8.2
Modified: tomcat/trunk/modules/jdbc-pool/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/build.xml?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/build.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/build.xml Wed Jan 18 12:33:47 2012
@@ -283,8 +283,8 @@
<include name="build.xml"/>
<include name="build.properties.default"/>
<include name="doc/*.xml"/>
- <include name="doc/*.xsl"/>
- <include name="resources/MANIFEST.MF"/>
+ <include name="doc/*.xsl"/>
+ <include name="resources/MANIFEST.MF"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
</fileset>
@@ -296,8 +296,8 @@
<include name="build.xml"/>
<include name="build.properties.default"/>
<include name="doc/*.xml"/>
- <include name="doc/*.xsl"/>
- <include name="resources/MANIFEST.MF"/>
+ <include name="doc/*.xsl"/>
+ <include name="resources/MANIFEST.MF"/>
<include name="LICENSE"/>
<include name="NOTICE"/>
</fileset>
@@ -427,8 +427,8 @@
<!-- Extract the testdb.* properties and remove the leading testdb. -->
<propertyset dynamic="false" id="testdb">
- <propertyref prefix="testdb"/>
- <mapper type="regexp" from="^testdb\.(.*)$$" to="\1"/>
+ <propertyref prefix="testdb"/>
+ <mapper type="regexp" from="^testdb\.(.*)$$" to="\1"/>
</propertyset>
<target name="test" depends="build,build-test">
Modified: tomcat/trunk/modules/jdbc-pool/doc/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/changelog.xml?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/changelog.xml (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/changelog.xml Wed Jan 18 12:33:47 2012
@@ -31,7 +31,7 @@
<section name="Tomcat JDBC Connection Pool 1.1.0.0">
<subsection name="pool">
<changelog>
- <add><rev>1207712</rev> Pool cleaner should be a global thread, not
spawn one thread per connection pool. (fhanik)</add>
+ <add><rev>1207712</rev> Pool cleaner should be a global thread, not
spawn one thread per connection pool. (fhanik)</add>
<fix><rev>1073531</rev> <bug>50805</bug> Only initialize connections
once when async (fhanik)</fix>
<fix><rev>1076380</rev> <bug>50857</bug> Correctly handle timeouts when
the pool is busy when async (fhanik)</fix>
<add>Added QueryTimeoutInterceptor to be able to configure timeouts on
running queries automatically.</add>
Modified: tomcat/trunk/modules/jdbc-pool/doc/package.xsl
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/doc/package.xsl?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
--- tomcat/trunk/modules/jdbc-pool/doc/package.xsl (original)
+++ tomcat/trunk/modules/jdbc-pool/doc/package.xsl Wed Jan 18 12:33:47 2012
@@ -72,10 +72,10 @@
<meta name="author" value="{$name}"/>
<meta name="email" value="{$email}"/>
</xsl:for-each>
- <style type="text/css" media="print">
- .noPrint {display: none;}
- td#mainBody {width: 100%;}
- </style>
+ <style type="text/css" media="print">
+.noPrint {display: none;}
+td#mainBody {width: 100%;}
+</style>
</head>
<body bgcolor="{$body-bg}" text="{$body-fg}" link="{$body-link}"
@@ -433,7 +433,7 @@
<xsl:variable name="link"><xsl:value-of select="$buglink"/><xsl:value-of
select="text()"/></xsl:variable>
<a href="{$link}"><xsl:apply-templates/></a>
</xsl:template>
-
+
<!-- Link to a SVN revision report -->
<xsl:template match="rev">
<xsl:variable name="link"><xsl:value-of select="$revlink"/><xsl:value-of
select="text()"/></xsl:variable>
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/DataSourceProxy.java
Wed Jan 18 12:33:47 2012
@@ -1194,7 +1194,7 @@ public class DataSourceProxy implements
getPoolProperties().setAlternateUsernameAllowed(alternateUsernameAllowed);
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -1202,7 +1202,7 @@ public class DataSourceProxy implements
getPoolProperties().setCommitOnReturn(commitOnReturn);
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -1210,7 +1210,7 @@ public class DataSourceProxy implements
return getPoolProperties().getCommitOnReturn();
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -1218,12 +1218,12 @@ public class DataSourceProxy implements
getPoolProperties().setRollbackOnReturn(rollbackOnReturn);
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
public boolean getRollbackOnReturn() {
return getPoolProperties().getRollbackOnReturn();
}
-
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/PoolProperties.java
Wed Jan 18 12:33:47 2012
@@ -85,8 +85,8 @@ public class PoolProperties implements P
protected boolean alternateUsernameAllowed = false;
protected boolean commitOnReturn = false;
protected boolean rollbackOnReturn = false;
-
-
+
+
/**
* {@inheritDoc}
*/
@@ -1162,15 +1162,15 @@ public class PoolProperties implements P
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
public void setCommitOnReturn(boolean commitOnReturn) {
- this.commitOnReturn = commitOnReturn;
+ this.commitOnReturn = commitOnReturn;
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -1178,7 +1178,7 @@ public class PoolProperties implements P
return this.commitOnReturn;
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -1186,7 +1186,7 @@ public class PoolProperties implements P
this.rollbackOnReturn = rollbackOnReturn;
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
Modified:
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/main/java/org/apache/tomcat/jdbc/pool/interceptor/QueryTimeoutInterceptor.java
Wed Jan 18 12:33:47 2012
@@ -29,7 +29,7 @@ import org.apache.tomcat.jdbc.pool.PoolP
public class QueryTimeoutInterceptor extends
AbstractCreateStatementInterceptor {
private static Log log = LogFactory.getLog(QueryTimeoutInterceptor.class);
int timeout;
-
+
@Override
public void setProperties(Map<String,InterceptorProperty> properties) {
super.setProperties(properties);
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=1232855&r1=1232854&r2=1232855&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
Wed Jan 18 12:33:47 2012
@@ -744,8 +744,8 @@ public class ConnectionPool extends Noti
public void setValidator(Validator validator) {
//noop
}
-
- /**
+
+ /**
* {@inheritDoc}
*/
@Override
@@ -753,7 +753,7 @@ public class ConnectionPool extends Noti
getPoolProperties().setCommitOnReturn(commitOnReturn);
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -761,7 +761,7 @@ public class ConnectionPool extends Noti
return getPoolProperties().getCommitOnReturn();
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
@@ -769,13 +769,13 @@ public class ConnectionPool extends Noti
getPoolProperties().setRollbackOnReturn(rollbackOnReturn);
}
- /**
+ /**
* {@inheritDoc}
*/
@Override
public boolean getRollbackOnReturn() {
return getPoolProperties().getRollbackOnReturn();
}
-
+
}
Modified:
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java?rev=1232855&r1=1232854&r2=1232855&view=diff
==============================================================================
---
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java
(original)
+++
tomcat/trunk/modules/jdbc-pool/src/test/java/org/apache/tomcat/jdbc/test/PoolCleanerTest.java
Wed Jan 18 12:33:47 2012
@@ -25,17 +25,17 @@ public class PoolCleanerTest extends Def
public PoolCleanerTest(String name) {
super(name);
}
-
+
public void testPoolCleaner() throws Exception {
datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(2000);
datasource.getPoolProperties().setTestWhileIdle(true);
assertEquals("Pool cleaner should not be started
yet.",0,ConnectionPool.getPoolCleaners().size() );
assertNull("Pool timer should be null", ConnectionPool.getPoolTimer());
-
+
datasource.getConnection().close();
assertEquals("Pool cleaner should have 1
cleaner.",1,ConnectionPool.getPoolCleaners().size() );
assertNotNull("Pool timer should not be null",
ConnectionPool.getPoolTimer());
-
+
datasource.close();
assertEquals("Pool shutdown, no cleaners should be
present.",0,ConnectionPool.getPoolCleaners().size() );
assertNull("Pool timer should be null after shutdown",
ConnectionPool.getPoolTimer());
@@ -44,17 +44,17 @@ public class PoolCleanerTest extends Def
public void test2PoolCleaners() throws Exception {
datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(2000);
datasource.getPoolProperties().setTestWhileIdle(true);
-
+
DataSource ds2 = new DataSource(datasource.getPoolProperties());
-
+
assertEquals("Pool cleaner should not be started
yet.",0,ConnectionPool.getPoolCleaners().size() );
assertNull("Pool timer should be null", ConnectionPool.getPoolTimer());
-
+
datasource.getConnection().close();
ds2.getConnection().close();
assertEquals("Pool cleaner should have 2
cleaner.",2,ConnectionPool.getPoolCleaners().size() );
assertNotNull("Pool timer should not be null",
ConnectionPool.getPoolTimer());
-
+
datasource.close();
assertEquals("Pool cleaner should have 1
cleaner.",1,ConnectionPool.getPoolCleaners().size() );
assertNotNull("Pool timer should not be null",
ConnectionPool.getPoolTimer());
@@ -63,7 +63,7 @@ public class PoolCleanerTest extends Def
assertEquals("Pool shutdown, no cleaners should be
present.",0,ConnectionPool.getPoolCleaners().size() );
assertNull("Pool timer should be null after shutdown",
ConnectionPool.getPoolTimer());
}
-
+
public void testIdleTimeout() throws Exception {
datasource.getPoolProperties().setTimeBetweenEvictionRunsMillis(2000);
datasource.getPoolProperties().setTestWhileIdle(true);
@@ -75,9 +75,7 @@ public class PoolCleanerTest extends Def
assertEquals("Pool should have 1 idle.", 1, datasource.getIdle());
Thread.sleep(3000);
assertEquals("Pool should have 0 idle.", 0, datasource.getIdle());
-
-
}
-
-
+
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
