svn commit: r756341 - in /commons/proper/cli/branches/cli-1.x: pom.xml src/site/site.xml xdocs/examples/ xdocs/index.xml xdocs/manual/
Author: bayard
Date: Fri Mar 20 06:27:40 2009
New Revision: 756341
URL: http://svn.apache.org/viewvc?rev=756341view=rev
Log:
Updating site to be CLI1 specific
Removed:
commons/proper/cli/branches/cli-1.x/xdocs/examples/
commons/proper/cli/branches/cli-1.x/xdocs/manual/
Modified:
commons/proper/cli/branches/cli-1.x/pom.xml
commons/proper/cli/branches/cli-1.x/src/site/site.xml
commons/proper/cli/branches/cli-1.x/xdocs/index.xml
Modified: commons/proper/cli/branches/cli-1.x/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/pom.xml?rev=756341r1=756340r2=756341view=diff
==
--- commons/proper/cli/branches/cli-1.x/pom.xml (original)
+++ commons/proper/cli/branches/cli-1.x/pom.xml Fri Mar 20 06:27:40 2009
@@ -176,44 +176,71 @@
/build
reporting
-plugins
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdfindbugs-maven-plugin/artifactId
-version1.2/version
-configuration
- thresholdNormal/threshold
- effortDefault/effort
-/configuration
- /plugin
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-checkstyle-plugin/artifactId
-configuration
- configLocationsrc/conf/checkstyle.xml/configLocation
-/configuration
- /plugin
- plugin
-groupIdorg.apache.maven.plugins/groupId
-artifactIdmaven-pmd-plugin/artifactId
- /plugin
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdcobertura-maven-plugin/artifactId
-version2.2/version
- /plugin
- plugin
-groupIdorg.codehaus.mojo/groupId
-artifactIdclirr-maven-plugin/artifactId
-version2.2.1/version
-configuration
- comparisonVersion1.1/comparisonVersion
-/configuration
- /plugin
-/plugins
+ plugins
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-javadoc-plugin/artifactId
+ configuration
+linksourcetrue/linksource
+links
+ linkhttp://java.sun.com/javase/6/docs/api/link
+/links
+ /configuration
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-changes-plugin/artifactId
+ version2.0/version
+ configuration
+xmlPath${basedir}/xdocs/changes.xml/xmlPath
+issueLinkTemplate%URL%/%ISSUE%/issueLinkTemplate
+ /configuration
+ reportSets
+reportSet
+ reports
+ reportchanges-report/report
+ /reports
+/reportSet
+ /reportSets
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-checkstyle-plugin/artifactId
+ version2.1/version
+ configuration
+configLocationsrc/conf/checkstyle.xml/configLocation
+enableRulesSummaryfalse/enableRulesSummary
+ /configuration
+/plugin
+plugin
+ groupIdorg.codehaus.mojo/groupId
+ artifactIdfindbugs-maven-plugin/artifactId
+ version1.2/version
+ configuration
+thresholdNormal/threshold
+effortDefault/effort
+ /configuration
+/plugin
+plugin
+ groupIdorg.codehaus.mojo/groupId
+ artifactIdcobertura-maven-plugin/artifactId
+ version2.2/version
+/plugin
+plugin
+ groupIdorg.codehaus.mojo/groupId
+ artifactIdclirr-maven-plugin/artifactId
+ version2.2.1/version
+ configuration
+comparisonVersion1.1/comparisonVersion
+ /configuration
+/plugin
+plugin
+ groupIdorg.apache.maven.plugins/groupId
+ artifactIdmaven-pmd-plugin/artifactId
+/plugin
+ /plugins
/reporting
-
profiles
!-- Profile to let Gump choose the name of the jar file generated --
profile
Modified: commons/proper/cli/branches/cli-1.x/src/site/site.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/site/site.xml?rev=756341r1=756340r2=756341view=diff
==
--- commons/proper/cli/branches/cli-1.x/src/site/site.xml (original)
+++ commons/proper/cli/branches/cli-1.x/src/site/site.xml Fri Mar 20 06:27:40
2009
@@ -32,21 +32,13 @@
item name=Source Repositoryhref=/source-repository.html/
/menu
-menu name=CLI 1 User Guide
+menu name=User Guide
item name=Getting started href=/introduction.html/
item name=Usage scenarios href=/usage.html/
item name=Option propertieshref=/properties.html/
item name=Javadoc (1.2)href=api-release/index.html/
svn commit: r756433 - in /commons: proper/compress/ proper/compress/branches/ proper/compress/tags/ proper/compress/trunk/ sandbox/compress/ trunks-proper/ trunks-sandbox/
Author: bodewig Date: Fri Mar 20 12:40:03 2009 New Revision: 756433 URL: http://svn.apache.org/viewvc?rev=756433view=rev Log: move compress from sandbox to proper Added: commons/proper/compress/ - copied from r756432, commons/sandbox/compress/ Removed: commons/proper/compress/branches/ commons/proper/compress/tags/ commons/proper/compress/trunk/ commons/sandbox/compress/ Modified: commons/trunks-proper/ (props changed) commons/trunks-sandbox/ (props changed) Propchange: commons/trunks-proper/ -- --- svn:externals (original) +++ svn:externals Fri Mar 20 12:40:03 2009 @@ -10,6 +10,7 @@ commons-parent https://svn.apache.org/repos/asf/commons/proper/commons-parent/trunk commons-sandbox-parent https://svn.apache.org/repos/asf/commons/proper/commons-sandbox-parent/trunk/ commons-skin https://svn.apache.org/repos/asf/commons/proper/commons-skin/trunk +compress https://svn.apache.org/repos/asf/commons/proper/compress/trunk configuration https://svn.apache.org/repos/asf/commons/proper/configuration/trunk daemon https://svn.apache.org/repos/asf/commons/proper/daemon/trunk dbcp https://svn.apache.org/repos/asf/commons/proper/dbcp/trunk Propchange: commons/trunks-sandbox/ -- --- svn:externals (original) +++ svn:externals Fri Mar 20 12:40:03 2009 @@ -1,6 +1,5 @@ commons-build https://svn.apache.org/repos/asf/commons/proper/commons-build/trunk commons-sandbox-parent https://svn.apache.org/repos/asf/commons/proper/commons-sandbox-parent/trunk/ -compress https://svn.apache.org/repos/asf/commons/sandbox/compress/trunk csv https://svn.apache.org/repos/asf/commons/sandbox/csv/trunk expression https://svn.apache.org/repos/asf/commons/sandbox/expression/trunk finder https://svn.apache.org/repos/asf/commons/sandbox/finder/trunk
svn commit: r756437 - in /commons: proper/compress/ sandbox/compress/ sandbox/compress/branches/ sandbox/compress/branches/olddesign/ sandbox/compress/branches/olddesign/src/ sandbox/compress/branches
Author: bodewig Date: Fri Mar 20 12:50:18 2009 New Revision: 756437 URL: http://svn.apache.org/viewvc?rev=756437view=rev Log: revert part of the move, need to figure out why only the top level dir was copied first Added: commons/sandbox/compress/ - copied from r756432, commons/sandbox/compress/ commons/sandbox/compress/branches/ - copied from r756432, commons/sandbox/compress/branches/ commons/sandbox/compress/branches/olddesign/ (props changed) - copied from r756432, commons/sandbox/compress/branches/olddesign/ commons/sandbox/compress/branches/olddesign/LICENSE.txt - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/LICENSE.txt commons/sandbox/compress/branches/olddesign/NOTICE.txt - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/NOTICE.txt commons/sandbox/compress/branches/olddesign/README.txt - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/README.txt commons/sandbox/compress/branches/olddesign/checkstyle.xml - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/checkstyle.xml commons/sandbox/compress/branches/olddesign/license-header.txt - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/license-header.txt commons/sandbox/compress/branches/olddesign/maven.xml - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/maven.xml commons/sandbox/compress/branches/olddesign/pom.xml - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/pom.xml commons/sandbox/compress/branches/olddesign/project.properties - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/project.properties commons/sandbox/compress/branches/olddesign/project.xml - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/project.xml commons/sandbox/compress/branches/olddesign/src/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/ commons/sandbox/compress/branches/olddesign/src/examples/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/ commons/sandbox/compress/branches/olddesign/src/examples/org/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/ commons/sandbox/compress/branches/olddesign/src/examples/org/apache/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/ commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/ commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/ commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/ commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/BZip2Example.java - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/BZip2Example.java commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/TarExample.java - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/TarExample.java commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/ZipExample.java - copied unchanged from r756432, commons/sandbox/compress/branches/olddesign/src/examples/org/apache/commons/compress/examples/ZipExample.java commons/sandbox/compress/branches/olddesign/src/java/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/java/ commons/sandbox/compress/branches/olddesign/src/java/org/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/java/org/ commons/sandbox/compress/branches/olddesign/src/java/org/apache/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/java/org/apache/ commons/sandbox/compress/branches/olddesign/src/java/org/apache/commons/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/java/org/apache/commons/ commons/sandbox/compress/branches/olddesign/src/java/org/apache/commons/compress/ - copied from r756432, commons/sandbox/compress/branches/olddesign/src/java/org/apache/commons/compress/ commons/sandbox/compress/branches/olddesign/src/java/org/apache/commons/compress/AbstractArchive.java - copied unchanged from r756432,
svn commit: r756443 - /commons/proper/compress/
Author: bodewig Date: Fri Mar 20 13:14:08 2009 New Revision: 756443 URL: http://svn.apache.org/viewvc?rev=756443view=rev Log: copy compress from sandbox to proper Added: commons/proper/compress/ - copied from r756441, commons/sandbox/compress/
svn commit: r756447 - in /commons/proper/compress/tags/compress_sandbox_03_2009: ./ LICENSE.txt NOTICE.txt PROPOSAL.txt pom.xml src/
Author: bodewig Date: Fri Mar 20 13:26:04 2009 New Revision: 756447 URL: http://svn.apache.org/viewvc?rev=756447view=rev Log: tag copied version of compress Added: commons/proper/compress/tags/compress_sandbox_03_2009/ - copied from r756441, commons/sandbox/compress/trunk/ commons/proper/compress/tags/compress_sandbox_03_2009/LICENSE.txt - copied unchanged from r756446, commons/sandbox/compress/trunk/LICENSE.txt commons/proper/compress/tags/compress_sandbox_03_2009/NOTICE.txt - copied unchanged from r756446, commons/sandbox/compress/trunk/NOTICE.txt commons/proper/compress/tags/compress_sandbox_03_2009/PROPOSAL.txt - copied unchanged from r756446, commons/sandbox/compress/trunk/PROPOSAL.txt commons/proper/compress/tags/compress_sandbox_03_2009/pom.xml - copied unchanged from r756446, commons/sandbox/compress/trunk/pom.xml commons/proper/compress/tags/compress_sandbox_03_2009/src/ - copied from r756446, commons/sandbox/compress/trunk/src/
svn commit: r756448 - /commons/sandbox/compress/
Author: bodewig Date: Fri Mar 20 13:26:59 2009 New Revision: 756448 URL: http://svn.apache.org/viewvc?rev=756448view=rev Log: remove compress from sandbox Removed: commons/sandbox/compress/
svn commit: r756451 - /commons/proper/compress/trunk/pom.xml
Author: bodewig Date: Fri Mar 20 13:31:11 2009 New Revision: 756451 URL: http://svn.apache.org/viewvc?rev=756451view=rev Log: Sandbox - Proper in POM except for site stuff Modified: commons/proper/compress/trunk/pom.xml Modified: commons/proper/compress/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=756451r1=756450r2=756451view=diff == --- commons/proper/compress/trunk/pom.xml (original) +++ commons/proper/compress/trunk/pom.xml Fri Mar 20 13:31:11 2009 @@ -22,13 +22,13 @@ modelVersion4.0.0/modelVersion parent groupIdorg.apache.commons/groupId -artifactIdcommons-sandbox-parent/artifactId -version7/version +artifactIdcommons-parent/artifactId +version11/version /parent artifactIdcommons-compress/artifactId version1.0-SNAPSHOT/version - nameCommons Compress (Sandbox)/name + nameCommons Compress/name urlhttp://commons.apache.org/sandbox/compress//url descriptionCommons Compress is a component that contains Tar, Zip and BZip2 packages/description @@ -71,9 +71,9 @@ /contributors scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/sandbox/compress/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/sandbox/compress/trunk/developerConnection -urlhttp://svn.apache.org/repos/asf/commons/sandbox/compress/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/compress/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/compress/trunk/developerConnection +urlhttp://svn.apache.org/repos/asf/commons/proper/compress/trunk/url /scm distributionManagement
svn commit: r756455 - /commons/proper/compress/trunk/pom.xml
Author: bodewig Date: Fri Mar 20 13:35:38 2009 New Revision: 756455 URL: http://svn.apache.org/viewvc?rev=756455view=rev Log: bump JUnit dependency Modified: commons/proper/compress/trunk/pom.xml Modified: commons/proper/compress/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/pom.xml?rev=756455r1=756454r2=756455view=diff == --- commons/proper/compress/trunk/pom.xml (original) +++ commons/proper/compress/trunk/pom.xml Fri Mar 20 13:35:38 2009 @@ -36,7 +36,7 @@ dependency groupIdjunit/groupId artifactIdjunit/artifactId - version3.8.1/version + version3.8.2/version scopetest/scope /dependency /dependencies
svn commit: r756462 - /commons/trunks-sandbox/buildall.sh
Author: bodewig Date: Fri Mar 20 13:42:48 2009 New Revision: 756462 URL: http://svn.apache.org/viewvc?rev=756462view=rev Log: no idea whether this is still used. remove compress Modified: commons/trunks-sandbox/buildall.sh Modified: commons/trunks-sandbox/buildall.sh URL: http://svn.apache.org/viewvc/commons/trunks-sandbox/buildall.sh?rev=756462r1=756461r2=756462view=diff == --- commons/trunks-sandbox/buildall.sh (original) +++ commons/trunks-sandbox/buildall.sh Fri Mar 20 13:42:48 2009 @@ -18,7 +18,7 @@ ROOT=`pwd` LOGDIR=$ROOT/logs SITEDIR=$ROOT/site -COMPONENTS=compress csv exec id i18n javaflow pipeline openpgp +COMPONENTS=csv exec id i18n javaflow pipeline openpgp rm -rf $LOGDIR mkdir -p $LOGDIR
svn commit: r756487 - in /commons: proper/cli/branches/avalon-implementation/ sandbox/avalon-cli/
Author: bayard Date: Fri Mar 20 14:34:07 2009 New Revision: 756487 URL: http://svn.apache.org/viewvc?rev=756487view=rev Log: Moving avalon-implementation of cli over to the sandbox Added: commons/sandbox/avalon-cli/ - copied from r756486, commons/proper/cli/branches/avalon-implementation/ Removed: commons/proper/cli/branches/avalon-implementation/
svn commit: r756491 - in /commons/sandbox: avalon-cli-tmp/ avalon-cli/
Author: bayard Date: Fri Mar 20 14:49:33 2009 New Revision: 756491 URL: http://svn.apache.org/viewvc?rev=756491view=rev Log: Needs a trunk, moving out the way Added: commons/sandbox/avalon-cli-tmp/ - copied from r756490, commons/sandbox/avalon-cli/ Removed: commons/sandbox/avalon-cli/
svn commit: r756492 - /commons/sandbox/avalon-cli/
Author: bayard Date: Fri Mar 20 14:49:39 2009 New Revision: 756492 URL: http://svn.apache.org/viewvc?rev=756492view=rev Log: Creating avalon-cli space Added: commons/sandbox/avalon-cli/
svn commit: r756493 - in /commons/sandbox: avalon-cli-tmp/ avalon-cli/trunk/
Author: bayard Date: Fri Mar 20 14:50:02 2009 New Revision: 756493 URL: http://svn.apache.org/viewvc?rev=756493view=rev Log: Moving avalon-cli code in as trunk to new avalon-cli space Added: commons/sandbox/avalon-cli/trunk/ - copied from r756492, commons/sandbox/avalon-cli-tmp/ Removed: commons/sandbox/avalon-cli-tmp/
svn commit: r756596 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
Author: psteitz
Date: Fri Mar 20 16:40:47 2009
New Revision: 756596
URL: http://svn.apache.org/viewvc?rev=756596view=rev
Log:
Fixed typos in javadoc.
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java?rev=756596r1=756595r2=756596view=diff
==
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/jocl/JOCLContentHandler.java
Fri Mar 20 16:40:47 2009
@@ -74,7 +74,7 @@
* pre lt;object class=java.util.Date/gt;
* lt;object class=java.util.Date/gt;/pre
* The {...@link #getTypeArray} method
- * will return an composed
+ * will return an array composed
* of two instances of ttjava.util.Date/tt. The sequence of
* {...@link java.lang.Object ttObject/tts} in the array
* will correspond to the sequence of ttlt;objectgt;/tt elements in the
JOCL fragment.
@@ -90,7 +90,7 @@
* will add an instance of ttmypackage.Foo/tt to the object list,
constructed via
* ttnew mypackage.Foo(new mypackage.Bar())/tt.
* p
- * There is a special syntax available creating primative values and arguments,
+ * There is a special syntax available creating primitive values and arguments,
* as well as for constructing {...@link java.lang.String ttString/tt}s.
Some examples:
* p
* pre lt;byte value=3/gt;
@@ -106,7 +106,7 @@
* When invoked at the root level (that is, with no ttlt;objectgt;/tt
parent),
* this will cause the corresponding object wrapper to be added to the list
of
* {...@link java.lang.Object ttObject/tt}s. The {...@link #getType type}
for these
- * objects will reflect the proper primative type, however. When invoked with
an
+ * objects will reflect the proper primitive type, however. When invoked with
an
* ttlt;objectgt;/tt parent, these will be treated as primitive
arguments to the
* specified {...@link java.lang.Object ttObject/tt}'s constructor. For
example, while:
* p
svn commit: r756628 - in /commons/proper/dbcp/trunk: src/java/org/apache/commons/dbcp/ src/test/org/apache/commons/dbcp/ xdocs/
Author: psteitz
Date: Fri Mar 20 17:07:44 2009
New Revision: 756628
URL: http://svn.apache.org/viewvc?rev=756628view=rev
Log:
Added a validationQueryTimeout configuration parameter to BasicDataSource
allowing the user to specify a timeout value (in seconds) for connection
validation queries.
JIRA: DBCP-226
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TestBasicDataSource.java
commons/proper/dbcp/trunk/src/test/org/apache/commons/dbcp/TesterStatement.java
commons/proper/dbcp/trunk/xdocs/changes.xml
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java?rev=756628r1=756627r2=756628view=diff
==
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/BasicDataSource.java
Fri Mar 20 17:07:44 2009
@@ -811,6 +811,42 @@
}
/**
+ * Timeout in seconds before connection validation queries fail.
+ *
+ * @since 1.3
+ */
+protected int validationQueryTimeout = -1;
+
+/**
+ * Returns the validation query timeout.
+ *
+ * @return the timeout in seconds before connection validation queries
fail.
+ * @since 1.3
+ */
+public synchronized int getValidationQueryTimeout() {
+return validationQueryTimeout;
+}
+
+/**
+ * Sets the validation query timeout, the amount of time, in seconds, that
+ * connection validation will wait for a response from the database when
+ * executing a validation query. Use a value less than or equal to 0 for
+ * no timeout.
+ * p
+ * Note: this method currently has no effect once the pool has been
+ * initialized. The pool is initialized the first time one of the
+ * following methods is invoked: codegetConnection, setLogwriter,
+ * setLoginTimeout, getLoginTimeout, getLogWriter./code/p
+ *
+ * @param timeout new validation query timeout value in seconds
+ * @since 1.3
+ */
+public synchronized void setValidationQueryTimeout(int timeout) {
+this.validationQueryTimeout = timeout;
+restartNeeded = true;
+}
+
+/**
* These SQL statements run once after a Connection is created.
* p
* This property can be used for example to run ALTER SESSION SET
@@ -1303,6 +1339,7 @@
connectionPool,
statementPoolFactory,
validationQuery,
+ validationQueryTimeout,
connectionInitSqls,
defaultReadOnly,
defaultAutoCommit,
Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java?rev=756628r1=756627r2=756628view=diff
==
---
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
(original)
+++
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/PoolableConnectionFactory.java
Fri Mar 20 17:07:44 2009
@@ -79,6 +79,52 @@
_defaultReadOnly = defaultReadOnly ? Boolean.TRUE : Boolean.FALSE;
_defaultAutoCommit = defaultAutoCommit;
}
+
+/**
+ * Create a new ttPoolableConnectionFactory/tt.
+ * @param connFactory the {...@link ConnectionFactory} from which to
obtain base {...@link Connection}s
+ * @param pool the {...@link ObjectPool} in which to pool those {...@link
Connection}s
+ * @param stmtPoolFactory the {...@link KeyedObjectPoolFactory} to use to
create {...@link KeyedObjectPool}s for pooling {...@link
java.sql.PreparedStatement}s, or ttnull/tt to disable {...@link
java.sql.PreparedStatement} pooling
+ * @param validationQuery a query to use to {...@link #validateObject
validate} {...@link Connection}s. Should return at least one row. Using
ttnull/tt turns off validation.
+ * @param validationQueryTimeout the number of seconds that validation
queries will wait for database response before failing. Use a value less than
or equal to 0 for no timeout.
+ * @param defaultReadOnly the default read only setting for borrowed
{...@link Connection}s
+ * @param defaultAutoCommit the default auto commit setting for returned
svn commit: r756634 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java
Author: sebb
Date: Fri Mar 20 17:10:39 2009
New Revision: 756634
URL: http://svn.apache.org/viewvc?rev=756634view=rev
Log:
LANG-495 - add generics for max and min
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java?rev=756634r1=756633r2=756634view=diff
==
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/ObjectUtils.java
Fri Mar 20 17:10:39 2009
@@ -248,7 +248,7 @@
* liIf both the comparables are null, null is returned.
* /ul
*/
-public static Object min(Comparable c1, Comparable c2) {
+public static T extends Comparable? super T T min(T c1, T c2) {
if (c1 != null c2 != null) {
return c1.compareTo(c2) 1 ? c1 : c2;
} else {
@@ -269,7 +269,7 @@
* liIf both the comparables are null, null is returned.
* /ul
*/
-public static Object max(Comparable c1, Comparable c2) {
+public static T extends Comparable? super T T max(T c1, T c2) {
if (c1 != null c2 != null) {
return c1.compareTo(c2) = 0 ? c1 : c2;
} else {
svn commit: r756756 - /commons/proper/lang/trunk/pom.xml
Author: niallp Date: Fri Mar 20 20:53:38 2009 New Revision: 756756 URL: http://svn.apache.org/viewvc?rev=756756view=rev Log: Add instruction to not export the net.jcip.annotations - this causes the maven-bundle-plugin to output an Ignore-Package statement which I assume will have no negative impact Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=756756r1=756755r2=756756view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Fri Mar 20 20:53:38 2009 @@ -409,6 +409,7 @@ commons.release.version2.4/commons.release.version commons.jira.idLANG/commons.jira.id commons.jira.pid12310481/commons.jira.pid +commons.osgi.import!net.jcip.annotations,*/commons.osgi.import /properties
svn commit: r756817 - /commons/proper/lang/trunk/pom.xml
Author: sebb Date: Fri Mar 20 23:54:37 2009 New Revision: 756817 URL: http://svn.apache.org/viewvc?rev=756817view=rev Log: Revert JCIP depend to compile+optional now fix has been added for OSGI bundling Modified: commons/proper/lang/trunk/pom.xml Modified: commons/proper/lang/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=756817r1=756816r2=756817view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Fri Mar 20 23:54:37 2009 @@ -391,12 +391,11 @@ groupIdnet.jcip/groupId artifactIdjcip-annotations/artifactId version1.0/version +optionaltrue/optional !-- Annotations are only _required_ during a build They are not needed at run-time -Provided means that the dependency is not transitive. -- -scopeprovided/scope /dependency /dependencies
svn commit: r756844 - /commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java
Author: sebb
Date: Sat Mar 21 00:17:43 2009
New Revision: 756844
URL: http://svn.apache.org/viewvc?rev=756844view=rev
Log:
ObjectUtils.max(null,null) requires casts to agree with signature; likewise min
Also use actual Date objects rather than generic Comparable.
Modified:
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java
Modified:
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java?rev=756844r1=756843r2=756844view=diff
==
---
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java
(original)
+++
commons/proper/lang/trunk/src/test/org/apache/commons/lang/ObjectUtilsTest.java
Sat Mar 21 00:17:43 2009
@@ -19,6 +19,7 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.util.Calendar;
+import java.util.Date;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -178,11 +179,11 @@
public void testMax() {
Calendar calendar = Calendar.getInstance();
-Comparable nonNullComparable1 = calendar.getTime();
-Comparable nonNullComparable2 = calendar.getTime();
+Date nonNullComparable1 = calendar.getTime();
+Date nonNullComparable2 = calendar.getTime();
calendar.set( Calendar.YEAR, calendar.get( Calendar.YEAR ) -1 );
-Comparable minComparable = calendar.getTime();
+Date minComparable = calendar.getTime();
assertNotSame( nonNullComparable1, nonNullComparable2 );
@@ -193,16 +194,16 @@
assertSame( nonNullComparable1, ObjectUtils.max( nonNullComparable1,
minComparable ) );
assertSame( nonNullComparable1, ObjectUtils.max( minComparable,
nonNullComparable1 ) );
-assertNull( ObjectUtils.max(null, null) );
+assertNull( ObjectUtils.max((String)null, (String)null) );
}
public void testMin() {
Calendar calendar = Calendar.getInstance();
-Comparable nonNullComparable1 = calendar.getTime();
-Comparable nonNullComparable2 = calendar.getTime();
+Date nonNullComparable1 = calendar.getTime();
+Date nonNullComparable2 = calendar.getTime();
calendar.set( Calendar.YEAR, calendar.get( Calendar.YEAR ) -1 );
-Comparable minComparable = calendar.getTime();
+Date minComparable = calendar.getTime();
assertNotSame( nonNullComparable1, nonNullComparable2 );
@@ -213,6 +214,6 @@
assertSame( minComparable, ObjectUtils.min( nonNullComparable1,
minComparable ) );
assertSame( minComparable, ObjectUtils.min( minComparable,
nonNullComparable1 ) );
-assertNull( ObjectUtils.min(null, null) );
+assertNull( ObjectUtils.min((String)null, (String)null) );
}
}
svn commit: r756852 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
Author: sebb
Date: Sat Mar 21 01:00:21 2009
New Revision: 756852
URL: http://svn.apache.org/viewvc?rev=756852view=rev
Log:
Generic fix
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java?rev=756852r1=756851r2=756852view=diff
==
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
(original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
Sat Mar 21 01:00:21 2009
@@ -241,7 +241,7 @@
for (int i = 0; i array.length; i++) {
Object object = array[i];
if (object instanceof Map.Entry) {
-Map.Entry entry = (Map.Entry) object;
+Map.Entry?,? entry = (Map.Entry?,?) object;
map.put(entry.getKey(), entry.getValue());
} else if (object instanceof Object[]) {
Object[] entry = (Object[]) object;
