svn commit: r884481 - /commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Signal.java
Author: niallp Date: Thu Nov 26 09:50:37 2009 New Revision: 884481 URL: http://svn.apache.org/viewvc?rev=884481&view=rev Log: Set eol-style to native Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Signal.java (props changed) Propchange: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Signal.java -- svn:eol-style = native
svn commit: r884486 - in /commons/proper/lang/trunk/src/test/org/apache/commons/lang: StringEscapeUtilsTest.java time/DateUtilsRoundingTest.java
Author: bayard Date: Thu Nov 26 10:17:31 2009 New Revision: 884486 URL: http://svn.apache.org/viewvc?rev=884486&view=rev Log: Moving 'todo' to 'TODO' to match general style Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java?rev=884486&r1=884485&r2=884486&view=diff == --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringEscapeUtilsTest.java Thu Nov 26 10:17:31 2009 @@ -289,7 +289,7 @@ assertEquals("Β", StringEscapeUtils.escapeHtml4("\u0392")); assertEquals("\u0392", StringEscapeUtils.unescapeHtml4("Β")); -//todo: refine API for escaping/unescaping specific HTML versions +// TODO: refine API for escaping/unescaping specific HTML versions } Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java?rev=884486&r1=884485&r2=884486&view=diff == --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java Thu Nov 26 10:17:31 2009 @@ -36,12 +36,11 @@ * A month with 29 or 30 days will be rounded up from the 16th * A month with 31 days will be rounded up from the 17th * - * @todo Add DateUtils.ceil()-tests if method is available - * * @author Robert Scholte * @since 3.0 * */ +// TODO: Add DateUtils.ceil()-tests if method is available public class DateUtilsRoundingTest extends TestCase { public static Test suite() {
svn commit: r884487 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java
Author: bayard Date: Thu Nov 26 10:23:16 2009 New Revision: 884487 URL: http://svn.apache.org/viewvc?rev=884487&view=rev Log: Fixing javadoc typo Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java?rev=884487&r1=884486&r2=884487&view=diff == --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/concurrent/BackgroundInitializer.java Thu Nov 26 10:23:16 2009 @@ -280,7 +280,7 @@ * method. If a temporary {...@code ExecutorService} is used, it is destroyed * at the end of the task. * - * @param execDestory the {...@code ExecutorService} to be destroyed by the + * @param execDestroy the {...@code ExecutorService} to be destroyed by the * task * @return a task for the background initialization */
svn commit: r884489 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java
Author: bayard Date: Thu Nov 26 10:27:34 2009 New Revision: 884489 URL: http://svn.apache.org/viewvc?rev=884489&view=rev Log: Removing unused imports Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java?rev=884489&r1=884488&r2=884489&view=diff == --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Thu Nov 26 10:27:34 2009 @@ -21,10 +21,6 @@ import org.apache.commons.lang.text.translate.*; -// CsvTranslators -import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.CharUtils; - /** * Escapes and unescapes Strings for * Java, Java Script, HTML and XML.
svn propchange: r884489 - svn:log
Author: bayard Revision: 884489 Modified property: svn:log Modified: svn:log at Thu Nov 26 10:28:57 2009 -- --- svn:log (original) +++ svn:log Thu Nov 26 10:28:57 2009 @@ -1 +1 @@ -Removing unused imports +Removing imports from same package
svn commit: r884490 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java
Author: bayard Date: Thu Nov 26 10:29:33 2009 New Revision: 884490 URL: http://svn.apache.org/viewvc?rev=884490&view=rev Log: Clone the passed in array Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java?rev=884490&r1=884489&r2=884490&view=diff == --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/translate/AggregateTranslator.java Thu Nov 26 10:29:33 2009 @@ -19,6 +19,8 @@ import java.io.IOException; import java.io.Writer; +import org.apache.commons.lang.ArrayUtils; + /** * Executes a sequence of translators one after the other. Execution ends whenever * the first translator consumes codepoints from the input. @@ -36,8 +38,7 @@ * @param translators CharSequenceTranslator array to aggregate */ public AggregateTranslator(CharSequenceTranslator... translators) { -// TODO - copy array to prevent subsequent external changes -this.translators = translators; +this.translators = ArrayUtils.clone(translators); } /**
svn commit: r884491 - in /commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime: ./ io/ platform/windows/ util/
Author: niallp Date: Thu Nov 26 10:30:36 2009 New Revision: 884491 URL: http://svn.apache.org/viewvc?rev=884491&view=rev Log: Remove unused imports Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ByReference.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Const.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ConstPointer.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ConstPointer32.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ConstPointer64.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/DirectBuffer.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/DirectBuffer32.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/DirectBuffer64.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Group.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/GroupIteratorImpl.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/KillConditions.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Library.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Loader.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Main.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Mutex.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/OffsetOf.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Pointer32.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ResourceLimit.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Semaphore.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SharedMemory.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/SignalAction.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/Sizeof.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/User.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/UserIteratorImpl.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/WaitHow.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Directory.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/File.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileInfo.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileInstance.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLock.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLockImpl.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStreamImpl.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMap.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/MemoryMapProvider.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Path.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Pipe.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Reader.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Stream.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/Writer.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/ServiceControl.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/platform/windows/ServiceState.java commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/util/Ascii.java Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ByReference.java URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ByReference.java?rev=884491&r1=884490&r2=884491&view=diff == --- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ByReference.java (original) +++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/ByReference.java Thu Nov 26 10:30:36 2009 @@ -15,7 +15,11 @@ */ package org.apache.commons.runtime; -import java.lang.annotation.*; + +import java.lang.annotation.ElementType; +import java.lan
svn commit: r884492 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Thu Nov 26 10:31:16 2009 New Revision: 884492 URL: http://svn.apache.org/viewvc?rev=884492&view=rev Log: Commenting out javancss report as it errors on our source, adding taglib report, and making findbugs default as I find I need 512m now anyway to build the site 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=884492&r1=884491&r2=884492&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Thu Nov 26 10:31:16 2009 @@ -479,7 +479,6 @@ - org.codehaus.mojo cobertura-maven-plugin @@ -522,9 +520,16 @@ org.codehaus.mojo +taglist-maven-plugin +2.4 + +
svn commit: r884493 - /commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java
Author: bayard Date: Thu Nov 26 10:40:13 2009 New Revision: 884493 URL: http://svn.apache.org/viewvc?rev=884493&view=rev Log: Fixing javadoc Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java?rev=884493&r1=884492&r2=884493&view=diff == --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/time/DateUtilsRoundingTest.java Thu Nov 26 10:40:13 2009 @@ -261,7 +261,7 @@ * Includes rounding to January 1 * * @throws Exception - * @3.0 + * @since 3.0 */ public void testRoundAmPm() throws Exception { final int calendarField = Calendar.AM_PM;
svn commit: r884494 - /commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java
Author: bayard Date: Thu Nov 26 10:42:27 2009 New Revision: 884494 URL: http://svn.apache.org/viewvc?rev=884494&view=rev Log: Removing @author on method (not legal javadoc) and adding an @see to the jira issue Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java?rev=884494&r1=884493&r2=884494&view=diff == --- commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java (original) +++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/RandomStringUtilsTest.java Thu Nov 26 10:42:27 2009 @@ -323,7 +323,8 @@ * Checks if the string got by {...@link RandomStringUtils#random(int)} * can be converted to UTF-8 and back without loss. * - * @author stefanhoe...@fastmail.fm + * @see http://issues.apache.org/jira/browse/LANG-100";>LANG-100 + * * @throws Exception */ public void testLang100() throws Exception {
svn commit: r884496 - /commons/sandbox/runtime/trunk/project.properties
Author: niallp Date: Thu Nov 26 10:45:53 2009 New Revision: 884496 URL: http://svn.apache.org/viewvc?rev=884496&view=rev Log: Remove maven1 properties file Removed: commons/sandbox/runtime/trunk/project.properties
svn commit: r884497 - in /commons/proper/dbcp/trunk: build.properties.sample pom.xml
Author: sebb Date: Thu Nov 26 10:51:05 2009 New Revision: 884497 URL: http://svn.apache.org/viewvc?rev=884497&view=rev Log: Findbugs => 2.1, jta-spec => 1.1.1 Modified: commons/proper/dbcp/trunk/build.properties.sample commons/proper/dbcp/trunk/pom.xml Modified: commons/proper/dbcp/trunk/build.properties.sample URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/build.properties.sample?rev=884497&r1=884496&r2=884497&view=diff == --- commons/proper/dbcp/trunk/build.properties.sample (original) +++ commons/proper/dbcp/trunk/build.properties.sample Thu Nov 26 10:51:05 2009 @@ -46,7 +46,7 @@ commons-logging.jar=${commons-logging.home}/commons-logging-1.1.1.jar # JTA - needed for managed connections -jta-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1/geronimo-jta_1.1_spec-1.1.jar +jta-spec.jar=${repository}/org/apache/geronimo/specs/geronimo-jta_1.1_spec/1.1.1/geronimo-jta_1.1_spec-1.1.1.jar jta-impl.jar=${repository}/org/apache/geronimo/modules/geronimo-transaction/1.2-beta/geronimo-transaction-1.2-beta.jar # JTA dependencies - required so the test cases run Modified: commons/proper/dbcp/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/pom.xml?rev=884497&r1=884496&r2=884497&view=diff == --- commons/proper/dbcp/trunk/pom.xml (original) +++ commons/proper/dbcp/trunk/pom.xml Thu Nov 26 10:51:05 2009 @@ -163,7 +163,7 @@ org.apache.geronimo.specs geronimo-jta_1.1_spec - 1.1 + 1.1.1 true @@ -313,7 +313,7 @@ org.codehaus.mojo findbugs-maven-plugin - 1.2 + 2.1 Normal Default
svn commit: r884498 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java
Author: bayard Date: Thu Nov 26 10:52:59 2009 New Revision: 884498 URL: http://svn.apache.org/viewvc?rev=884498&view=rev Log: Removing broken @see Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java?rev=884498&r1=884497&r2=884498&view=diff == --- commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java (original) +++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/StringEscapeUtils.java Thu Nov 26 10:52:59 2009 @@ -310,7 +310,6 @@ * @param input the String to escape, may be null * @return a new escaped String, null if null string input * - * @see #unescapeHtml(String) * @see http://hotwired.lycos.com/webmonkey/reference/special_characters/";>ISO Entities * @see http://www.w3.org/TR/REC-html32#latin1";>HTML 3.2 Character Entities for ISO Latin-1 * @see http://www.w3.org/TR/REC-html40/sgml/entities.html";>HTML 4.0 Character entity references
svn commit: r884499 - in /commons/sandbox/runtime/trunk: pom.xml src/assembly/ src/assembly/src.xml
Author: niallp Date: Thu Nov 26 10:53:20 2009 New Revision: 884499 URL: http://svn.apache.org/viewvc?rev=884499&view=rev Log: Add source assembly descriptor Added: commons/sandbox/runtime/trunk/src/assembly/ commons/sandbox/runtime/trunk/src/assembly/src.xml (with props) Modified: commons/sandbox/runtime/trunk/pom.xml Modified: commons/sandbox/runtime/trunk/pom.xml URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/pom.xml?rev=884499&r1=884498&r2=884499&view=diff == --- commons/sandbox/runtime/trunk/pom.xml (original) +++ commons/sandbox/runtime/trunk/pom.xml Thu Nov 26 10:53:20 2009 @@ -79,6 +79,17 @@ + + +maven-assembly-plugin + + +src/assembly/src.xml + +gnu + + + Added: commons/sandbox/runtime/trunk/src/assembly/src.xml URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/assembly/src.xml?rev=884499&view=auto == --- commons/sandbox/runtime/trunk/src/assembly/src.xml (added) +++ commons/sandbox/runtime/trunk/src/assembly/src.xml Thu Nov 26 10:53:20 2009 @@ -0,0 +1,40 @@ + + +src + +tar.gz +zip + +${artifactId}-${version}-src + + + +build.properties.default +build.properties.in +build.xml +configure +LICENSE.txt +NOTICE.txt +pom.xml + + + +src + + + Propchange: commons/sandbox/runtime/trunk/src/assembly/src.xml -- svn:eol-style = native Propchange: commons/sandbox/runtime/trunk/src/assembly/src.xml -- svn:keywords = Date Author Id Revision HeadURL
svn commit: r884501 - /commons/proper/lang/trunk/pom.xml
Author: bayard Date: Thu Nov 26 10:56:01 2009 New Revision: 884501 URL: http://svn.apache.org/viewvc?rev=884501&view=rev Log: Updating versions of reports, fixing bugs with Cobertura and JavaNCSS. Checkstyle still not understanding generics, but the 2.4 report errors so needs more investigation before trying that. 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=884501&r1=884500&r2=884501&view=diff == --- commons/proper/lang/trunk/pom.xml (original) +++ commons/proper/lang/trunk/pom.xml Thu Nov 26 10:56:01 2009 @@ -472,7 +472,7 @@ maven-checkstyle-plugin -2.1 +2.3 ${basedir}/checkstyle.xml false @@ -492,7 +492,7 @@ org.codehaus.mojo cobertura-maven-plugin -2.2 +2.3 org.codehaus.mojo @@ -523,13 +523,11 @@ taglist-maven-plugin 2.4 -
svn commit: r884502 - /commons/sandbox/runtime/trunk/
Author: niallp Date: Thu Nov 26 11:00:10 2009 New Revision: 884502 URL: http://svn.apache.org/viewvc?rev=884502&view=rev Log: svn:ignore target Modified: commons/sandbox/runtime/trunk/ (props changed) Propchange: commons/sandbox/runtime/trunk/ -- --- svn:ignore (added) +++ svn:ignore Thu Nov 26 11:00:10 2009 @@ -0,0 +1 @@ +target
svn commit: r884551 - in /commons/sandbox/runtime/trunk/src/main/native/os/win32: fsysrw.c pipe.c
Author: mturk Date: Thu Nov 26 13:19:25 2009 New Revision: 884551 URL: http://svn.apache.org/viewvc?rev=884551&view=rev Log: Fix pipe cleanup Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysrw.c commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysrw.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysrw.c?rev=884551&r1=884550&r2=884551&view=diff == --- commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysrw.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysrw.c Thu Nov 26 13:19:25 2009 @@ -32,6 +32,60 @@ extern int do_lock(acr_file_t *f, DWORD flags); extern int do_unlock(acr_file_t *f); +static DWORD overlapped_wait(acr_file_t *f, DWORD *nbytes) +{ +DWORD ws; +DWORD rc = 0; + +do { +switch (ws = ACR_WaitForObjectOrSignal(f->overlap.hEvent, + f->timeout)) { +case WAIT_IO_COMPLETION: +case WAIT_ABANDONED_0: +case WAIT_ABANDONED_1: +case WAIT_OBJECT_0: +/* Signal event is set. + * Get it's status. + */ +rc = ACR_DeliverSignals(); +break; +case WAIT_OBJECT_1: +/* Operation success */ +rc = 0; +break; +case WAIT_FAILED: +/* We got the error while waiting + */ +rc = ACR_GET_OS_ERROR(); +break; +case WAIT_TIMEOUT: +rc = ACR_TIMEUP; +break; +default: +rc = ACR_EINVAL; +break; +} +} while (rc == ACR_EINTR); + +if (rc) { +/* There is one case that represents entirely + * successful operations, otherwise we will cancel + * the operation in progress. + */ +CancelIo(f->fd); +} +if (!GetOverlappedResult(f->fd, + &f->overlap, + nbytes, + FALSE)) { +rc = GetLastError(); +if (rc == ERROR_IO_INCOMPLETE || +rc == ERROR_OPERATION_ABORTED) +rc = ACR_TIMEUP; +} +return rc; +} + static DWORD overlapped_wait_all(acr_file_t *f, DWORD *nbytes) { DWORD ws; Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c?rev=884551&r1=884550&r2=884551&view=diff == --- commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c Thu Nov 26 13:19:25 2009 @@ -392,7 +392,6 @@ { int rc = 0; int fo; -jobject od; fo = acr_ioh_open(fp, ACR_DT_FILE, 0, file_cleanup); if (fo < 0) { @@ -400,27 +399,17 @@ goto finally; } /* Create File Descriptor Object */ -od = ACR_DescriptorCreate(_E, ACR_DT_FILE, fo, NULL, - descriptor_cleanup); -if (!od) { -rc = ACR_GET_OS_ERROR(); -goto finally; -} -/* Create Pipe object */ -fp->descriptor = (*_E)->NewWeakGlobalRef(_E, *fdo); -*fdo = ACR_NewPipeObject(_E, flags, od, NULL); +*fdo = ACR_DescriptorCreate(_E, ACR_DT_FILE, fo, NULL, +descriptor_cleanup); if (!*fdo) { rc = ACR_GET_OS_ERROR(); goto finally; } -finally: -if (rc) { -if (fp && fp->descriptor) -(*_E)->DeleteWeakGlobalRef(_E, fp->descriptor); -/* ### close the fp */ -x_free(fp); -} +fp->descriptor = (*_E)->NewWeakGlobalRef(_E, *fdo); +finally: +if (rc) +file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); return rc; } @@ -451,25 +440,18 @@ ACR_THROW_IO_IF_ERR(rc); return NULL; } -rc = do_popen(_E, pd[0], flags & ACR_PIPE_RD, &fd[0]); +rc = do_popen(_E, pd[0], flags & ACR_PIPE_RD, &fd[0]); if (rc) { -goto cleanup; +goto finally; } rc = do_popen(_E, pd[1], flags & ACR_PIPE_WR, &fd[1]); if (rc) { -/* ### fd[0] will be closed by GC ? - */ -pd[0] = NULL; -goto cleanup; +ACR_DescriptorCleanup(_E, fd[0]); +goto finally; } -return ACR_NewPipeObject(_E, flags, fd[0], fd[1], NULL); - -cleanup: -if (pd[0]) -file_cleanup(pd[0], ACR_DT_FILE, ACR_IOH_CLEAR); -if (pd[1]) -file_cleanup(pd[1], ACR_DT_FILE, ACR_IOH_CLEAR); +return ACR_NewPipeObject(_E, flags, fd[0], fd[1], pd[0]->name); +finally: ACR_THROW_IO_IF_ERR(rc); return NULL; }
svn commit: r884552 - /commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c
Author: mturk Date: Thu Nov 26 13:21:15 2009 New Revision: 884552 URL: http://svn.apache.org/viewvc?rev=884552&view=rev Log: Fix posix pipe cleanup during creation error Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c?rev=884552&r1=884551&r2=884552&view=diff == --- commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c Thu Nov 26 13:21:15 2009 @@ -200,13 +200,11 @@ finally: if (rc) { -if (fp && fp->descriptor) -(*_E)->DeleteWeakGlobalRef(_E, fp->descriptor); -if (fd >= 0) +if (fp) +file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); +else close(fd); -x_free(fp); } - return rc; } @@ -214,32 +212,25 @@ jint flags) { int rc = 0; -jobject fd[2]; -int pd[2] = { -1, -1 }; +jobject fd[2] = {NULL, NULL }; +int pd[2] = { -1, -1 }; if (pipe(pd) == -1) { ACR_THROW_IO_ERRNO(); return NULL; } -rc = do_popen(_E, pd[0], flags & ACR_PIPE_RD, &fd[0]); +rc = do_popen(_E, pd[0], flags & ACR_PIPE_RD, &fd[0]); if (rc) { -goto cleanup; +goto finally; } rc = do_popen(_E, pd[1], flags & ACR_PIPE_WR, &fd[1]); if (rc) { -/* ### fd[0] will be closed by GC ? - */ -pd[0] = -1; -goto cleanup; +ACR_DescriptorCleanup(_E, fd[0]); +goto finally; } return ACR_NewPipeObject(_E, flags, fd[0], fd[1], NULL); -cleanup: -if (pd[0] != -1) -close(pd[0]); -if (pd[1] != -1) -close(pd[1]); - +finally: ACR_THROW_IO_IF_ERR(rc); return NULL; }
svn commit: r884553 - /commons/sandbox/runtime/trunk/README.txt
Author: mturk Date: Thu Nov 26 13:34:48 2009 New Revision: 884553 URL: http://svn.apache.org/viewvc?rev=884553&view=rev Log: Add some README Added: commons/sandbox/runtime/trunk/README.txt (with props) Added: commons/sandbox/runtime/trunk/README.txt URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/README.txt?rev=884553&view=auto == --- commons/sandbox/runtime/trunk/README.txt (added) +++ commons/sandbox/runtime/trunk/README.txt Thu Nov 26 13:34:48 2009 @@ -0,0 +1,50 @@ +Hello, my name is Mladen Turk and this is my sandbox. + +I am using this sandbox to create a new native based around the +modern OS features. If you would like to help in that effort, please +feel free to introduce yourself on the developer mailing list +(d...@commons.apache.org). Commit access is earned by contributing to +the Commons Project, signing and submitting an Apache contributors +license agreement (CLA), and asking me for commit access. + + = + SANDBOX RULES + = + +Everything committed is redistributable as a whole under the +Apache License, version 2.0, even if individual components are +under other licenses. + +Don't knock over my castle. If you want to create your own +castle, then ask for your own sandbox (I'll copy your castle +later if it looks better than mine). + +If you want to add to my castle, please tell us what you want to +add and how you intend to do it (even if it is only vaguely formed +in your mind). It is quite likely that we may have already thought +of doing the same thing and already have plans in mind, though I am +usually happy to let others do the work with me. In fact, I do my +best work when I think of it as helping someone else do their work, +so I am far more productive as a collaborator than if I am just +sitting in a corner by myself. So, please, go ahead and ask. + +If you think my castle is ugly, likely to fall down under its +own weight, or would be better architected in some other fashion, +then please speak up. There is no faster way to earn commit access +than to show that you've thought carefully about the problem and +discovered something I didn't, tested something that I was too lazy +to test, or know something about some critical platform that +I don't have access to myself. + +Most of all, HAVE FUN. This is not supposed to be "work" even +if we happen to be paid by someone to work on it. This creative +tinkering with software is fun to do when you keep a good sense +of humor and a smile on your face. If you want to get angry and +take it out on someone, then go somewhere else. I reserve the +right to kick anyone out of my sandbox if they start crying, or +make me want to cry because of what they've done or said. +Please keep that in mind at all times. + +Cheers, + +Mladen Propchange: commons/sandbox/runtime/trunk/README.txt -- svn:eol-style = native
svn commit: r884603 - in /commons/sandbox/runtime/trunk/src/main/native/os: unix/pipe.c win32/pipe.c
Author: mturk Date: Thu Nov 26 15:46:08 2009 New Revision: 884603 URL: http://svn.apache.org/viewvc?rev=884603&view=rev Log: Do not leak IOH descriptors Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c?rev=884603&r1=884602&r2=884603&view=diff == --- commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/unix/pipe.c Thu Nov 26 15:46:08 2009 @@ -186,7 +186,8 @@ fo = acr_ioh_open(fp, ACR_DT_FILE, 0, file_cleanup); if (fo < 0) { rc = ACR_GET_OS_ERROR(); -goto finally; +file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); +return rc; } /* Create File Descriptor Object */ *fdo = ACR_DescriptorCreate(_E, ACR_DT_FILE, fo, NULL, @@ -201,7 +202,7 @@ finally: if (rc) { if (fp) -file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); +acr_ioh_clear(fo); else close(fd); } Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c?rev=884603&r1=884602&r2=884603&view=diff == --- commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c (original) +++ commons/sandbox/runtime/trunk/src/main/native/os/win32/pipe.c Thu Nov 26 15:46:08 2009 @@ -396,7 +396,8 @@ fo = acr_ioh_open(fp, ACR_DT_FILE, 0, file_cleanup); if (fo < 0) { rc = ACR_GET_OS_ERROR(); -goto finally; +file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); +return rc; } /* Create File Descriptor Object */ *fdo = ACR_DescriptorCreate(_E, ACR_DT_FILE, fo, NULL, @@ -409,7 +410,7 @@ finally: if (rc) -file_cleanup(fp, ACR_DT_FILE, ACR_IOH_CLEAR); +acr_ioh_clear(fo); return rc; }
svn commit: r884650 [2/2] - in /commons/proper/jexl/trunk: ./ src/main/java/org/apache/commons/jexl2/ src/main/java/org/apache/commons/jexl2/context/ src/main/java/org/apache/commons/jexl2/scripting/
Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java?rev=884650&r1=884649&r2=884650&view=diff == --- commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java (original) +++ commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MapLiteralTest.java Thu Nov 26 17:17:42 2009 @@ -30,7 +30,7 @@ public void testLiteralWithStrings() throws Exception { Expression e = JEXL.createExpression( "{ 'foo' : 'bar' }" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertEquals( Collections.singletonMap( "foo", "bar" ), o ); @@ -38,7 +38,7 @@ public void testLiteralWithMultipleEntries() throws Exception { Expression e = JEXL.createExpression( "{ 'foo' : 'bar', 'eat' : 'food' }" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Map expected = new HashMap(); expected.put( "foo", "bar" ); @@ -50,7 +50,7 @@ public void testLiteralWithNumbers() throws Exception { Expression e = JEXL.createExpression( "{ 5 : 10 }" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertEquals( Collections.singletonMap( new Integer( 5 ), new Integer( 10 ) ), o ); @@ -66,7 +66,7 @@ o = e.evaluate(jc); assertEquals(new Integer(40), o); -jc.getVars().put("i", Integer.valueOf(5)); +jc.setJexlVariable("i", Integer.valueOf(5)); e = JEXL.createExpression("m[i]"); o = e.evaluate(jc); assertEquals("fifty", o); @@ -85,12 +85,12 @@ o = e.evaluate(jc); assertEquals("SEVEN", o); -jc.getVars().put("k", Integer.valueOf(7)); +jc.setJexlVariable("k", Integer.valueOf(7)); e = JEXL.createExpression("m[k]"); o = e.evaluate(jc); assertEquals("SEVEN", o); -jc.getVars().put("k", "7"); +jc.setJexlVariable("k", "7"); e = JEXL.createExpression("m[k]"); o = e.evaluate(jc); assertEquals("seven", o); @@ -98,7 +98,7 @@ public void testSizeOfSimpleMapLiteral() throws Exception { Expression e = JEXL.createExpression( "size({ 'foo' : 'bar' })" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertEquals( new Integer( 1 ), o ); @@ -106,7 +106,7 @@ public void testCallingMethodsOnNewMapLiteral() throws Exception { Expression e = JEXL.createExpression( "size({ 'foo' : 'bar' }.values())" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertEquals( new Integer( 1 ), o ); @@ -114,7 +114,7 @@ public void testNotEmptySimpleMapLiteral() throws Exception { Expression e = JEXL.createExpression( "empty({ 'foo' : 'bar' })" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertFalse( ( (Boolean) o ).booleanValue() ); @@ -122,11 +122,11 @@ public void testMapMapLiteral() throws Exception { Expression e = JEXL.createExpression( "{'foo' : { 'inner' : 'bar' }}" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertNotNull(o); -jc.getVars().put("outer", o); +jc.setJexlVariable("outer", o); e = JEXL.createExpression("outer.foo.inner"); o = e.evaluate( jc ); assertEquals( "bar", o ); @@ -134,11 +134,11 @@ public void testMapArrayLiteral() throws Exception { Expression e = JEXL.createExpression( "{'foo' : [ 'inner' , 'bar' ]}" ); -JexlContext jc = JexlHelper.createContext(); +JexlContext jc = new JexlContext.Mapped(); Object o = e.evaluate( jc ); assertNotNull(o); -jc.getVars().put("outer", o); +jc.setJexlVariable("outer", o); e = JEXL.createExpression("outer.foo.1"); o = e.evaluate( jc ); assertEquals( "bar", o ); Modified: commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java URL: http://svn.apache.org/viewvc/commons/proper/jexl/trunk/src/test/java/org/apache/commons/jexl2/MethodTest.java?rev=884650&r1=884649&r2=884650&view=diff == --- commons/proper/jexl/trunk/src/test/java/o
svn commit: r884733 - /commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/
Author: niallp Date: Fri Nov 27 01:08:43 2009 New Revision: 884733 URL: http://svn.apache.org/viewvc?rev=884733&view=rev Log: Create a test branch to try out the DBCP 1.3-JDBC3 proposal Added: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/ - copied from r884732, commons/proper/dbcp/trunk/
svn commit: r884734 - /commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml
Author: niallp Date: Fri Nov 27 01:11:31 2009 New Revision: 884734 URL: http://svn.apache.org/viewvc?rev=884734&view=rev Log: Add ant step to comment out JDBC 4 methods Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml?rev=884734&r1=884733&r2=884734&view=diff == --- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml (original) +++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/build.xml Fri Nov 27 01:11:31 2009 @@ -157,6 +157,19 @@ + + + + + + + + + + + + +
svn commit: r884736 - in /commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src: java/org/apache/commons/dbcp/ java/org/apache/commons/dbcp/cpdsadapter/ java/org/apache/commons/dbcp/datasources/ java/
Author: niallp Date: Fri Nov 27 01:13:54 2009 New Revision: 884736 URL: http://svn.apache.org/viewvc?rev=884736&view=rev Log: Comment out JDBC 4 methods Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingConnection.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingDatabaseMetaData.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingPreparedStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingResultSet.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/PoolingDataSource.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/cpdsadapter/PooledConnectionImpl.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/datasources/InstanceKeyDataSource.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/managed/BasicManagedDataSource.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TestDelegatingDatabaseMetaData.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterCallableStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterConnection.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterDatabaseMetaData.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterPreparedStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterResultSet.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/TesterStatement.java commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/test/org/apache/commons/dbcp/datasources/PooledConnectionProxy.java Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java?rev=884736&r1=884735&r2=884736&view=diff == --- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java (original) +++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/BasicDataSource.java Fri Nov 27 01:13:54 2009 @@ -1322,7 +1322,7 @@ return closed; } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public boolean isWrapperFor(Class iface) throws SQLException { return false; } @@ -1330,7 +1330,7 @@ public T unwrap(Class iface) throws SQLException { throw new SQLException("BasicDataSource is not a wrapper."); } -/* JDBC_4_ANT_KEY_END */ +*/ // -- Protected Methods Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java?rev=884736&r1=884735&r2=884736&view=diff == --- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java (original) +++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/src/java/org/apache/commons/dbcp/DelegatingCallableStatement.java Fri Nov 27 01:13:54 2009 @@ -32,11 +32,11 @@ import java.io.InputStream; import java.io.Reader; import java.sql.SQLException; -/* JDBC_4_ANT_KEY_BEGIN */ +/* import java.sql.NClob; import java.sql.RowId; import java.sql.SQLXML; -/* JDBC_4_ANT_KEY_END */ +*/ /** * A base delegating implementation of {...@link CallableStatement}. @@ -329,7 +329,7 @@ public URL getURL(String parameterName) throws SQLException { checkOpen(); try { return ((CallableStatement)_stmt).getURL(parameterName); } catch (SQLException e) { handleException(e); return null; } } -/* JDBC_4_ANT_KEY_BEGIN */ +/* public RowId getRowId(int parameterIndex) throws SQLException { checkOpen(); @@ -660,5 +660,5 @@ handleException(e); } } -/* JDBC_4_ANT_KEY_END */ +*/ } Modified: commons/proper/dbcp/bra
svn commit: r884737 - /commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml
Author: niallp Date: Fri Nov 27 01:14:36 2009 New Revision: 884737 URL: http://svn.apache.org/viewvc?rev=884737&view=rev Log: Change source/target JDK to 1.4 Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml Modified: commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml URL: http://svn.apache.org/viewvc/commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml?rev=884737&r1=884736&r2=884737&view=diff == --- commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml (original) +++ commons/proper/dbcp/branches/TEST_DBCP_1_3_BRANCH/pom.xml Fri Nov 27 01:14:36 2009 @@ -215,8 +215,8 @@ -1.5 -1.5 +1.4 +1.4 dbcp 1.2.2