svn commit: r752029 - /commons/sandbox/compress/trunk/NOTICE.txt
Author: bodewig Date: Tue Mar 10 09:34:08 2009 New Revision: 752029 URL: http://svn.apache.org/viewvc?rev=752029view=rev Log: standard NOTICE header, a bit of whitespace Modified: commons/sandbox/compress/trunk/NOTICE.txt Modified: commons/sandbox/compress/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/NOTICE.txt?rev=752029r1=752028r2=752029view=diff == --- commons/sandbox/compress/trunk/NOTICE.txt (original) +++ commons/sandbox/compress/trunk/NOTICE.txt Tue Mar 10 09:34:08 2009 @@ -1,10 +1,21 @@ + = + == NOTICE file corresponding to the section 4 d of== + == the Apache License, Version 2.0, == + == in this case for the Apache Commons Compress distribution. == + = + Apache Commons Compress Copyright 2002-2009 The Apache Software Foundation This product includes software developed by The Apache Software Foundation (http://www.apache.org/). -Original BZip2 classes contributed by Keiron Liddle kei...@aftexsw.com, Aftex Software to the Apache Ant project +Original BZip2 classes contributed by Keiron Liddle +kei...@aftexsw.com, Aftex Software to the Apache Ant project + Original Tar classes from contributors of the Apache Ant project + Original Zip classes from contributors of the Apache Ant project -Original CPIO classes contributed by Markus Kuss and the jRPM project (jrpm.sourceforge.net) + +Original CPIO classes contributed by Markus Kuss and the jRPM project +(jrpm.sourceforge.net)
svn commit: r752110 - /commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java
Author: sebb Date: Tue Mar 10 13:38:32 2009 New Revision: 752110 URL: http://svn.apache.org/viewvc?rev=752110view=rev Log: Javadoc fixes Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java Modified: commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java URL: http://svn.apache.org/viewvc/commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java?rev=752110r1=752109r2=752110view=diff == --- commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java (original) +++ commons/proper/net/branches/NET_2_0/src/main/java/org/apache/commons/net/util/SubnetUtils.java Tue Mar 10 13:38:32 2009 @@ -21,7 +21,7 @@ /** * A class that performs some subnet calculations given a network address and a subnet mask. - * @see http://www.faqs.org/rfcs/rfc1519.html + * @see http://www.faqs.org/rfcs/rfc1519.html; * @author rwins...@apache.org * @since 2.0 */ @@ -47,7 +47,7 @@ } /** - * Constructor that takes two dotted decimal addresses. + * Constructor that takes a dotted decimal address and a dotted decimal mask. * @param address An IP address, e.g. 192.168.0.1 * @param mask A dotted decimal netmask e.g. 255.255.0.0 */
svn commit: r752113 - /commons/sandbox/compress/trunk/NOTICE.txt
Author: bodewig Date: Tue Mar 10 13:58:17 2009 New Revision: 752113 URL: http://svn.apache.org/viewvc?rev=752113view=rev Log: remove unneeded boilerplate text Modified: commons/sandbox/compress/trunk/NOTICE.txt Modified: commons/sandbox/compress/trunk/NOTICE.txt URL: http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/NOTICE.txt?rev=752113r1=752112r2=752113view=diff == --- commons/sandbox/compress/trunk/NOTICE.txt (original) +++ commons/sandbox/compress/trunk/NOTICE.txt Tue Mar 10 13:58:17 2009 @@ -1,9 +1,3 @@ - = - == NOTICE file corresponding to the section 4 d of== - == the Apache License, Version 2.0, == - == in this case for the Apache Commons Compress distribution. == - = - Apache Commons Compress Copyright 2002-2009 The Apache Software Foundation
svn commit: r752329 - /commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Author: dfabulich
Date: Wed Mar 11 00:56:31 2009
New Revision: 752329
URL: http://svn.apache.org/viewvc?rev=752329view=rev
Log: (empty)
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Modified:
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java?rev=752329r1=752328r2=752329view=diff
==
---
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
(original)
+++
commons/proper/dbutils/trunk/src/test/org/apache/commons/dbutils/QueryRunnerTest.java
Wed Mar 11 00:56:31 2009
@@ -59,7 +59,7 @@
runner.fillStatement(stmt, new Object[] { null, null });
}
-private PreparedStatement fakeFillablePreparedStatement(final boolean
simulateOracle, final int[] types) {
+private PreparedStatement fakeFillablePreparedStatement(final boolean
simulateOracle, final int[] types) throws NoSuchMethodException {
// prepare a mock ParameterMetaData and a mock PreparedStatement to
return the PMD
final ParameterMetaData pmd =
mockParameterMetaData(simulateOracle,types);
InvocationHandler stmtHandler = new InvocationHandler() {
@@ -153,8 +153,7 @@
public void testFillStatementWithBeanErrorReadMethodPrivate() throws
Exception {
getPrivate();
-Method getPrivate = getClass().getDeclaredMethod(getPrivate, new
Class[0]);
-PropertyDescriptor badReadMethod = new
PropertyDescriptor(throwsException, getPrivate, null);
+PropertyDescriptor badReadMethod = new BadPrivatePropertyDescriptor();
PropertyDescriptor properties[] = new PropertyDescriptor[] {
badReadMethod };
try {
runner.fillStatementWithBean(stmt, this, properties);
@@ -162,6 +161,19 @@
} catch (RuntimeException expected) {}
}
+class BadPrivatePropertyDescriptor extends PropertyDescriptor {
+Method getPrivate;
+BadPrivatePropertyDescriptor() throws Exception {
+super(throwsException, QueryRunnerTest.class,
getThrowsException, null);
+getPrivate = QueryRunnerTest.class.getDeclaredMethod(getPrivate,
new Class[0]);
+}
+
+public synchronized Method getReadMethod() {
+if (getPrivate == null) return super.getReadMethod();
+return getPrivate;
+}
+}
+
public void testRethrowNullMessage() {
// DBUTILS-40
SQLException sqe = new SQLException((String)null);
svn commit: r752351 - /commons/proper/cli/branches/cli-1.x/pom.xml
Author: bayard
Date: Wed Mar 11 02:27:44 2009
New Revision: 752351
URL: http://svn.apache.org/viewvc?rev=752351view=rev
Log:
Moving to JDK 1.4.
Modified:
commons/proper/cli/branches/cli-1.x/pom.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=752351r1=752350r2=752351view=diff
==
--- commons/proper/cli/branches/cli-1.x/pom.xml (original)
+++ commons/proper/cli/branches/cli-1.x/pom.xml Wed Mar 11 02:27:44 2009
@@ -128,8 +128,8 @@
/dependencies
properties
-maven.compile.source1.3/maven.compile.source
-maven.compile.target1.3/maven.compile.target
+maven.compile.source1.4/maven.compile.source
+maven.compile.target1.4/maven.compile.target
commons.componentidcli/commons.componentid
commons.release.version1.2/commons.release.version
commons.release.namecommons-cli-${commons.release.version}/commons.release.name
svn commit: r752352 - /commons/proper/cli/branches/cli-1.x/pom.xml
Author: bayard Date: Wed Mar 11 02:28:03 2009 New Revision: 752352 URL: http://svn.apache.org/viewvc?rev=752352view=rev Log: 6th attempt lucky? Modified: commons/proper/cli/branches/cli-1.x/pom.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=752352r1=752351r2=752352view=diff == --- commons/proper/cli/branches/cli-1.x/pom.xml (original) +++ commons/proper/cli/branches/cli-1.x/pom.xml Wed Mar 11 02:28:03 2009 @@ -138,7 +138,7 @@ commons.jira.idCLI/commons.jira.id commons.jira.pid12310463/commons.jira.pid !-- The RC version used in the staging repository URL. -- -commons.rc.versionRC5/commons.rc.version +commons.rc.versionRC6/commons.rc.version /properties build
svn commit: r752353 - /commons/proper/cli/tags/cli-1.2-RC6/
Author: bayard Date: Wed Mar 11 02:28:29 2009 New Revision: 752353 URL: http://svn.apache.org/viewvc?rev=752353view=rev Log: Tagging RC6 of CLI-1.2 Added: commons/proper/cli/tags/cli-1.2-RC6/ - copied from r752352, commons/proper/cli/branches/cli-1.x/
svn commit: r752367 - in /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils: BasicRowProcessor.java QueryLoader.java ResultSetIterator.java
Author: dfabulich
Date: Wed Mar 11 04:44:33 2009
New Revision: 752367
URL: http://svn.apache.org/viewvc?rev=752367view=rev
Log:
Incorporating sebb's dbutils.patch for DBUTILS-51.
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/BasicRowProcessor.java
Wed Mar 11 04:44:33 2009
@@ -60,7 +60,7 @@
/**
* Use this to process beans.
*/
-private BeanProcessor convert = null;
+private final BeanProcessor convert;
/**
* BasicRowProcessor constructor. Bean processing defaults to a
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/QueryLoader.java
Wed Mar 11 04:44:33 2009
@@ -46,7 +46,7 @@
/**
* Maps query set names to Maps of their queries.
*/
-private Map queries = new HashMap();
+private final Map queries = new HashMap();
/**
* QueryLoader constructor.
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java?rev=752367r1=752366r2=752367view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/ResultSetIterator.java
Wed Mar 11 04:44:33 2009
@@ -37,19 +37,19 @@
/**
* The wrapped codeResultSet/code.
*/
-private ResultSet rs = null;
+private final ResultSet rs;
/**
* The processor to use when converting a row into an Object[].
*/
-private RowProcessor convert = new BasicRowProcessor();
+private final RowProcessor convert;
/**
* Constructor for ResultSetIterator.
* @param rs Wrap this codeResultSet/code in an codeIterator/code.
*/
public ResultSetIterator(ResultSet rs) {
-this.rs = rs;
+this(rs , new BasicRowProcessor());
}
/**
svn commit: r752369 - /commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Author: dfabulich
Date: Wed Mar 11 04:45:21 2009
New Revision: 752369
URL: http://svn.apache.org/viewvc?rev=752369view=rev
Log:
Applying sebb's KeyedHandler.patch from DBUTILS-51
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Modified:
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
URL:
http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java?rev=752369r1=752368r2=752369view=diff
==
---
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
(original)
+++
commons/proper/dbutils/trunk/src/java/org/apache/commons/dbutils/handlers/KeyedHandler.java
Wed Mar 11 04:45:21 2009
@@ -63,25 +63,25 @@
* The RowProcessor implementation to use when converting rows
* into Objects.
*/
-protected RowProcessor convert = ArrayHandler.ROW_PROCESSOR;
+protected final RowProcessor convert;
/**
* The column index to retrieve key values from. Defaults to 1.
*/
-protected int columnIndex = 1;
+protected final int columnIndex;
/**
* The column name to retrieve key values from. Either columnName or
* columnIndex will be used but never both.
*/
-protected String columnName = null;
+protected final String columnName;
/**
* Creates a new instance of KeyedHandler. The value of the first column
* of each row will be a key in the Map.
*/
public KeyedHandler() {
-super();
+this(ArrayHandler.ROW_PROCESSOR, 1, null);
}
/**
@@ -92,8 +92,7 @@
* to use when converting rows into Maps
*/
public KeyedHandler(RowProcessor convert) {
-super();
-this.convert = convert;
+this(convert, 1, null);
}
/**
@@ -103,8 +102,7 @@
* retrieved from the column at this index.
*/
public KeyedHandler(int columnIndex) {
-super();
-this.columnIndex = columnIndex;
+this(ArrayHandler.ROW_PROCESSOR, columnIndex, null);
}
/**
@@ -114,7 +112,15 @@
* retrieved from the column with this name.
*/
public KeyedHandler(String columnName) {
+this(ArrayHandler.ROW_PROCESSOR, 1, columnName);
+}
+
+// Helper
+private KeyedHandler(RowProcessor convert, int columnIndex,
+String columnName) {
super();
+this.convert = convert;
+this.columnIndex = columnIndex;
this.columnName = columnName;
}
svn commit: r752371 - /commons/proper/dbutils/trunk/xdocs/changes.xml
Author: dfabulich Date: Wed Mar 11 04:52:50 2009 New Revision: 752371 URL: http://svn.apache.org/viewvc?rev=752371view=rev Log: Added DBUTILS-51 to changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml Modified: commons/proper/dbutils/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/xdocs/changes.xml?rev=752371r1=752370r2=752371view=diff == --- commons/proper/dbutils/trunk/xdocs/changes.xml (original) +++ commons/proper/dbutils/trunk/xdocs/changes.xml Wed Mar 11 04:52:50 2009 @@ -39,6 +39,9 @@ /properties body release version=1.2 date=2009-03-06 description=Another round of fixes; deprecates methods in preparation for varargs in java5 + action dev=sebb type=update issue=DBUTILS-51 +Made numerous private instance members final to guarantee thread safety; changed protected member of KeyedHandler to final + /action action dev=bayard type=remove Remove old Maven1/Ant build scripts /action
svn commit: r752373 - /commons/proper/dbutils/tags/DBUTILS_1_2/
Author: dfabulich Date: Wed Mar 11 04:55:01 2009 New Revision: 752373 URL: http://svn.apache.org/viewvc?rev=752373view=rev Log: Deleting tag in preparation for RC2 Removed: commons/proper/dbutils/tags/DBUTILS_1_2/
svn commit: r752374 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Mar 11 04:58:50 2009 New Revision: 752374 URL: http://svn.apache.org/viewvc?rev=752374view=rev Log: [maven-release-plugin] prepare release DBUTILS_1_2 Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=752374r1=752373r2=752374view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Mar 11 04:58:50 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2-SNAPSHOT/version + version1.2/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection -urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection + urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url /scm developers
svn commit: r752376 - /commons/proper/dbutils/trunk/pom.xml
Author: dfabulich Date: Wed Mar 11 04:58:58 2009 New Revision: 752376 URL: http://svn.apache.org/viewvc?rev=752376view=rev Log: [maven-release-plugin] prepare for next development iteration Modified: commons/proper/dbutils/trunk/pom.xml Modified: commons/proper/dbutils/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbutils/trunk/pom.xml?rev=752376r1=752375r2=752376view=diff == --- commons/proper/dbutils/trunk/pom.xml [utf-8] (original) +++ commons/proper/dbutils/trunk/pom.xml [utf-8] Wed Mar 11 04:58:58 2009 @@ -24,7 +24,7 @@ modelVersion4.0.0/modelVersion groupIdcommons-dbutils/groupId artifactIdcommons-dbutils/artifactId - version1.2/version + version1.3-SNAPSHOT/version nameCommons DbUtils/name inceptionYear2002/inceptionYear @@ -38,9 +38,9 @@ /issueManagement scm - connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/connection - developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/tags/DBUTILS_1_2/developerConnection - urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/tags/DBUTILS_1_2/url + connectionscm:svn:http://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/connection + developerConnectionscm:svn:https://svn.apache.org/repos/asf/commons/proper/dbutils/trunk/developerConnection +urlhttp://svn.apache.org/viewvc/commons/proper/dbutils/trunk/url /scm developers
