Nabble - Commons - Dev

svn commit: r882855 - /commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java

2009-11-21T00:08:53Z

Author: bayard
Date: Sat Nov 21 08:08:52 2009
New Revision: 882855

URL: http://svn.apache.org/viewvc?rev=882855&view=rev
Log:
Adding a char Range test

Modified:
commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java?rev=882855&r1=882854&r2=882855&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java Sat Nov 21 08:08:52 2009
@@ -62,6 +62,13 @@
Range.between(c, c);
}

+ // --------------------------------------------------------------------------
+
+ public void testRangeOfChars() {
+ Range<Character> chars = Range.between('a', 'z');
+ assertTrue(chars.contains('b'));
+ assertFalse(chars.contains('B'));
+ }

// --------------------------------------------------------------------------

svn commit: r882854 - in /commons/proper/lang/trunk/src: java/org/apache/commons/lang/Range.java test/org/apache/commons/lang/RangeTest.java

2009-11-21T00:05:56Z

Author: bayard
Date: Sat Nov 21 08:05:55 2009
New Revision: 882854

URL: http://svn.apache.org/viewvc?rev=882854&view=rev
Log:
Switched to static builder methods, allowing two of the constructors to restrict T to Comparables, and removed javadoc that discussed subclasses optimising methods

Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java

Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java?rev=882854&r1=882853&r2=882854&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java (original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java Sat Nov 21 08:05:55 2009
@@ -45,9 +45,8 @@
* @throws IllegalArgumentException if the value is <code>null</code>
* @throws ClassCastException if the value is not Comparable
*/
- // TODO: Ideally the ClassCastException would be compile-time via generics
- public Range(T element) {
- this( element, element);
+ public static <T extends Comparable> Range is(T element) {
+ return new Range(element, element, ComparableComparator.INSTANCE);
}

/**
@@ -64,9 +63,8 @@
* @throws IllegalArgumentException if either value is <code>null</code>
* @throws ClassCastException if either value is not Comparable
*/
- // TODO: Ideally the ClassCastException would be compile-time via generics
- public Range(T element1, T element2) {
- this( element1, element2, ComparableComparator.INSTANCE);
+ public static <T extends Comparable> Range between(T element1, T element2) {
+ return new Range( element1, element2, ComparableComparator.INSTANCE);
}

/**
@@ -79,8 +77,8 @@
* @param c comparator to be used
* @throws IllegalArgumentException if the value is <code>null</code>
*/
- public Range(T element, Comparator c) {
- this(element, element, c);
+ public static <T> Range is(T element, Comparator c) {
+ return new Range(element, element, c);
}

/**
@@ -97,7 +95,11 @@
* @param c comparator to be used
* @throws IllegalArgumentException if either value is <code>null</code>
*/
- public Range(T element1, T element2, Comparator c) {
+ public static <T> Range between(T element1, T element2, Comparator c) {
+ return new Range(element1, element2, c);
+ }
+
+ private Range(T element1, T element2, Comparator c) {
if(element1 == null || element2 == null) {
throw new IllegalArgumentException("Elements in a range must not be null: element1=" +
element1 + ", element2=" + element2);
@@ -233,15 +235,8 @@
/**
* Tests whether the specified range occurs entirely within this range.
*
- * The exact comparison implementation varies by subclass. It is
- * intended that an <code>int</code> specific subclass will compare using
- * <code>int</code> comparison.
- *
* <code>null</code> is handled and returns <code>false</code>.
*
- * This implementation uses the {@link #contains(Object)} method.
- * Subclasses may be able to optimise this.
- *
* @param range the range to test, may be <code>null</code>
* @return <code>true</code> if the specified range occurs entirely within
* this range; otherwise, <code>false</code>
@@ -258,16 +253,8 @@
/**
* Tests whether the specified range overlaps with this range.
*
- * The exact comparison implementation varies by subclass. It is
- * intended that an <code>int</code> specific subclass will compare using
- * <code>int</code> comparison.
- *
* <code>null</code> is handled and returns <code>false</code>.
*
- * This implementation uses the {@link #contains(Object)} and
- * {@link #containsRange(Range)} methods.
- * Subclasses may be able to optimise this.
- *
* @param range the range to test, may be <code>null</code>
* @return <code>true</code> if the specified range overlaps with this
* range; otherwise, <code>false</code>
@@ -290,10 +277,6 @@
*
* To be equal, the class, minimum and maximum must be equal.
*
- * This implementation uses the {@link #getMinimum()} and
- * {@link #getMaximum()} methods.
- * Subclasses may be able to optimise this.
- *
* @param obj the reference object with which to compare
* @return <code>true</code> if this object is equal
*/
@@ -313,10 +296,6 @@
/**
* Gets a hashCode for the range.
*
- * This implementation uses the {@link #getMinimum()} and
- * {@link #getMaximum()} methods.
- * Subclasses may be able to optimise this.
- *
* @return a hash code value for this object
*/
@Override
@@ -333,10 +312,6 @@
*
* The format of the String is 'Range[min,max]'.
*
- * This implementation uses the {@link #getMinimum()} and
- * {@link #getMaximum()} methods.
- * Subclasses may be able to optimise this.
- *
* @return the <code>String</code> representation of this range
*/
@Override

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java?rev=882854&r1=882853&r2=882854&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java Sat Nov 21 08:05:55 2009
@@ -39,34 +39,30 @@

@Override
public void setUp() {
- byteRange = new Range((byte) 0, (byte) 5);
- byteRange2 = new Range((byte) 0, (byte) 5);
- byteRange3 = new Range((byte) 0, (byte) 10);
-
- intRange = new Range<Integer>((int) 10, (int) 20);
- longRange = new Range<Long>((long) 10, (long) 20);
- floatRange = new Range<Float>((float) 10, (float) 20);
- doubleRange = new Range<Double>((double) 10, (double) 20);
+ byteRange = Range.between((byte) 0, (byte) 5);
+ byteRange2 = Range.between((byte) 0, (byte) 5);
+ byteRange3 = Range.between((byte) 0, (byte) 10);
+
+ intRange = Range.between((int) 10, (int) 20);
+ longRange = Range.between((long) 10, (long) 20);
+ floatRange = Range.between((float) 10, (float) 20);
+ doubleRange = Range.between((double) 10, (double) 20);
}

// --------------------------------------------------------------------------

public void testComparableConstructors() {
- try {
- Range range = new Range(new Object());
- fail("IllegalArgumentException expected");
- } catch(ClassCastException cce) {
- // expected
- }
-
- try {
- Range range = new Range(new Object(), new Object());
- fail("ClassCastException expected");
- } catch(ClassCastException cce) {
- // expected
- }
+ Comparable c =
+ new Comparable() {
+ public int compareTo(Object other) {
+ return 1;
+ }
+ };
+ Range.is(c);
+ Range.between(c, c);
}

+
// --------------------------------------------------------------------------

public void testEqualsObject() {
@@ -95,7 +91,7 @@
String str = intRange.toString();
assertEquals("Range[10,20]", str);
// assertSame(str, intRange.toString()); // no longer passes - does it matter?
- assertEquals("Range[-20,-10]", new Range<Integer>(-20, -10).toString());
+ assertEquals("Range[-20,-10]", Range.between(-20, -10).toString());
}

// --------------------------------------------------------------------------
@@ -167,29 +163,29 @@
assertFalse(intRange.containsRange(null));

// easy inside range
- assertTrue(intRange.containsRange(new Range(12, 18)));
+ assertTrue(intRange.containsRange(Range.between(12, 18)));

// outside range on each side
- assertFalse(intRange.containsRange(new Range(32, 45)));
- assertFalse(intRange.containsRange(new Range(2, 8)));
+ assertFalse(intRange.containsRange(Range.between(32, 45)));
+ assertFalse(intRange.containsRange(Range.between(2, 8)));

// equals range
- assertTrue(intRange.containsRange(new Range(10, 20)));
+ assertTrue(intRange.containsRange(Range.between(10, 20)));

// overlaps
- assertFalse(intRange.containsRange(new Range(9, 14)));
- assertFalse(intRange.containsRange(new Range(16, 21)));
+ assertFalse(intRange.containsRange(Range.between(9, 14)));
+ assertFalse(intRange.containsRange(Range.between(16, 21)));

// touches lower boundary
- assertTrue(intRange.containsRange(new Range(10, 19)));
- assertFalse(intRange.containsRange(new Range(10, 21)));
+ assertTrue(intRange.containsRange(Range.between(10, 19)));
+ assertFalse(intRange.containsRange(Range.between(10, 21)));

// touches upper boundary
- assertTrue(intRange.containsRange(new Range(11, 20)));
- assertFalse(intRange.containsRange(new Range(9, 20)));
+ assertTrue(intRange.containsRange(Range.between(11, 20)));
+ assertFalse(intRange.containsRange(Range.between(9, 20)));

// negative
- assertFalse(intRange.containsRange(new Range(-11, -18)));
+ assertFalse(intRange.containsRange(Range.between(-11, -18)));

}

@@ -199,29 +195,29 @@
assertFalse(intRange.overlapsRange(null));

// easy inside range
- assertTrue(intRange.overlapsRange(new Range(12, 18)));
+ assertTrue(intRange.overlapsRange(Range.between(12, 18)));

// outside range on each side
- assertFalse(intRange.overlapsRange(new Range(32, 45)));
- assertFalse(intRange.overlapsRange(new Range(2, 8)));
+ assertFalse(intRange.overlapsRange(Range.between(32, 45)));
+ assertFalse(intRange.overlapsRange(Range.between(2, 8)));

// equals range
- assertTrue(intRange.overlapsRange(new Range(10, 20)));
+ assertTrue(intRange.overlapsRange(Range.between(10, 20)));

// overlaps
- assertTrue(intRange.overlapsRange(new Range(9, 14)));
- assertTrue(intRange.overlapsRange(new Range(16, 21)));
+ assertTrue(intRange.overlapsRange(Range.between(9, 14)));
+ assertTrue(intRange.overlapsRange(Range.between(16, 21)));

// touches lower boundary
- assertTrue(intRange.overlapsRange(new Range(10, 19)));
- assertTrue(intRange.overlapsRange(new Range(10, 21)));
+ assertTrue(intRange.overlapsRange(Range.between(10, 19)));
+ assertTrue(intRange.overlapsRange(Range.between(10, 21)));

// touches upper boundary
- assertTrue(intRange.overlapsRange(new Range(11, 20)));
- assertTrue(intRange.overlapsRange(new Range(9, 20)));
+ assertTrue(intRange.overlapsRange(Range.between(11, 20)));
+ assertTrue(intRange.overlapsRange(Range.between(9, 20)));

// negative
- assertFalse(intRange.overlapsRange(new Range(-11, -18)));
+ assertFalse(intRange.overlapsRange(Range.between(-11, -18)));

}

Re: [ANNOUNCEMENT] Apache Commons Pool 1.5.4 Released

2009-11-20T20:24:27Z

sebb wrote:

> On 21/11/2009, Phil Steitz <psteitz@...> wrote:
>> The Apache Commons team is pleased to announce the release of
>> version 1.5.4 of Commons Pool. Commons Pool provides a general
>> purpose object pooling API, an implementation toolkit and some pool
>> implementations.
>>
>> Version 1.5.4 is a patch release including a fix for a regression
>> introduced in version 1.5. Source and binary distributions are
>
> s/1.5/1.5.3/ ?

Version 1.5 made some fundamental changes to the way that the pool
allocates objects to clients. The changes were motivated by POOL-75
(make pool serve clients fairly - in FIFO order). The bug fixed in
1.5.4 (POOL-152) was introduced by the new code added in 1.5.

Phil

>
>> available for download from the Apache Commons Pool download site:
>> http://commons.apache.org/pool/download_pool.cgi
>>
>> Please verify signatures using the KEYS file available at the above
>> location when downloading the release.
>>
>> For more information on Apache Commons Pool, visit the Pool home page:
>> http://commons.apache.org/pool/
>>
>> Feedback, suggestions for improvement or bug reports are welcome via
>> the "Mailing Lists" and "Issue Tracking" links here:
>> http://commons.apache.org/pool/project-info.html
>>
>> Phil Steitz
>> - On behalf of the Apache Commons community
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: user-unsubscribe@...
>> For additional commands, e-mail: user-help@...
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [ANNOUNCEMENT] Apache Commons Pool 1.5.4 Released

2009-11-20T17:53:33Z

On 21/11/2009, Phil Steitz <psteitz@...> wrote:
> The Apache Commons team is pleased to announce the release of
> version 1.5.4 of Commons Pool. Commons Pool provides a general
> purpose object pooling API, an implementation toolkit and some pool
> implementations.
>
> Version 1.5.4 is a patch release including a fix for a regression
> introduced in version 1.5. Source and binary distributions are

s/1.5/1.5.3/ ?

> available for download from the Apache Commons Pool download site:
> http://commons.apache.org/pool/download_pool.cgi
>
> Please verify signatures using the KEYS file available at the above
> location when downloading the release.
>
> For more information on Apache Commons Pool, visit the Pool home page:
> http://commons.apache.org/pool/
>
> Feedback, suggestions for improvement or bug reports are welcome via
> the "Mailing Lists" and "Issue Tracking" links here:
> http://commons.apache.org/pool/project-info.html
>
> Phil Steitz
> - On behalf of the Apache Commons community
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: user-unsubscribe@...
> For additional commands, e-mail: user-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[ANNOUNCEMENT] Apache Commons Pool 1.5.4 Released

2009-11-20T16:36:00Z

The Apache Commons team is pleased to announce the release of
version 1.5.4 of Commons Pool. Commons Pool provides a general
purpose object pooling API, an implementation toolkit and some pool
implementations.

Version 1.5.4 is a patch release including a fix for a regression
introduced in version 1.5. Source and binary distributions are
available for download from the Apache Commons Pool download site:
http://commons.apache.org/pool/download_pool.cgi

Please verify signatures using the KEYS file available at the above
location when downloading the release.

For more information on Apache Commons Pool, visit the Pool home page:
http://commons.apache.org/pool/

Feedback, suggestions for improvement or bug reports are welcome via
the "Mailing Lists" and "Issue Tracking" links here:
http://commons.apache.org/pool/project-info.html

Phil Steitz
- On behalf of the Apache Commons community

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[Commons Wiki] Update of "CreatingReleases" by DennisLundberg

2009-11-20T13:07:18Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Commons Wiki" for change notification.

The "CreatingReleases" page has been changed by DennisLundberg.
The comment on this change is: MSITE-404 prevents the staging of the site, not the release itself.
http://wiki.apache.org/commons/CreatingReleases?action=diff&rev1=40&rev2=41

--------------------------------------------------

* SVN 1.5.0

However, on Un*x, you may encounter http://jira.codehaus.org/browse/MSITE-404 which will at least prevent
- staging a release. On Mac, you may also encounter http://jira.codehaus.org/browse/MRELEASE-424 for which there is a workaround.
+ staging a site. On Mac, you may also encounter http://jira.codehaus.org/browse/MRELEASE-424 for which there is a workaround.

==== A.4 Maven Server Settings ====

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r882713 - /commons/proper/pool/tags/POOL_1_5_4/

2009-11-20T13:04:32Z

Author: psteitz
Date: Fri Nov 20 21:04:31 2009
New Revision: 882713

URL: http://svn.apache.org/viewvc?rev=882713&view=rev
Log:
Copied release tag for 1.5.4.

Added:
commons/proper/pool/tags/POOL_1_5_4/
- copied from r882692, commons/proper/pool/tags/POOL_1_5_4_RC1/

svn commit: r882710 - in /commons/proper/pool/trunk: doap_pool.rdf xdocs/changes.xml

2009-11-20T13:01:56Z

Author: psteitz
Date: Fri Nov 20 21:01:55 2009
New Revision: 882710

URL: http://svn.apache.org/viewvc?rev=882710&view=rev
Log:
Updated to reflect 1.5.4 release.

Modified:
commons/proper/pool/trunk/doap_pool.rdf
commons/proper/pool/trunk/xdocs/changes.xml

Modified: commons/proper/pool/trunk/doap_pool.rdf
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/doap_pool.rdf?rev=882710&r1=882709&r2=882710&view=diff
==============================================================================
--- commons/proper/pool/trunk/doap_pool.rdf (original)
+++ commons/proper/pool/trunk/doap_pool.rdf Fri Nov 20 21:01:55 2009
@@ -36,6 +36,11 @@
<release>
<Version>
<name>commons-pool</name>
+ <created>2009-11-20</created>
+ <revision>1.5.4</revision>
+ </Version>
+ <Version>
+ <name>commons-pool</name>
<created>2009-09-23</created>
<revision>1.5.3</revision>
</Version>

Modified: commons/proper/pool/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/xdocs/changes.xml?rev=882710&r1=882709&r2=882710&view=diff
==============================================================================
--- commons/proper/pool/trunk/xdocs/changes.xml (original)
+++ commons/proper/pool/trunk/xdocs/changes.xml Fri Nov 20 21:01:55 2009
@@ -20,7 +20,9 @@
<title>Commons Pool Changes</title>
</properties>
<body>
- <release version="1.5.4" date="TBD" description=
+ <release version="1.5.5" date="TBD" description="TBD">
+ </release>
+ <release version="1.5.4" date="2009-11-20" description=
"This is a patch release containing a fix for POOL-152, a regression
introduced in version 1.5.">
<action dev="markt" type="fix" issue="POOL-152" due-to="Bushov Alexander">

svn commit: r882706 - /commons/proper/commons-build/trunk/downloads/downloads.xml

2009-11-20T12:45:21Z

Author: psteitz
Date: Fri Nov 20 20:45:20 2009
New Revision: 882706

URL: http://svn.apache.org/viewvc?rev=882706&view=rev
Log:
Updated to reflect pool 1.5.4 release.

Modified:
commons/proper/commons-build/trunk/downloads/downloads.xml

Modified: commons/proper/commons-build/trunk/downloads/downloads.xml
URL: http://svn.apache.org/viewvc/commons/proper/commons-build/trunk/downloads/downloads.xml?rev=882706&r1=882705&r2=882706&view=diff
==============================================================================
--- commons/proper/commons-build/trunk/downloads/downloads.xml (original)
+++ commons/proper/commons-build/trunk/downloads/downloads.xml Fri Nov 20 20:45:20 2009
@@ -468,14 +468,14 @@

<project id="pool" name="Pool" href="http://commons.apache.org/pool/">
<downloads keys="commons/KEYS" primary="http://www.apache.org/dist/" mirrored="true" archive="http://archive.apache.org/dist/commons/pool/">
- <group label="1.5.3">
+ <group label="1.5.4">
<group label="Binary">
- <download name="1.5.3.tar.gz" href="commons/pool/binaries/commons-pool-1.5.3-bin.tar.gz"/>
- <download name="1.5.3.zip" href="commons/pool/binaries/commons-pool-1.5.3-bin.zip"/>
+ <download name="1.5.4.tar.gz" href="commons/pool/binaries/commons-pool-1.5.4-bin.tar.gz"/>
+ <download name="1.5.4.zip" href="commons/pool/binaries/commons-pool-1.5.4-bin.zip"/>
</group>
<group label="Source">
- <download name="1.5.3.tar.gz" href="commons/pool/source/commons-pool-1.5.3-src.tar.gz"/>
- <download name="1.5.3.zip" href="commons/pool/source/commons-pool-1.5.3-src.zip"/>
+ <download name="1.5.4.tar.gz" href="commons/pool/source/commons-pool-1.5.4-src.tar.gz"/>
+ <download name="1.5.4.zip" href="commons/pool/source/commons-pool-1.5.4-src.zip"/>
</group>
</group>
<download name="browse download area" href="commons/pool/" directory="true"/>

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-20T11:51:14Z

Take a look at the proposal and feel free to edit and add any missing
info....

-Donald

Simone Tripodi wrote:

> HI guys,
> being a volunteer to help you on developing the new Validation
> framework, is there any way I can help you on completing the proposal?
> Please let me know! Have a nice weekend, best regards
> Simone
>
> On Wed, Nov 18, 2009 at 9:47 PM, Donald Woods <dwoods@...> wrote:
>> I'm sure we'll get a few more interested committers from Geronimo and
>> OpenJPA. Was just waiting until we had an initial proposal draft completed
>> before posting it to those dev lists. I'll go ahead and post to those lists
>> today and maybe we can target you starting a Commons vote in the next week
>> or two, as we can try to get the podling approved before the Dec. holiday
>> season begins.....
>>
>>
>> -Donald
>>
>>
>> Niall Pemberton wrote:
>>> On Wed, Nov 18, 2009 at 8:03 PM, Donald Woods <dwoods@...> wrote:
>>>> OK, I finished my first rounds of updates.
>>> If we want Apache Commons to be sponsor then we should hold a vote here
>>> first.
>>>
>>>> Looks like we just need to nail
>>>> down a champion and we can add more mentors once we propose it to the
>>>> incubator....
>>> Kevan offered to be Champion which sounds good to me.
>>>
>>> Also Simone Tripodi was interested in this and looks like hes already
>>> a prject member of agimatec-validation - so perhaps we should ping
>>> him. Anyone else you know that might be interested in helping as a
>>> committer?
>>>
>>> Niall
>>>
>>>> -Donald
>>>>
>>>>
>>>> Niall Pemberton wrote:
>>>>
>>>>>> Lets start a proposal on the incubator wiki:
>>>>>> http://wiki.apache.org/incubator/
>>>>> I've set up a skeleton proposal here:
>>>>>
>>>>> http://wiki.apache.org/incubator/ValidationProposal
>>>>>
>>>>> I'm going to start to flesh it out
>>>>>
>>>>> Niall
>>>>>
>>>>>> Theres a guide here:
>>>>>> http://incubator.apache.org/guides/proposal.html
>>>>>>
>>>> ---------------------------------------------------------------------
>>>> To unsubscribe, e-mail: dev-unsubscribe@...
>>>> For additional commands, e-mail: dev-help@...
>>>>
>>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@...
>>> For additional commands, e-mail: dev-help@...
>>>
>>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@...
>> For additional commands, e-mail: dev-help@...
>>
>>
>
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r882694 - in /commons/proper/pool/trunk: build.xml pom.xml src/site/site.xml

2009-11-20T11:44:05Z

Author: psteitz
Date: Fri Nov 20 19:44:04 2009
New Revision: 882694

URL: http://svn.apache.org/viewvc?rev=882694&view=rev
Log:
Updated site to reflect 1.5.4 release.

Modified:
commons/proper/pool/trunk/build.xml
commons/proper/pool/trunk/pom.xml
commons/proper/pool/trunk/src/site/site.xml

Modified: commons/proper/pool/trunk/build.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/build.xml?rev=882694&r1=882693&r2=882694&view=diff
==============================================================================
--- commons/proper/pool/trunk/build.xml (original)
+++ commons/proper/pool/trunk/build.xml Fri Nov 20 19:44:04 2009
@@ -40,7 +40,7 @@

<property name="name" value="commons-pool"/>
<property name="title" value="Apache Commons Object Pooling Package"/>
- <property name="version" value="1.5.4"/>
+ <property name="version" value="1.5.5-SNAPSHOT"/>
<property name="package" value="org.apache.commons.pool.*"/>

<property name="src.dir" value="${basedir}/src"/>

Modified: commons/proper/pool/trunk/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/pom.xml?rev=882694&r1=882693&r2=882694&view=diff
==============================================================================
--- commons/proper/pool/trunk/pom.xml (original)
+++ commons/proper/pool/trunk/pom.xml Fri Nov 20 19:44:04 2009
@@ -133,7 +133,7 @@
<maven.compile.source>1.3</maven.compile.source>
<maven.compile.target>1.3</maven.compile.target>
<commons.componentid>pool</commons.componentid>
- <commons.release.version>1.5.4</commons.release.version>
+ <commons.release.version>1.5.5-SNAPSHOT</commons.release.version>
<commons.jira.id>POOL</commons.jira.id>
<commons.jira.pid>12310488</commons.jira.pid>
</properties>

Modified: commons/proper/pool/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/pool/trunk/src/site/site.xml?rev=882694&r1=882693&r2=882694&view=diff
==============================================================================
--- commons/proper/pool/trunk/src/site/site.xml (original)
+++ commons/proper/pool/trunk/src/site/site.xml Fri Nov 20 19:44:04 2009
@@ -28,7 +28,7 @@
<item name="Javadoc (1.2 release)" href="http://commons.apache.org/pool/api-1.2/index.html"/>
<item name="Javadoc (1.3 release)" href="http://commons.apache.org/pool/api-1.3/index.html"/>
<item name="Javadoc (1.4 release)" href="http://commons.apache.org/pool/api-1.4/index.html"/>
- <item name="Javadoc (1.5.3 release)" href="http://commons.apache.org/pool/api-1.5.3/index.html"/>
+ <item name="Javadoc (1.5.4 release)" href="http://commons.apache.org/pool/api-1.5.4/index.html"/>
<item name="Developers Guide" href="/guide/index.html" collapse="true">
<item name="Class Diagrams" href="/guide/classdiagrams.html"/>
<item name="Sequence Diagrams" href="/guide/sequencediagrams.html"/>

svn commit: r882649 - /commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c

2009-11-20T09:27:47Z

Author: mturk
Date: Fri Nov 20 17:27:44 2009
New Revision: 882649

URL: http://svn.apache.org/viewvc?rev=882649&view=rev
Log:
Rename FileWrapper to FileSysteIo

Modified:
commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c

Modified: commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c?rev=882649&r1=882648&r2=882649&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/shared/fsysio.c Fri Nov 20 17:27:44 2009
@@ -25,8 +25,8 @@
#include "acr_fileio.h"

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, ftype0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, ftype0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -41,8 +41,8 @@
return f->type;
}

-ACR_IO_EXPORT_DECLARE(jboolean, FileWrapper, eof0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jboolean, FileSystemIo, eof0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -57,8 +57,8 @@
return V2Z(f->eof);
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, eof1)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, eof1)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -70,8 +70,8 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jboolean, FileWrapper, blocking0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jboolean, FileSystemIo, blocking0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -86,9 +86,9 @@
return f->blocking == BLK_ON ? JNI_TRUE : JNI_FALSE;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, tmset0)(ACR_JNISTDARGS,
- jint file,
- jint timeout)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, tmset0)(ACR_JNISTDARGS,
+ jint file,
+ jint timeout)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -105,8 +105,8 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, tmget0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, tmget0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -121,8 +121,8 @@
return (jint)f->timeout;
}

-ACR_IO_EXPORT_DECLARE(jstring, FileWrapper, name0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jstring, FileSystemIo, name0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -137,8 +137,8 @@
return PSTR_TO_JSTRING(f->name);
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, path0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, path0)(ACR_JNISTDARGS,
+ jint file)
{
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);

@@ -152,3 +152,4 @@
}
return ACR_NewPathObject(_E, ACR_PATH_ABS, f->name);
}
+

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-20T09:16:46Z

HI guys,
being a volunteer to help you on developing the new Validation
framework, is there any way I can help you on completing the proposal?
Please let me know! Have a nice weekend, best regards
Simone

On Wed, Nov 18, 2009 at 9:47 PM, Donald Woods <dwoods@...> wrote:

> I'm sure we'll get a few more interested committers from Geronimo and
> OpenJPA. Was just waiting until we had an initial proposal draft completed
> before posting it to those dev lists. I'll go ahead and post to those lists
> today and maybe we can target you starting a Commons vote in the next week
> or two, as we can try to get the podling approved before the Dec. holiday
> season begins.....
>
>
> -Donald
>
>
> Niall Pemberton wrote:
>>
>> On Wed, Nov 18, 2009 at 8:03 PM, Donald Woods <dwoods@...> wrote:
>>>
>>> OK, I finished my first rounds of updates.
>>
>> If we want Apache Commons to be sponsor then we should hold a vote here
>> first.
>>
>>> Looks like we just need to nail
>>> down a champion and we can add more mentors once we propose it to the
>>> incubator....
>>
>> Kevan offered to be Champion which sounds good to me.
>>
>> Also Simone Tripodi was interested in this and looks like hes already
>> a prject member of agimatec-validation - so perhaps we should ping
>> him. Anyone else you know that might be interested in helping as a
>> committer?
>>
>> Niall
>>
>>> -Donald
>>>
>>>
>>> Niall Pemberton wrote:
>>>
>>>>> Lets start a proposal on the incubator wiki:
>>>>> http://wiki.apache.org/incubator/
>>>>
>>>> I've set up a skeleton proposal here:
>>>>
>>>> http://wiki.apache.org/incubator/ValidationProposal
>>>>
>>>> I'm going to start to flesh it out
>>>>
>>>> Niall
>>>>
>>>>> Theres a guide here:
>>>>> http://incubator.apache.org/guides/proposal.html
>>>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: dev-unsubscribe@...
>>> For additional commands, e-mail: dev-help@...
>>>
>>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@...
>> For additional commands, e-mail: dev-help@...
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

--
http://www.google.com/profiles/simone.tripodi

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: Commons Lang 3: Validate

2009-11-19T23:25:06Z

On Thu, Nov 19, 2009 at 9:24 AM, Paul Benedict <pbenedict@...> wrote:

> On Thu, Nov 19, 2009 at 1:39 AM, Henri Yandell <flamefew@...> wrote:
>
>> Your argument being that the JDK and others do NPE when null? i.e. NPE
>> = IAE(null)?
>
> Yes. Some things to note:
> * The JDK does this as their pattern
> * JDK 7 definitely encodes this patter in their new Object.notNull() method.
> * Google Collections -- being a JDK wannabe addition -- does this
> * Josuha Bloch's "Effective Java" (two editions) has codified this
> expectation into the minds of developers.

+1 to NPE.

Hen

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: Commons Lang 3: Validate

2009-11-19T09:24:14Z

On Thu, Nov 19, 2009 at 1:39 AM, Henri Yandell <flamefew@...> wrote:

> Your argument being that the JDK and others do NPE when null? i.e. NPE
> = IAE(null)?

Yes. Some things to note:
* The JDK does this as their pattern
* JDK 7 definitely encodes this patter in their new Object.notNull() method.
* Google Collections -- being a JDK wannabe addition -- does this
* Josuha Bloch's "Effective Java" (two editions) has codified this
expectation into the minds of developers.

Paul

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r882197 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java

2009-11-19T08:40:21Z

Author: sebb
Date: Thu Nov 19 16:40:21 2009
New Revision: 882197

URL: http://svn.apache.org/viewvc?rev=882197&view=rev
Log:
Javadoc fixes; add missing @Overrides

Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java

Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java?rev=882197&r1=882196&r2=882197&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java (original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java Thu Nov 19 16:40:21 2009
@@ -76,6 +76,7 @@
* determine where values lie in the range.
*
* @param element the value to use for this range, must not be <code>null</code>
+ * @param c comparator to be used
* @throws IllegalArgumentException if the value is <code>null</code>
*/
public Range(T element, Comparator c) {
@@ -93,6 +94,7 @@
*
* @param element1 first value that defines the edge of the range, inclusive
* @param element2 second value that defines the edge of the range, inclusive
+ * @param c comparator to be used
* @throws IllegalArgumentException if either value is <code>null</code>
*/
public Range(T element1, T element2, Comparator c) {
@@ -237,7 +239,7 @@
*
* <code>null</code> is handled and returns <code>false</code>.
*
- * This implementation uses the {@link #containsNumber(Number)} method.
+ * This implementation uses the {@link #contains(Object)} method.
* Subclasses may be able to optimise this.
*
* @param range the range to test, may be <code>null</code>
@@ -262,7 +264,7 @@
*
* <code>null</code> is handled and returns <code>false</code>.
*
- * This implementation uses the {@link #containsNumber(Number)} and
+ * This implementation uses the {@link #contains(Object)} and
* {@link #containsRange(Range)} methods.
* Subclasses may be able to optimise this.
*
@@ -288,8 +290,8 @@
*
* To be equal, the class, minimum and maximum must be equal.
*
- * This implementation uses the {@link #getMinimumNumber()} and
- * {@link #getMaximumNumber()} methods.
+ * This implementation uses the {@link #getMinimum()} and
+ * {@link #getMaximum()} methods.
* Subclasses may be able to optimise this.
*
* @param obj the reference object with which to compare
@@ -311,8 +313,8 @@
/**
* Gets a hashCode for the range.
*
- * This implementation uses the {@link #getMinimumNumber()} and
- * {@link #getMaximumNumber()} methods.
+ * This implementation uses the {@link #getMinimum()} and
+ * {@link #getMaximum()} methods.
* Subclasses may be able to optimise this.
*
* @return a hash code value for this object
@@ -331,8 +333,8 @@
*
* The format of the String is 'Range[min,max]'.
*
- * This implementation uses the {@link #getMinimumNumber()} and
- * {@link #getMaximumNumber()} methods.
+ * This implementation uses the {@link #getMinimum()} and
+ * {@link #getMaximum()} methods.
* Subclasses may be able to optimise this.
*
* @return the <code>String</code> representation of this range
@@ -368,10 +370,12 @@
return obj1.compareTo(obj2);
}

+ @Override
public int hashCode() {
return "ComparableComparator".hashCode();
}

+ @Override
public boolean equals(Object object) {
return (this == object) ||
((null != object) && (object.getClass().equals(this.getClass())));

svn commit: r882193 - in /commons/proper/lang/trunk/src: java/org/apache/commons/lang/ArrayUtils.java test/org/apache/commons/lang/RangeTest.java test/org/apache/commons/lang/StringUtilsTest.java test/org/apache/commons/lang/builder/EqualsBuilderTest.java

2009-11-19T08:29:01Z

Author: sebb
Date: Thu Nov 19 16:29:01 2009
New Revision: 882193

URL: http://svn.apache.org/viewvc?rev=882193&view=rev
Log:
Unused imports

Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/ArrayUtils.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java
commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/EqualsBuilderTest.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=882193&r1=882192&r2=882193&view=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 Thu Nov 19 16:29:01 2009
@@ -21,7 +21,6 @@
import java.util.Map;

import org.apache.commons.lang.builder.EqualsBuilder;
-import org.apache.commons.lang.builder.HashCodeBuilder;
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java?rev=882193&r1=882192&r2=882193&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/RangeTest.java Thu Nov 19 16:29:01 2009
@@ -17,9 +17,7 @@

package org.apache.commons.lang;

-import junit.framework.Test;
import junit.framework.TestCase;
-import junit.framework.TestSuite;

/**
* 

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java?rev=882193&r1=882192&r2=882193&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/StringUtilsTest.java Thu Nov 19 16:29:01 2009
@@ -19,7 +19,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.Modifier;
import java.util.Arrays;
-import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.Locale;

Modified: commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/EqualsBuilderTest.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/EqualsBuilderTest.java?rev=882193&r1=882192&r2=882193&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/EqualsBuilderTest.java (original)
+++ commons/proper/lang/trunk/src/test/org/apache/commons/lang/builder/EqualsBuilderTest.java Thu Nov 19 16:29:01 2009
@@ -16,7 +16,6 @@
*/
package org.apache.commons.lang.builder;

-import java.math.BigDecimal;
import java.util.Arrays;

import junit.framework.Test;

[Commons Wiki] Update of "CreatingReleases" by HenriBiestro

2009-11-19T05:19:00Z

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Commons Wiki" for change notification.

The "CreatingReleases" page has been changed by HenriBiestro.
The comment on this change is: MSITE-404, MRELEASE-424 issues.
http://wiki.apache.org/commons/CreatingReleases?action=diff&rev1=39&rev2=40

--------------------------------------------------

After having a lot of problems (Oct. 2009) the following configuration is known to work
* Maven 2.2.1
* SVN 1.5.0
+
+ However, on Un*x, you may encounter http://jira.codehaus.org/browse/MSITE-404 which will at least prevent
+ staging a release. On Mac, you may also encounter http://jira.codehaus.org/browse/MRELEASE-424 for which there is a workaround.

==== A.4 Maven Server Settings ====

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r882113 - in /commons/proper/dbcp/trunk: src/java/org/apache/commons/dbcp/AbandonedTrace.java xdocs/changes.xml

2009-11-19T03:35:16Z

Author: markt
Date: Thu Nov 19 11:35:14 2009
New Revision: 882113

URL: http://svn.apache.org/viewvc?rev=882113&view=rev
Log:
Fix DBCP-305. Patch (slightly modified) provided by Christopher Schultz.

Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
commons/proper/dbcp/trunk/xdocs/changes.xml

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java?rev=882113&r1=882112&r2=882113&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java Thu Nov 19 11:35:14 2009
@@ -35,17 +35,10 @@
*/
public class AbandonedTrace {

- /** Date format */
- private static final SimpleDateFormat format = new SimpleDateFormat
- ("'DBCP object created' yyyy-MM-dd HH:mm:ss " +
- "'by the following code was never closed:'");
-
/** DBCP AbandonedConfig */
private AbandonedConfig config = null;
/** A stack trace of the code that created me (if in debug mode) */
private volatile Exception createdBy;
- /** Time created */
- private volatile long createdTime;
/** A list of objects created by children of this object */
private final List trace = new ArrayList();
/** Last time this connection was used */
@@ -93,8 +86,7 @@
return;
}
if (config.getLogAbandoned()) {
- createdBy = new Exception();
- createdTime = System.currentTimeMillis();
+ createdBy = new AbandonedObjectException();
}
}

@@ -143,8 +135,7 @@
return;
}
if (config.getLogAbandoned()) {
- createdBy = new Exception();
- createdTime = System.currentTimeMillis();
+ createdBy = new AbandonedObjectException();
}
}

@@ -188,7 +179,6 @@
*/
public void printStackTrace() {
if (createdBy != null && config != null) {
- config.getLogWriter().println(format.format(new Date(createdTime)));
createdBy.printStackTrace(config.getLogWriter());
}
synchronized(this.trace) {
@@ -203,7 +193,7 @@
/**
* Remove a child object this object is tracing.
*
- * @param trace AbandonedTrace object to remvoe
+ * @param trace AbandonedTrace object to remove
*/
protected void removeTrace(AbandonedTrace trace) {
synchronized(this.trace) {
@@ -211,4 +201,27 @@
}
}

+ static class AbandonedObjectException extends Exception {
+
+ /** Date format */
+ private static final SimpleDateFormat format = new SimpleDateFormat
+ ("'DBCP object created' yyyy-MM-dd HH:mm:ss " +
+ "'by the following code was never closed:'");
+
+ private long _createdTime;
+
+ public AbandonedObjectException() {
+ _createdTime = System.currentTimeMillis();
+ }
+
+ // Override getMessage to avoid creating objects and formatting
+ // dates unless the log message will actually be used.
+ public String getMessage() {
+ String msg;
+ synchronized(format) {
+ msg = format.format(new Date(_createdTime));
+ }
+ return msg;
+ }
+ }
}

Modified: commons/proper/dbcp/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/xdocs/changes.xml?rev=882113&r1=882112&r2=882113&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/xdocs/changes.xml (original)
+++ commons/proper/dbcp/trunk/xdocs/changes.xml Thu Nov 19 11:35:14 2009
@@ -42,6 +42,11 @@
new features as well as bug fixes and instrumentation. Some bug fixes
will change semantics (e.g. connection close will become idempotent).
The minimum JDK level will be increased to 1.4">
+ <action dev="markt" type="update" issue="DBCP-305" due-to="Christopher Schultz">
+ Use an API specific exception for logging abandoned objects to make
+ scanning the logs for these exceptions simpler and to provide a better
+ message that includes the creation time of the abandoned object.
+ </action>
<action dev="markt" type="fix" issue="DBCP-303" due-to="Dave Oxley">
Ensure Statement.getGeneratedKeys() works correctly with the CPDS
adapter.

svn commit: r882109 - /commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java

2009-11-19T03:21:19Z

Author: markt
Date: Thu Nov 19 11:21:12 2009
New Revision: 882109

URL: http://svn.apache.org/viewvc?rev=882109&view=rev
Log:
Fix bracket alignment

Modified:
commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java

Modified: commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java
URL: http://svn.apache.org/viewvc/commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java?rev=882109&r1=882108&r2=882109&view=diff
==============================================================================
--- commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java (original)
+++ commons/proper/dbcp/trunk/src/java/org/apache/commons/dbcp/AbandonedTrace.java Thu Nov 19 11:21:12 2009
@@ -179,7 +179,7 @@
protected List getTrace() {
synchronized (this.trace) {
return new ArrayList(trace);
- }
+ }
}

/**

Re: Commons Lang 3: Validate

2009-11-18T23:39:50Z

On Wed, Nov 18, 2009 at 7:40 PM, Paul Benedict <pbenedict@...> wrote:

> On Wed, Nov 18, 2009 at 12:35 AM, Henri Yandell <flamefew@...> wrote:
>> On Tue, Nov 17, 2009 at 10:04 PM, Paul Benedict <pbenedict@...> wrote:
>>> I would like to make the following changes. Looking for some feedback:
>>>
>>> * Append var-args to the method signatures to accept message format
>>> parameters where a message is provided.
>>
>> This issue https://issues.apache.org/jira/browse/LANG-508 ?
>
> Yes. Wonderful.

+1 to the change. Feel free to dive in. :)

>>> * A flag to throw NPE rather IAE on notNull and potentially notEmpty checks
>>
>> On the simple path first - can/should we move to NPE?
>>
>
> Sure, I can do simple. My vote is +1 for NPE.

Your argument being that the JDK and others do NPE when null? i.e. NPE
= IAE(null)?

Hen

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: Commons Lang 3: Validate

2009-11-18T19:40:52Z

On Wed, Nov 18, 2009 at 12:35 AM, Henri Yandell <flamefew@...> wrote:
> On Tue, Nov 17, 2009 at 10:04 PM, Paul Benedict <pbenedict@...> wrote:
>> I would like to make the following changes. Looking for some feedback:
>>
>> * Append var-args to the method signatures to accept message format
>> parameters where a message is provided.
>
> This issue https://issues.apache.org/jira/browse/LANG-508 ?

Yes. Wonderful.

>> * A flag to throw NPE rather IAE on notNull and potentially notEmpty checks
>
> On the simple path first - can/should we move to NPE?
>

Sure, I can do simple. My vote is +1 for NPE.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [JEXL 2.0] o.a.c.jexl or o.a.c.jexl2 ?

2009-11-18T14:58:55Z

Jörg Schaible-2 wrote:

...
The question is, if it is a drop-in replacement. If not, you may not be able
to use the new version due to transitive deps.
...

JEXL 2.0 is a drop-in replacement when JEXL 1.x has been used "casually"; the "core" public API, classes & behaviors have been preserved ({Script,Expression}Factory, Expression, JexlContext). The internals have changed but if there were some devs using those, they've sailed away a long time ago...

I know Jelly (which is pretty much abandoned) is a "casual" user and I suspect the huge majority of projects to be in this case too. (Jelly's most prominent dependent, Maven 1, although much used, is already superseded by Maven 2).
The probability of the transitive dependencies problem occurring seems low and highly likely solved by removing JEXL 1.x from the classpath.

On the other hand, using o.a.c.jexl2 does not hurt JEXL 2.0 besides slowing down its eventual adoption rate (which has no value by itself); it might even speed-up the release (pending a correct one can be published :-)).

If the safe o.a.c.jexl2 approach allows to release JEXL-2.0 faster, I'm all for it.

Draft proposal for a JSR-303 Bean Validation incubator podling

2009-11-18T13:02:13Z

We have an initial draft proposal to create a JSR-303 Bean Validation
implementation at Apache as an incubator podling.

Take a look at the proposal [1] and feel free to ask questions about it
on the dev@commons list and volunteer to be an initial committer if you
have time and interests in bean validation....

[1] http://wiki.apache.org/incubator/ValidationProposal

Thanks,
Donald

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-18T12:47:24Z

I'm sure we'll get a few more interested committers from Geronimo and
OpenJPA. Was just waiting until we had an initial proposal draft
completed before posting it to those dev lists. I'll go ahead and post
to those lists today and maybe we can target you starting a Commons vote
in the next week or two, as we can try to get the podling approved
before the Dec. holiday season begins.....

-Donald

Niall Pemberton wrote:

> On Wed, Nov 18, 2009 at 8:03 PM, Donald Woods <dwoods@...> wrote:
>> OK, I finished my first rounds of updates.
>
> If we want Apache Commons to be sponsor then we should hold a vote here first.
>
>> Looks like we just need to nail
>> down a champion and we can add more mentors once we propose it to the
>> incubator....
>
> Kevan offered to be Champion which sounds good to me.
>
> Also Simone Tripodi was interested in this and looks like hes already
> a prject member of agimatec-validation - so perhaps we should ping
> him. Anyone else you know that might be interested in helping as a
> committer?
>
> Niall
>
>> -Donald
>>
>>
>> Niall Pemberton wrote:
>>
>>>> Lets start a proposal on the incubator wiki:
>>>> http://wiki.apache.org/incubator/
>>> I've set up a skeleton proposal here:
>>>
>>> http://wiki.apache.org/incubator/ValidationProposal
>>>
>>> I'm going to start to flesh it out
>>>
>>> Niall
>>>
>>>> Theres a guide here:
>>>> http://incubator.apache.org/guides/proposal.html
>>>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: dev-unsubscribe@...
>> For additional commands, e-mail: dev-help@...
>>
>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-18T12:40:17Z

On Wed, Nov 18, 2009 at 7:46 PM, Kevan Miller <kevan.miller@...> wrote:
> Apologies for chiming in late.
>
> From a Geronimo/EE 6 perspective, I'm definitely interested in seeing a 303 implementation at Apache. I'm not likely to have much time for implementation. However, if champions or mentors are needed, I'd be willing to help.

Great - I added you to the proposal - thanks

Niall

> On Nov 4, 2009, at 11:27 AM, Donald Woods wrote:
>
>> Niall Pemberton wrote:
>
> <snip>
>
>>> Its the normal route to have separate lists @incubator - but I don't
>>> see why it has to go that way. If Commons is the intended destination
>>> then it will make acceptance by Commons smoother since they will see
>>> the activity during incubation. Anyway, I'm not wedded to this idea
>>> but I would like to start with that basis - if there is a negative
>>> reaction either here or if/when it goes to general@incubator then we
>>> can revert to the usual model. Is your objection because you don't
>>> like it or because you don't think it would be allowed?
>>
>> No objection. I just hadn't seen any other Podlings do it this way... It's worth a try.
>
> Subversion is going to be using non-incubator mailing lists. So, there is some precedent. No harm in trying, IMO...
>
> --kevan
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [VOTE] Apache Commons to sponsor agimatec-validation incunbation

2009-11-18T12:39:16Z

+! from me btw

Niall

On Wed, Nov 18, 2009 at 8:34 PM, Niall Pemberton
<niall.pemberton@...> wrote:

> Donald Woods and I have put together a proposal for the incubator to
> bring agimatec-validation into the ASF (see
> http://markmail.org/message/xv4p6twshqznxfcp). The draft proposal is
> here:
>
> http://wiki.apache.org/incubator/ValidationProposal
>
> agimatec-validation is an implementation of JSR 303 - the bean
> validation framework.
>
> The idea at the moment is that (hopefully) this will eventually end up
> back here as a replacement for Commons Validator. We would like the
> Commons PMC to be the sponsor for this incubating project.
>
> [ ] +1 Yes lets sponsor it
> [ ] -1 No because...
>
> Being a sponsor doesn't commit Commons or agimatec-validation to have
> to *graduate* to Commons, just that its the current preference given a
> successful incubation.
>
> In order to make it easier for commons to *observe* the incubation
> effort does anyone object to discussion taking place on dev@commons
> rather than a separate list and commits going to commits@commons?
>
> [ ] +1 Use the Commons mailing lists
> [ ] -1 Bad idea because...
>
> Any Commons committers would be very welcome to join the incubator
> podling - please just add yourself to the propsal.
>
> Niall
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

[VOTE] Apache Commons to sponsor agimatec-validation incunbation

2009-11-18T12:34:32Z

Donald Woods and I have put together a proposal for the incubator to
bring agimatec-validation into the ASF (see
http://markmail.org/message/xv4p6twshqznxfcp). The draft proposal is
here:

http://wiki.apache.org/incubator/ValidationProposal

agimatec-validation is an implementation of JSR 303 - the bean
validation framework.

The idea at the moment is that (hopefully) this will eventually end up
back here as a replacement for Commons Validator. We would like the
Commons PMC to be the sponsor for this incubating project.

[ ] +1 Yes lets sponsor it
[ ] -1 No because...

Being a sponsor doesn't commit Commons or agimatec-validation to have
to *graduate* to Commons, just that its the current preference given a
successful incubation.

In order to make it easier for commons to *observe* the incubation
effort does anyone object to discussion taking place on dev@commons
rather than a separate list and commits going to commits@commons?

[ ] +1 Use the Commons mailing lists
[ ] -1 Bad idea because...

Any Commons committers would be very welcome to join the incubator
podling - please just add yourself to the propsal.

Niall

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-18T12:17:14Z

On Wed, Nov 18, 2009 at 8:03 PM, Donald Woods <dwoods@...> wrote:
> OK, I finished my first rounds of updates.

If we want Apache Commons to be sponsor then we should hold a vote here first.

> Looks like we just need to nail
> down a champion and we can add more mentors once we propose it to the
> incubator....

Kevan offered to be Champion which sounds good to me.

Also Simone Tripodi was interested in this and looks like hes already
a prject member of agimatec-validation - so perhaps we should ping
him. Anyone else you know that might be interested in helping as a
committer?

Niall

>
> -Donald
>
>
> Niall Pemberton wrote:
>
>>> Lets start a proposal on the incubator wiki:
>>> http://wiki.apache.org/incubator/
>>
>> I've set up a skeleton proposal here:
>>
>> http://wiki.apache.org/incubator/ValidationProposal
>>
>> I'm going to start to flesh it out
>>
>> Niall
>>
>>> Theres a guide here:
>>> http://incubator.apache.org/guides/proposal.html
>>>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-18T12:03:14Z

OK, I finished my first rounds of updates. Looks like we just need to
nail down a champion and we can add more mentors once we propose it to
the incubator....

-Donald

Niall Pemberton wrote:

>> Lets start a proposal on the incubator wiki:
>> http://wiki.apache.org/incubator/
>
> I've set up a skeleton proposal here:
>
> http://wiki.apache.org/incubator/ValidationProposal
>
> I'm going to start to flesh it out
>
> Niall
>
>> Theres a guide here:
>> http://incubator.apache.org/guides/proposal.html
>>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: [validator] Direction of validator implementation based on JSR 303

2009-11-18T11:46:30Z

Apologies for chiming in late.

From a Geronimo/EE 6 perspective, I'm definitely interested in seeing a 303 implementation at Apache. I'm not likely to have much time for implementation. However, if champions or mentors are needed, I'd be willing to help.

On Nov 4, 2009, at 11:27 AM, Donald Woods wrote:

> Niall Pemberton wrote:

<snip>

>> Its the normal route to have separate lists @incubator - but I don't
>> see why it has to go that way. If Commons is the intended destination
>> then it will make acceptance by Commons smoother since they will see
>> the activity during incubation. Anyway, I'm not wedded to this idea
>> but I would like to start with that basis - if there is a negative
>> reaction either here or if/when it goes to general@incubator then we
>> can revert to the usual model. Is your objection because you don't
>> like it or because you don't think it would be allowed?
>
> No objection. I just hadn't seen any other Podlings do it this way... It's worth a try.

Subversion is going to be using non-incubator mailing lists. So, there is some precedent. No harm in trying, IMO...

--kevan
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

Re: Comments on Commons Lang 3.0-SNAPSHOT

2009-11-18T05:07:28Z

Probably because both compile down into max(Object[]). But when I read
Joshua Bloch's Effective Java, he recommends doing something like
this:

max(double, double)
max(double, double, double)
max(double, double, double, double...)

That would be nice. The behind-the-sceneds Object[] creation only
happens if you inline 4. Is it worth the effort?

Paul

On Wed, Nov 18, 2009 at 12:37 AM, Henri Yandell <flamefew@...> wrote:

> On Mon, Nov 16, 2009 at 11:48 PM, Henri Yandell <flamefew@...> wrote:
>> On Mon, Nov 16, 2009 at 10:16 AM, Paul Benedict <pbenedict@...> wrote:
>>> * Is there any benefit to making NumberUtils.min/max accept a variable
>>> arguments over a single array?
>>
>> Seems good.
>
> From LANG-396:
>
> NumberUtils.min, NumberUtils.max varargs runs into the no overloading
> recommendation:
>
> src/test/org/apache/commons/lang/math/NumberUtilsTest.java:[1175,42]
> reference to max is ambiguous, both method max(double...) in
> org.apache.commons.lang.math.NumberUtils and method max(float...) in
> org.apache.commons.lang.math.NumberUtils match
>
> So - tried that, had problems.
>
> Hen
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@...
> For additional commands, e-mail: dev-help@...
>
>

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r881741 - in /commons/sandbox/runtime/trunk/src: main/java/org/apache/commons/runtime/io/ main/native/os/unix/ main/native/os/win32/ test/org/apache/commons/runtime/

2009-11-18T04:10:10Z

Author: mturk
Date: Wed Nov 18 12:10:10 2009
New Revision: 881741

URL: http://svn.apache.org/viewvc?rev=881741&view=rev
Log:
Rename FileWrapper to FileSystemIo. Internal class so no API change

Added:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java
- copied, changed from r881730, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java
Removed:
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java
Modified:
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/FileLockImpl.java
commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java
commons/sandbox/runtime/trunk/src/main/native/os/unix/finfo.c
commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/finfo.c
commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c
commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/File.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/File.java?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/File.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/File.java Wed Nov 18 12:10:10 2009
@@ -99,9 +99,9 @@
* Note that those descriptors can be NULL in
* case the FileStream.open call fails.
*/
- STDIN = new FileStreamImpl(FileWrapper.open(0, null));
- STDOUT = new FileStreamImpl(FileWrapper.open(1, null));
- STDERR = new FileStreamImpl(FileWrapper.open(2, null));
+ STDIN = new FileStreamImpl(FileSystemIo.open(0, null));
+ STDOUT = new FileStreamImpl(FileSystemIo.open(1, null));
+ STDERR = new FileStreamImpl(FileSystemIo.open(2, null));
}

@@ -149,7 +149,7 @@
if (fd == null) {
throw new NullPointerException();
}
- return FileWrapper.ftype(fd);
+ return FileSystemIo.ftype(fd);
}

@@ -216,7 +216,7 @@
throw new NullPointerException();
}
mode.add(FileOpenMode.CREATE);
- Descriptor fd = FileWrapper.open(path, mode);
+ Descriptor fd = FileSystemIo.open(path, mode);
if (fd == null) {
// File exists and EXCL mode was given
throw new FileNotFoundException(Local.sm.get("file.EEXIST"));
@@ -231,7 +231,7 @@
if (path == null || mode == null) {
throw new NullPointerException();
}
- Descriptor fd = FileWrapper.open(path, mode);
+ Descriptor fd = FileSystemIo.open(path, mode);
if (fd == null) {
// File exists and EXCL mode was given
throw new FileNotFoundException(Local.sm.get("file.EEXIST"));
@@ -255,7 +255,7 @@
if (path == null || mode == null || prot == null) {
throw new NullPointerException();
}
- Descriptor fd = FileWrapper.open(path, mode, prot);
+ Descriptor fd = FileSystemIo.open(path, mode, prot);
if (fd == null) {
// File exists and EXCL mode was given
throw new FileNotFoundException(Local.sm.get("file.EEXIST"));
@@ -503,7 +503,7 @@
if (prefix == null) {
throw new NullPointerException();
}
- Descriptor fd = FileWrapper.mktemp(directory, prefix, suffix, preserve);
+ Descriptor fd = FileSystemIo.mktemp(directory, prefix, suffix, preserve);
return new FileStreamImpl(fd);
}

@@ -521,7 +521,7 @@
if (prefix == null) {
throw new NullPointerException();
}
- Descriptor fd = FileWrapper.mktemp(prefix, suffix, preserve);
+ Descriptor fd = FileSystemIo.mktemp(prefix, suffix, preserve);
return new FileStreamImpl(fd);
}

@@ -539,7 +539,7 @@
if (prefix == null) {
throw new NullPointerException();
}
- return FileWrapper.mktemp(directory, prefix, suffix, preserve);
+ return FileSystemIo.mktemp(directory, prefix, suffix, preserve);
}

/**
@@ -556,7 +556,7 @@
if (prefix == null) {
throw new NullPointerException();
}
- return FileWrapper.mktemp(prefix, suffix, preserve);
+ return FileSystemIo.mktemp(prefix, suffix, preserve);
}

/**
@@ -646,7 +646,7 @@
if (fd == null) {
throw new NullPointerException();
}
- return FileWrapper.name(fd);
+ return FileSystemIo.name(fd);
}

public static int delete(Path path)

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLockImpl.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLockImpl.java?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLockImpl.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileLockImpl.java Wed Nov 18 12:10:10 2009
@@ -150,9 +150,9 @@
return;
}
if (length < 0)
- FileWrapper.unlock(fd);
+ FileSystemIo.unlock(fd);
else
- FileWrapper.unlock(fd, offset, length);
+ FileSystemIo.unlock(fd, offset, length);
/* Detach from this locks container
*/
container.detach(this);

Modified: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileStream.java Wed Nov 18 12:10:10 2009
@@ -148,7 +148,7 @@
public void clearerr()
throws IOException
{
- FileWrapper.clearerr(fd);
+ FileSystemIo.clearerr(fd);
fd.clearerr();
}

@@ -165,7 +165,7 @@
public boolean eof()
throws IOException
{
- return FileWrapper.eof(fd);
+ return FileSystemIo.eof(fd);
}

/**
@@ -182,7 +182,7 @@
public boolean isBlocking()
throws IOException
{
- return FileWrapper.blocking(fd);
+ return FileSystemIo.blocking(fd);
}

/**
@@ -201,7 +201,7 @@
public boolean setTimeout(int timeout)
throws IOException
{
- return FileWrapper.tmset(fd, timeout);
+ return FileSystemIo.tmset(fd, timeout);
}

/**
@@ -217,7 +217,7 @@
public int getTimeout()
throws IOException
{
- return FileWrapper.tmget(fd);
+ return FileSystemIo.tmget(fd);
}

/**
@@ -234,7 +234,7 @@
public FileType getFileType()
throws IOException
{
- return FileWrapper.ftype(fd);
+ return FileSystemIo.ftype(fd);
}

/**
@@ -257,7 +257,7 @@
public String getPath()
throws IOException
{
- return FileWrapper.name(fd);
+ return FileSystemIo.name(fd);
}

private boolean regionOverlaps(long offset, long length)
@@ -310,7 +310,7 @@
throw new OverlappingFileLockException();
}

- FileWrapper.lock(fd, type);
+ FileSystemIo.lock(fd, type);
/* Create FileLock wrapper object
*/
FileLockImpl lock = new FileLockImpl(this, fd, type);
@@ -373,7 +373,7 @@
*/
throw new OverlappingFileLockException();
}
- FileWrapper.lock(fd, type, offset, length);
+ FileSystemIo.lock(fd, type, offset, length);
/* Create FileLock wrapper object
*/
FileLockImpl lock = new FileLockImpl(this, fd, type, offset, length);
@@ -418,7 +418,7 @@
throw new IllegalArgumentException();
}
synchronized (sync) {
- FileWrapper.seek(fd, SeekMethod.SET.valueOf(), pos);
+ FileSystemIo.seek(fd, SeekMethod.SET.valueOf(), pos);
}
}

@@ -451,7 +451,7 @@
throw new IllegalArgumentException();
}
synchronized (sync) {
- return FileWrapper.seek(fd, moveMethod.valueOf(), off);
+ return FileSystemIo.seek(fd, moveMethod.valueOf(), off);
}
}

@@ -479,11 +479,11 @@
{
if (count > 0) {
synchronized (sync) {
- long cur = FileWrapper.seek(fd, SeekMethod.CUR.valueOf(), 0L);
- long eof = FileWrapper.seek(fd, SeekMethod.END.valueOf(), 0L);
+ long cur = FileSystemIo.seek(fd, SeekMethod.CUR.valueOf(), 0L);
+ long eof = FileSystemIo.seek(fd, SeekMethod.END.valueOf(), 0L);

int cnt = (int)((cur + count > eof) ? eof - cur : count);
- FileWrapper.seek(fd, SeekMethod.SET.valueOf(), cnt);
+ FileSystemIo.seek(fd, SeekMethod.SET.valueOf(), cnt);
return cnt;
}
}
@@ -507,7 +507,7 @@
public long getFilePointer()
throws IOException
{
- return FileWrapper.seek(fd, SeekMethod.CUR.valueOf(), 0L);
+ return FileSystemIo.seek(fd, SeekMethod.CUR.valueOf(), 0L);
}

/**
@@ -527,10 +527,10 @@
throws IOException
{
synchronized (sync) {
- long cur = FileWrapper.seek(fd, SeekMethod.CUR.valueOf(), 0L);
- long end = FileWrapper.seek(fd, SeekMethod.END.valueOf(), 0L);
+ long cur = FileSystemIo.seek(fd, SeekMethod.CUR.valueOf(), 0L);
+ long end = FileSystemIo.seek(fd, SeekMethod.END.valueOf(), 0L);

- FileWrapper.seek(fd, SeekMethod.SET.valueOf(), cur);
+ FileSystemIo.seek(fd, SeekMethod.SET.valueOf(), cur);
return end;
}
}
@@ -561,7 +561,7 @@
throw new IllegalArgumentException();
}
synchronized (sync) {
- FileWrapper.trunc(fd, newLength);
+ FileSystemIo.trunc(fd, newLength);
}
}

@@ -580,7 +580,7 @@
throws IOException, SecurityException
{
synchronized (sync) {
- return FileWrapper.stat(fd);
+ return FileSystemIo.stat(fd);
}
}

@@ -605,7 +605,7 @@
public int read()
throws IOException
{
- return FileWrapper.read(fd);
+ return FileSystemIo.read(fd);
}

/**
@@ -635,7 +635,7 @@
if (buffer.length == 0) {
return 0;
}
- return FileWrapper.read(fd, buffer, 0, buffer.length);
+ return FileSystemIo.read(fd, buffer, 0, buffer.length);
}

/**
@@ -678,7 +678,7 @@
*/
return 0;
}
- return FileWrapper.read(fd, buffer, offset, count);
+ return FileSystemIo.read(fd, buffer, offset, count);
}

/**
@@ -709,7 +709,7 @@
{
if (pointer.isNull())
throw new NullPointerException();
- return FileWrapper.read(fd, pointer, 0L, pointer.sizeof());
+ return FileSystemIo.read(fd, pointer, 0L, pointer.sizeof());
}

/**
@@ -759,7 +759,7 @@
*/
return 0L;
}
- return FileWrapper.read(fd, pointer, offset, count);
+ return FileSystemIo.read(fd, pointer, offset, count);
}

/**
@@ -786,7 +786,7 @@
public int read(ByteBuffer buffer)
throws IOException
{
- return FileWrapper.read(fd, buffer, 0, buffer.capacity());
+ return FileSystemIo.read(fd, buffer, 0, buffer.capacity());
}

/**
@@ -831,7 +831,7 @@
*/
return 0;
}
- return FileWrapper.read(fd, buffer, offset, count);
+ return FileSystemIo.read(fd, buffer, offset, count);
}

/**
@@ -856,7 +856,7 @@
public int write(int b)
throws IOException
{
- return FileWrapper.write(fd, b);
+ return FileSystemIo.write(fd, b);
}

/**
@@ -883,7 +883,7 @@
if (buffer.length == 0) {
return 0;
}
- return FileWrapper.write(fd, buffer, 0, buffer.length);
+ return FileSystemIo.write(fd, buffer, 0, buffer.length);
}

/**
@@ -922,7 +922,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.write(fd, buffer, offset, count);
+ return FileSystemIo.write(fd, buffer, offset, count);
}

/**
@@ -950,7 +950,7 @@
{
if (pointer.isNull())
throw new NullPointerException();
- return FileWrapper.write(fd, pointer, 0L, pointer.sizeof());
+ return FileSystemIo.write(fd, pointer, 0L, pointer.sizeof());
}

/**
@@ -993,7 +993,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.write(fd, pointer, offset, count);
+ return FileSystemIo.write(fd, pointer, offset, count);
}

/**
@@ -1017,7 +1017,7 @@
public int write(ByteBuffer buffer)
throws IOException
{
- return FileWrapper.write(fd, buffer, 0, buffer.capacity());
+ return FileSystemIo.write(fd, buffer, 0, buffer.capacity());
}

/**
@@ -1056,7 +1056,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.write(fd, buffer, offset, count);
+ return FileSystemIo.write(fd, buffer, offset, count);
}

/**
@@ -1094,7 +1094,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.write(fd, array, offset, count);
+ return FileSystemIo.write(fd, array, offset, count);
}

@@ -1132,7 +1132,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.write(fd, array, offset, count);
+ return FileSystemIo.write(fd, array, offset, count);
}

@@ -1174,7 +1174,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.writeFully(fd, buffer, offset, count);
+ return FileSystemIo.writeFully(fd, buffer, offset, count);
}

/**
@@ -1196,7 +1196,7 @@
public int writeFully(ByteBuffer buffer)
throws IOException
{
- return FileWrapper.write(fd, buffer, 0, buffer.capacity());
+ return FileSystemIo.write(fd, buffer, 0, buffer.capacity());
}

/**
@@ -1237,7 +1237,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.writeFully(fd, buffer, offset, count);
+ return FileSystemIo.writeFully(fd, buffer, offset, count);
}

@@ -1266,7 +1266,7 @@
{
if (pointer.isNull())
throw new NullPointerException();
- return FileWrapper.write(fd, pointer, 0L, pointer.sizeof());
+ return FileSystemIo.write(fd, pointer, 0L, pointer.sizeof());
}

/**
@@ -1308,7 +1308,7 @@
if (count == 0) {
return 0;
}
- return FileWrapper.writeFully(fd, pointer, offset, count);
+ return FileSystemIo.writeFully(fd, pointer, offset, count);
}

}

Copied: commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java (from r881730, commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java)
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java?p2=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java&p1=commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java&r1=881730&r2=881741&rev=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileWrapper.java (original)
+++ commons/sandbox/runtime/trunk/src/main/java/org/apache/commons/runtime/io/FileSystemIo.java Wed Nov 18 12:10:10 2009
@@ -28,16 +28,16 @@
import java.util.EnumSet;

/**
- * File wrapper class.
+ * File sytem wrapper class.
* 
- * Apache Commons Runtime {@code FileWrapper} provides static
+ * Apache Commons Runtime {@code FileSystemIo} provides static
* method API for native file portable layer.
* 
*/
-class FileWrapper
+class FileSystemIo
{

- protected FileWrapper()
+ protected FileSystemIo()
{
// Nothing.
}

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/finfo.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/finfo.c?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/finfo.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/finfo.c Wed Nov 18 12:10:10 2009
@@ -371,9 +371,9 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, stat0)(ACR_JNISTDARGS,
- jint fd,
- jboolean full)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, stat0)(ACR_JNISTDARGS,
+ jint fd,
+ jboolean full)
{
return _stat1(_E, fd, full);
}

Modified: commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/unix/fsysio.c Wed Nov 18 12:10:10 2009
@@ -269,9 +269,9 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open0)(ACR_JNISTDARGS,
- jstring fname,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open0)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags)
{
int rc = 0;
jobject fdo = NULL;
@@ -291,10 +291,10 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open1)(ACR_JNISTDARGS,
- jstring fname,
- jint flags,
- jint prot)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open1)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags,
+ jint prot)
{
int rc = 0;
jobject fdo = NULL;
@@ -314,9 +314,9 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open2)(ACR_JNISTDARGS,
- jint which,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open2)(ACR_JNISTDARGS,
+ jint which,
+ jint flags)
{
int rc = 0;
int fd = -1;
@@ -375,11 +375,11 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, mktemp0)(ACR_JNISTDARGS,
- jstring path,
- jstring prefix,
- jstring sufix,
- jboolean preserve)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, mktemp0)(ACR_JNISTDARGS,
+ jstring path,
+ jstring prefix,
+ jstring sufix,
+ jboolean preserve)
{
int rc = 0;
int fo;
@@ -469,9 +469,9 @@
return errno;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock0)(ACR_JNISTDARGS,
- jint file,
- jint type)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, lock0)(ACR_JNISTDARGS,
+ jint file,
+ jint type)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -534,11 +534,11 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock1)(ACR_JNISTDARGS,
- jint file,
- jint type,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, lock1)(ACR_JNISTDARGS,
+ jint file,
+ jint type,
+ jlong off,
+ jlong len)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -601,8 +601,7 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, unlock0)(ACR_JNISTDARGS, jint file)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -644,10 +643,10 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock1)(ACR_JNISTDARGS,
- jint file,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, unlock1)(ACR_JNISTDARGS,
+ jint file,
+ jlong off,
+ jlong len)
{
int rc;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -689,10 +688,10 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, seek0)(ACR_JNISTDARGS,
- jint file,
- jint where,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, seek0)(ACR_JNISTDARGS,
+ jint file,
+ jint where,
+ jlong off)
{
acr_off_t rc;
acr_off_t os = (acr_off_t)off;
@@ -729,9 +728,9 @@
return (jlong)rc;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, trunc0)(ACR_JNISTDARGS,
- jint file,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, trunc0)(ACR_JNISTDARGS,
+ jint file,
+ jlong off)
{
acr_off_t os = (acr_off_t)off;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -748,8 +747,8 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read0)(ACR_JNISTDARGS,
+ jint file)
{
unsigned char c;
ssize_t rd;
@@ -803,11 +802,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb = NULL;
jbyte *bc = NULL;
@@ -893,11 +892,11 @@

}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, read2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, read2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -960,11 +959,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jint off,
+ jint len)
{
#if defined(_DEBUG)
size_t pl;
@@ -1032,9 +1031,9 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write0)(ACR_JNISTDARGS,
- jint file,
- jint b)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write0)(ACR_JNISTDARGS,
+ jint file,
+ jint b)
{
unsigned char c = (unsigned char)(b & 0xFF);
ssize_t wr;
@@ -1080,11 +1079,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
size_t po = (size_t)off;
@@ -1138,11 +1137,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -1200,11 +1199,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jlong off,
+ jlong len)
{
#if defined(_DEBUG)
size_t pl;
@@ -1268,11 +1267,11 @@
}

#define ACR_IOVEC_ON_STACK 32
-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write4)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write4)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
size_t i;
size_t pl;
@@ -1363,11 +1362,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write5)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write5)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
size_t i;
size_t pl;
@@ -1442,11 +1441,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw0)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, fullw0)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
jbyte *wb;
@@ -1510,11 +1509,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, fullw1)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, fullw1)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
size_t po = (size_t)off;
@@ -1582,11 +1581,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw2)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, fullw2)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jint off,
+ jint len)
{
#if defined(_DEBUG)
size_t pl;

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/finfo.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/finfo.c?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/finfo.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/finfo.c Wed Nov 18 12:10:10 2009
@@ -502,9 +502,9 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, stat0)(ACR_JNISTDARGS,
- jint fd,
- jboolean full)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, stat0)(ACR_JNISTDARGS,
+ jint fd,
+ jboolean full)
{
return _stat1(_E, fd, full);
}

Modified: commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c (original)
+++ commons/sandbox/runtime/trunk/src/main/native/os/win32/fsysio.c Wed Nov 18 12:10:10 2009
@@ -277,9 +277,9 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open0)(ACR_JNISTDARGS,
- jstring fname,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open0)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags)
{
int rc = 0;
jobject fdo = NULL;
@@ -299,10 +299,10 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open1)(ACR_JNISTDARGS,
- jstring fname,
- jint flags,
- jint prot)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open1)(ACR_JNISTDARGS,
+ jstring fname,
+ jint flags,
+ jint prot)
{
int rc = 0;
jobject fdo = NULL;
@@ -322,9 +322,9 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, open2)(ACR_JNISTDARGS,
- jint which,
- jint flags)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, open2)(ACR_JNISTDARGS,
+ jint which,
+ jint flags)
{
DWORD rc = 0;
HANDLE fd = INVALID_HANDLE_VALUE;
@@ -395,11 +395,11 @@
return fdo;
}

-ACR_IO_EXPORT_DECLARE(jobject, FileWrapper, mktemp0)(ACR_JNISTDARGS,
- jstring path,
- jstring prefix,
- jstring sufix,
- jboolean preserve)
+ACR_IO_EXPORT_DECLARE(jobject, FileSystemIo, mktemp0)(ACR_JNISTDARGS,
+ jstring path,
+ jstring prefix,
+ jstring sufix,
+ jboolean preserve)
{
int rc = 0;
int fo;
@@ -495,9 +495,9 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock0)(ACR_JNISTDARGS,
- jint file,
- jint type)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, lock0)(ACR_JNISTDARGS,
+ jint file,
+ jint type)
{
DWORD flags = 0;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -515,11 +515,11 @@
return do_lock(f, flags);
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, lock1)(ACR_JNISTDARGS,
- jint file,
- jint type,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, lock1)(ACR_JNISTDARGS,
+ jint file,
+ jint type,
+ jlong off,
+ jlong len)
{
LARGE_INTEGER lii;
DWORD flags = 0;
@@ -582,8 +582,8 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, unlock0)(ACR_JNISTDARGS,
+ jint file)
{
OVERLAPPED opp;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -600,10 +600,10 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, unlock1)(ACR_JNISTDARGS,
- jint file,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, unlock1)(ACR_JNISTDARGS,
+ jint file,
+ jlong off,
+ jlong len)
{
LARGE_INTEGER lii;
OVERLAPPED opp;
@@ -624,7 +624,7 @@
return 0;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, seek0)(ACR_JNISTDARGS,
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, seek0)(ACR_JNISTDARGS,
jint file,
jint where,
jlong off)
@@ -667,9 +667,9 @@
return (jlong)f->pos;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, trunc0)(ACR_JNISTDARGS,
- jint file,
- jlong off)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, trunc0)(ACR_JNISTDARGS,
+ jint file,
+ jlong off)
{
LARGE_INTEGER os;
acr_file_t *f = (acr_file_t *)ACR_IOH_FDATA(file);
@@ -794,8 +794,8 @@
return rc;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read0)(ACR_JNISTDARGS,
- jint file)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read0)(ACR_JNISTDARGS,
+ jint file)
{
unsigned char c;
DWORD rd = 0;
@@ -904,11 +904,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb = NULL;
jbyte *bc = NULL;
@@ -1060,11 +1060,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, read2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, read2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
DWORD po = (DWORD)off;
@@ -1194,11 +1194,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, read3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, read3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jint off,
+ jint len)
{
#if defined(_DEBUG)
DWORD pl;
@@ -1332,9 +1332,9 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write0)(ACR_JNISTDARGS,
- jint file,
- jint b)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write0)(ACR_JNISTDARGS,
+ jint file,
+ jint b)
{
unsigned char c = (unsigned char)(b & 0xFF);
DWORD rc = 0;
@@ -1435,11 +1435,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write1)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write1)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
DWORD rc = 0;
@@ -1551,11 +1551,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write2)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write2)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
jbyte *pb;
@@ -1673,11 +1673,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, write3)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, write3)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jint off,
+ jint len)
{
#if defined(_DEBUG)
DWORD pl;
@@ -1799,11 +1799,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write4)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write4)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
DWORD i;
DWORD pl;
@@ -1928,11 +1928,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, write5)(ACR_JNISTDARGS,
- jint file,
- jobjectArray vec,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, write5)(ACR_JNISTDARGS,
+ jint file,
+ jobjectArray vec,
+ jint off,
+ jint len)
{
DWORD i;
DWORD pl;
@@ -2058,11 +2058,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw0)(ACR_JNISTDARGS,
- jint file,
- jbyteArray buf,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, fullw0)(ACR_JNISTDARGS,
+ jint file,
+ jbyteArray buf,
+ jint off,
+ jint len)
{
jbyte *bb;
jbyte *wb;
@@ -2187,11 +2187,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jlong, FileWrapper, fullw1)(ACR_JNISTDARGS,
- jint file,
- jobject ptr,
- jlong off,
- jlong len)
+ACR_IO_EXPORT_DECLARE(jlong, FileSystemIo, fullw1)(ACR_JNISTDARGS,
+ jint file,
+ jobject ptr,
+ jlong off,
+ jlong len)
{
size_t pl;
jbyte *pb;
@@ -2320,11 +2320,11 @@
return -1;
}

-ACR_IO_EXPORT_DECLARE(jint, FileWrapper, fullw2)(ACR_JNISTDARGS,
- jint file,
- jobject dbb,
- jint off,
- jint len)
+ACR_IO_EXPORT_DECLARE(jint, FileSystemIo, fullw2)(ACR_JNISTDARGS,
+ jint file,
+ jobject dbb,
+ jint off,
+ jint len)
{
#if defined(_DEBUG)
DWORD pl;

Modified: commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java
URL: http://svn.apache.org/viewvc/commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java?rev=881741&r1=881740&r2=881741&view=diff
==============================================================================
--- commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java (original)
+++ commons/sandbox/runtime/trunk/src/test/org/apache/commons/runtime/TestPrivate.java Wed Nov 18 12:10:10 2009
@@ -726,6 +726,8 @@
}
public int testCallback(Object o, int num)
{
+
+ int r = 0;
int i;
int [] fd = new int[100];
try {
@@ -735,9 +737,15 @@
} catch (Exception e) {
// Ignore
}
- for (i = 0; i < 100; i++)
- test053(fd[i]);
- synchronized (this) {
+ for (i = 0; i < 100; i++) {
+ if (fd[i] < 1)
+ r = 1;
+ else
+ test053(fd[i]);
+ }
+ if (r != 0)
+ return 1;
+ synchronized (o) {
((IohParallelWorker)o).numCalls++;
}
for (i = 0; i < 100; i++) {

Re: [JEXL 2.0] o.a.c.jexl or o.a.c.jexl2 ?

2009-11-18T00:52:42Z

Hi,

Henrib wrote at Mittwoch, 18. November 2009 00:53:

>
>
>
> Paul Benedict-2 wrote:
>>
>> ...
>> Do you think this is beneficial to your users?
>> ...
>>
> Who are JEXL users today?

http://mvnrepository.com/artifact/commons-jexl/commons-jexl/1.1

Most prominent: Maven 1, ServiceMix and commons-scxml.

However, there are enough projects using older versions:

http://mvnrepository.com/artifact/commons-jexl/commons-jexl/1.0

Most interesting for us: commons-jelly.

> Is it better for them to be one compilation away
> with no code change (based on known cases) or would they rather continue
> using an obsolete version?

Well, what do you do if you use commons-jelly, commons-scxml and
commons-jexl in combination?

> I'm a biased user and see Jexl as a coding "glue" convenient for dev teams
> and the compilation option suits me well. I also don't know how many
> active projects still use JEXL (besides Commons Configuration); its
> community is not very vocal... Thus the question trying to get other
> active users opinion. :-)

The question is, if it is a drop-in replacement. If not, you may not be able
to use the new version due to transitive deps.

- Jörg

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@...
For additional commands, e-mail: dev-help@...

svn commit: r881689 - /commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java

2009-11-17T23:11:42Z

Author: bayard
Date: Wed Nov 18 07:11:41 2009
New Revision: 881689

URL: http://svn.apache.org/viewvc?rev=881689&view=rev
Log:
Implementing Serializable - part of LANG-551

Modified:
commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java

Modified: commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java
URL: http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java?rev=881689&r1=881688&r2=881689&view=diff
==============================================================================
--- commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java (original)
+++ commons/proper/lang/trunk/src/java/org/apache/commons/lang/Range.java Wed Nov 18 07:11:41 2009
@@ -16,6 +16,7 @@
*/
package org.apache.commons.lang;

+import java.io.Serializable;
import java.util.Comparator;

/**
@@ -25,9 +26,10 @@
* @since 3.0
* @version $Id: Range.java 830032 2009-10-27 00:15:00Z scolebourne $
*/
-// TODO: Serializable?
// TODO: Make class final and use fields instead of getters?
-public class Range<T> {
+public class Range<T> implements Serializable {
+
+ private static final long serialVersionUID = 1L;

private final Comparator comparator;
private final T minimum;