svn commit: r745036 - /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/
Author: bodewig Date: Tue Feb 17 13:08:58 2009 New Revision: 745036 URL: http://svn.apache.org/viewvc?rev=745036view=rev Log: Add directory for ZIP specific tests Added: commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/
svn commit: r745043 - in /commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf: HttpMonitoringFeature.java MonitoringFeature.java
Author: nicolas
Date: Tue Feb 17 13:25:48 2009
New Revision: 745043
URL: http://svn.apache.org/viewvc?rev=745043view=rev
Log:
feature CXF - experimental
Added:
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/HttpMonitoringFeature.java
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/MonitoringFeature.java
Added:
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/HttpMonitoringFeature.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/HttpMonitoringFeature.java?rev=745043view=auto
==
---
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/HttpMonitoringFeature.java
(added)
+++
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/HttpMonitoringFeature.java
Tue Feb 17 13:25:48 2009
@@ -0,0 +1,33 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.instrumentation.cxf;
+
+/**
+ * Variant of MonitoringFeature to enable monitoring of CXF web services
EndPoints when deployed as HttpServlet
+ *
+ * @author a href=mailto:nico...@apache.org;Nicolas De Loof/a
+ */
+public class HttpMonitoringFeature
+extends MonitoringFeature
+{
+@Override
+protected MonitoringInInterceptor getMonitoringInInterceptor()
+{
+return new HttpMonitoringInInterceptor();
+}
+}
Added:
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/MonitoringFeature.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/MonitoringFeature.java?rev=745043view=auto
==
---
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/MonitoringFeature.java
(added)
+++
commons/sandbox/monitoring/branches/modules/instrumentation/src/main/java/org/apache/commons/monitoring/instrumentation/cxf/MonitoringFeature.java
Tue Feb 17 13:25:48 2009
@@ -0,0 +1,80 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the License); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an AS IS BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.commons.monitoring.instrumentation.cxf;
+
+import org.apache.commons.monitoring.Repository;
+import org.apache.cxf.Bus;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+/**
+ * CXF feature to enable web service monitoring.
+ *
+ * pre
+ * lt;jaxws:endpoint implementor=quot;#myServiceBeanquot;
address=quot;/myServicequot; wsdlLocation=quot;wsdl/myService.wsdlquot;gt;
+ * lt;jaxws:featuresgt;
+ * lt;bean
class=quot;org.apache.commons.monitoring.instrumentation.cxf.MonitoringFeaturequot;
/gt;
+ * lt;/jaxws:featuresgt;
+ * lt;/jaxws:endpointgt;
+ * /pre
+ *
+ * @author a href=mailto:nico...@apache.org;Nicolas De Loof/a
+ */
+public class MonitoringFeature
+extends AbstractFeature
+{
+private Repository
svn commit: r745044 - /commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java
Author: nicolas
Date: Tue Feb 17 13:27:46 2009
New Revision: 745044
URL: http://svn.apache.org/viewvc?rev=745044view=rev
Log:
convert method
Modified:
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java
Modified:
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java?rev=745044r1=745043r2=745044view=diff
==
---
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java
(original)
+++
commons/sandbox/monitoring/branches/modules/core/src/main/java/org/apache/commons/monitoring/Unit.java
Tue Feb 17 13:27:46 2009
@@ -145,14 +145,17 @@
return scale;
}
-//public long getScale( Unit other )
-//{
-//if ( !isCompatible( other ) )
-//{
-//throw new IllegalArgumentException( other + is incompatible
with + this );
-//}
-//return scale;
-//}
+/**
+ * Convert value from unit to this unit (if conpatible)
+ *
+ * @param value value to convert
+ * @param unit unit of value
+ * @return value converted to this unit
+ */
+public double convert( double value, Unit unit )
+{
+return value * unit.getScale() / this.getScale();
+}
public boolean isPrimary()
{
svn commit: r745046 - in /commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip: AsiExtraFieldTest.java ExtraFieldUtilsTest.java ZipArchiveEntryTest.java ZipArchiveOut
Author: bodewig
Date: Tue Feb 17 13:30:20 2009
New Revision: 745046
URL: http://svn.apache.org/viewvc?rev=745046view=rev
Log:
copy Ant's zip tests
Added:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveOutputStreamTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipOutputStreamTest.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipLongTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipLongTest.java
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipShortTest.java
- copied, changed from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipShortTest.java
Copied:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
(from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java?p2=commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.javap1=ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.javar1=745042r2=745046rev=745046view=diff
==
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/AsiExtraFieldTest.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/AsiExtraFieldTest.java
Tue Feb 17 13:30:20 2009
@@ -16,12 +16,12 @@
*
*/
-package org.apache.tools.zip;
+package org.apache.commons.compress.archivers.zip;
import junit.framework.TestCase;
/**
- * JUnit 3 testcases for org.apache.tools.zip.AsiExtraField.
+ * JUnit 3 testcases for
org.apache.commons.compress.archivers.zip.AsiExtraField.
*
*/
public class AsiExtraFieldTest extends TestCase implements UnixStat {
Copied:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
(from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java?p2=commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.javap1=ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.javar1=745042r2=745046rev=745046view=diff
==
---
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ExtraFieldUtilsTest.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ExtraFieldUtilsTest.java
Tue Feb 17 13:30:20 2009
@@ -16,12 +16,12 @@
*
*/
-package org.apache.tools.zip;
+package org.apache.commons.compress.archivers.zip;
import junit.framework.TestCase;
/**
- * JUnit 3 testcases for org.apache.tools.zip.ExtraFieldUtils.
+ * JUnit 3 testcases for
org.apache.commons.compress.archivers.zip.ExtraFieldUtils.
*
*/
public class ExtraFieldUtilsTest extends TestCase implements UnixStat {
Copied:
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
(from r745042,
ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java?p2=commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.javap1=ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.javar1=745042r2=745046rev=745046view=diff
==
--- ant/core/trunk/src/tests/junit/org/apache/tools/zip/ZipEntryTest.java
(original)
+++
commons/sandbox/compress/trunk/src/test/java/org/apache/commons/compress/archivers/zip/ZipArchiveEntryTest.java
Tue Feb 17 13:30:20 2009
@@ -16,17
svn commit: r745047 - /commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java
Author: sebb Date: Tue Feb 17 13:32:39 2009 New Revision: 745047 URL: http://svn.apache.org/viewvc?rev=745047view=rev Log: Remove unused imports Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java Modified: commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java?rev=745047r1=745046r2=745047view=diff == --- commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java (original) +++ commons/proper/collections/trunk/src/java/org/apache/commons/collections/keyvalue/MultiKey.java Tue Feb 17 13:32:39 2009 @@ -16,8 +16,6 @@ */ package org.apache.commons.collections.keyvalue; -import java.io.IOException; -import java.io.ObjectInputStream; import java.io.Serializable; import java.util.Arrays;
svn commit: r745048 - /commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
Author: sebb
Date: Tue Feb 17 13:33:19 2009
New Revision: 745048
URL: http://svn.apache.org/viewvc?rev=745048view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java?rev=745048r1=745047r2=745048view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/LocalTestNode.java
Tue Feb 17 13:33:19 2009
@@ -71,7 +71,8 @@
*
* @param o
*
- * @return
+ * @return a negative integer, zero, or a positive integer
+ * as this object is less than, equal to, or greater than the specified
object.
*/
public int compareTo(Object o) {
svn commit: r745049 - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: TestHashBag.java TestLinkedList.java
Author: sebb
Date: Tue Feb 17 13:34:20 2009
New Revision: 745049
URL: http://svn.apache.org/viewvc?rev=745049view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestHashBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestHashBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestHashBag.java?rev=745049r1=745048r2=745049view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestHashBag.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestHashBag.java
Tue Feb 17 13:34:20 2009
@@ -22,7 +22,7 @@
import org.apache.commons.collections.bag.AbstractTestBag;
/**
- * Extension of {...@link TestBag} for exercising the {...@link HashBag}
+ * Extension of {...@link AbstractTestBag} for exercising the {...@link
HashBag}
* implementation.
*
* @version $Revision$ $Date$
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java?rev=745049r1=745048r2=745049view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestLinkedList.java
Tue Feb 17 13:34:20 2009
@@ -28,7 +28,7 @@
* Tests base {...@link java.util.LinkedList} methods and contracts.
* p
* To use, simply extend this class, and implement
- * the {...@link #makeLinkedList} method.
+ * the {...@link #makeEmptyLinkedList()} method.
* p
* If your {...@link LinkedList} fails one of these tests by design,
* you may still use this base set of cases. Simply override the
@@ -126,7 +126,7 @@
}
/**
- * Tests {...@link LinkedList#getFirst(Object)}.
+ * Tests {...@link LinkedList#getFirst()}.
*/
public void testLinkedListGetFirst() {
resetEmpty();
@@ -148,7 +148,7 @@
}
/**
- * Tests {...@link LinkedList#getLast(Object)}.
+ * Tests {...@link LinkedList#getLast()}.
*/
public void testLinkedListGetLast() {
resetEmpty();
@@ -170,7 +170,7 @@
}
/**
- * Tests {...@link LinkedList#removeFirst(Object)}.
+ * Tests {...@link LinkedList#removeFirst()}.
*/
public void testLinkedListRemoveFirst() {
if (!isRemoveSupported()) return;
@@ -194,7 +194,7 @@
}
/**
- * Tests {...@link LinkedList#removeLast(Object)}.
+ * Tests {...@link LinkedList#removeLast()}.
*/
public void testLinkedListRemoveLast() {
if (!isRemoveSupported()) return;
@@ -218,14 +218,14 @@
}
/**
- * Returns an empty {...@link ArrayList}.
+ * Returns an empty {...@link LinkedList}.
*/
public Collection makeConfirmedCollection() {
return new LinkedList();
}
/**
- * Returns a full {...@link ArrayList}.
+ * Returns a full {...@link LinkedList}.
*/
public Collection makeConfirmedFullCollection() {
List list = new LinkedList();
svn commit: r745050 - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: ./ bag/
Author: sebb
Date: Tue Feb 17 13:35:13 2009
New Revision: 745050
URL: http://svn.apache.org/viewvc?rev=745050view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedSortedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTreeBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTypedBag.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTypedSortedBag.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeBag.java?rev=745050r1=745049r2=745050view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeBag.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/TestTreeBag.java
Tue Feb 17 13:35:13 2009
@@ -22,7 +22,7 @@
import org.apache.commons.collections.bag.AbstractTestBag;
/**
- * Extension of {...@link TestBag} for exercising the {...@link TreeBag}
+ * Extension of {...@link AbstractTestBag} for exercising the {...@link
TreeBag}
* implementation.
*
* @version $Revision$ $Date$
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java?rev=745050r1=745049r2=745050view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestHashBag.java
Tue Feb 17 13:35:13 2009
@@ -22,7 +22,7 @@
import org.apache.commons.collections.Bag;
/**
- * Extension of {...@link TestBag} for exercising the {...@link HashBag}
+ * Extension of {...@link AbstractTestBag} for exercising the {...@link
HashBag}
* implementation.
*
* @version $Revision$ $Date$
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java?rev=745050r1=745049r2=745050view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedBag.java
Tue Feb 17 13:35:13 2009
@@ -26,7 +26,7 @@
import org.apache.commons.collections.PredicateUtils;
/**
- * Extension of {...@link TestBag} for exercising the {...@link PredicatedBag}
+ * Extension of {...@link AbstractTestBag} for exercising the {...@link
PredicatedBag}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java?rev=745050r1=745049r2=745050view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestPredicatedSortedBag.java
Tue Feb 17 13:35:13 2009
@@ -27,7 +27,7 @@
import org.apache.commons.collections.SortedBag;
/**
- * Extension of {...@link TestBag} for exercising the {...@link
PredicatedSortedBag}
+ * Extension of {...@link AbstractTestSortedBag} for exercising the {...@link
PredicatedSortedBag}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/bag/TestTransformedBag.java?rev=745050r1=745049r2=745050view=diff
svn commit: r745054 - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: iterators/ keyvalue/ list/
Author: sebb
Date: Tue Feb 17 13:37:26 2009
New Revision: 745054
URL: http://svn.apache.org/viewvc?rev=745054view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestSynchronizedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTransformedList.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestTypedList.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java?rev=745054r1=745053r2=745054view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/iterators/TestFilterIterator.java
Tue Feb 17 13:37:26 2009
@@ -85,7 +85,7 @@
* Returns an array with elements wrapped in a pass-through
* FilterIterator
*
- * @return
+ * @return a filtered iterator
*/
public Iterator makeFullIterator() {
array = new String[] { a, b, c };
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java?rev=745054r1=745053r2=745054view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/keyvalue/TestMultiKey.java
Tue Feb 17 13:37:26 2009
@@ -32,7 +32,7 @@
import junit.framework.TestSuite;
/**
- * Unit tests for {...@link org.apache.commons.collections.MultiKey}.
+ * Unit tests for {...@link org.apache.commons.collections.keyvalue.MultiKey}.
*
* @version $Revision$ $Date$
*
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java?rev=745054r1=745053r2=745054view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestFixedSizeList.java
Tue Feb 17 13:37:26 2009
@@ -24,7 +24,7 @@
import junit.framework.TestSuite;
/**
- * Extension of {...@link TestList} for exercising the {...@link FixedSizeList}
+ * Extension of {...@link AbstractTestList} for exercising the {...@link
FixedSizeList}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java?rev=745054r1=745053r2=745054view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestGrowthList.java
Tue Feb 17 13:37:26 2009
@@ -25,7 +25,7 @@
import junit.framework.TestSuite;
/**
- * Extension of {...@link TestList} for exercising the {...@link GrowthList}.
+ * Extension of {...@link AbstractTestList} for exercising the {...@link
GrowthList}.
*
* @since Commons Collections 3.2
* @version $Revision: 155406 $ $Date$
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/list/TestPredicatedList.java?rev=745054r1=745053r2=745054view=diff
==
---
svn commit: r745055 - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections/map: TestDefaultedMap.java TestFixedSizeSortedMap.java TestLazyMap.java TestListOrderedMap.java TestL
Author: sebb
Date: Tue Feb 17 13:38:16 2009
New Revision: 745055
URL: http://svn.apache.org/viewvc?rev=745055view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java?rev=745055r1=745054r2=745055view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestDefaultedMap.java
Tue Feb 17 13:38:16 2009
@@ -28,7 +28,7 @@
import org.apache.commons.collections.functors.ConstantFactory;
/**
- * Extension of {...@link TestMap} for exercising the
+ * Extension of {...@link AbstractTestMap} for exercising the
* {...@link DefaultedMap} implementation.
*
* @since Commons Collections 3.2
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java?rev=745055r1=745054r2=745055view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestFixedSizeSortedMap.java
Tue Feb 17 13:38:16 2009
@@ -25,7 +25,7 @@
import org.apache.commons.collections.BulkTest;
/**
- * Extension of {...@link TestSortedMap} for exercising the {...@link
FixedSizeSortedMap}
+ * Extension of {...@link AbstractTestSortedMap} for exercising the {...@link
FixedSizeSortedMap}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java?rev=745055r1=745054r2=745055view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestLazyMap.java
Tue Feb 17 13:38:16 2009
@@ -26,7 +26,7 @@
import org.apache.commons.collections.FactoryUtils;
/**
- * Extension of {...@link TestMap} for exercising the
+ * Extension of {...@link AbstractTestMap} for exercising the
* {...@link LazyMap} implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java?rev=745055r1=745054r2=745055view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap.java
Tue Feb 17 13:38:16 2009
@@ -28,7 +28,7 @@
import org.apache.commons.collections.list.AbstractTestList;
/**
- * Extension of {...@link TestMap} for exercising the {...@link ListOrderedMap}
+ * Extension of {...@link AbstractTestOrderedMap} for exercising the {...@link
ListOrderedMap}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java?rev=745055r1=745054r2=745055view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestListOrderedMap2.java
Tue Feb 17 13:38:16 2009
@@ -27,7 +27,7 @@
import
svn commit: r745057 - in /commons/proper/collections/trunk/src/test/org/apache/commons/collections: map/ set/
Author: sebb
Date: Tue Feb 17 13:39:07 2009
New Revision: 745057
URL: http://svn.apache.org/viewvc?rev=745057view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSortedSet.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java?rev=745057r1=745056r2=745057view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestTransformedMap.java
Tue Feb 17 13:39:07 2009
@@ -27,7 +27,7 @@
import org.apache.commons.collections.collection.TestTransformedCollection;
/**
- * Extension of {...@link TestMap} for exercising the {...@link TransformedMap}
+ * Extension of {...@link AbstractTestMap} for exercising the {...@link
TransformedMap}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java?rev=745057r1=745056r2=745057view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet.java
Tue Feb 17 13:39:07 2009
@@ -26,7 +26,7 @@
import junit.framework.TestSuite;
/**
- * Extension of {...@link TestSet} for exercising the {...@link ListOrderedSet}
+ * Extension of {...@link AbstractTestSet} for exercising the {...@link
ListOrderedSet}
* implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java?rev=745057r1=745056r2=745057view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestListOrderedSet2.java
Tue Feb 17 13:39:07 2009
@@ -25,7 +25,7 @@
import junit.framework.TestSuite;
/**
- * Extension of {...@link TestSet} for exercising the {...@link ListOrderedSet}
+ * Extension of {...@link AbstractTestSet} for exercising the {...@link
ListOrderedSet}
* implementation.
*
* @since Commons Collections 3.1
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java?rev=745057r1=745056r2=745057view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestPredicatedSet.java
Tue Feb 17 13:39:07 2009
@@ -26,7 +26,7 @@
import org.apache.commons.collections.PredicateUtils;
/**
- * Extension of {...@link TestSet} for exercising the
+ * Extension of {...@link AbstractTestSet} for exercising the
* {...@link PredicatedSet} implementation.
*
* @since Commons Collections 3.0
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java?rev=745057r1=745056r2=745057view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/set/TestTransformedSet.java
(original)
+++
svn commit: r745058 - /commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java
Author: sebb Date: Tue Feb 17 13:39:37 2009 New Revision: 745058 URL: http://svn.apache.org/viewvc?rev=745058view=rev Log: Remove unused imports Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Modified: commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java URL: http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java?rev=745058r1=745057r2=745058view=diff == --- commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java (original) +++ commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestMultiValueMap.java Tue Feb 17 13:39:37 2009 @@ -26,7 +26,6 @@ import java.util.Map; import junit.framework.Test; -import junit.framework.TestCase; import junit.framework.TestSuite; import org.apache.commons.collections.IteratorUtils;
svn commit: r745059 - /commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
Author: sebb
Date: Tue Feb 17 13:39:55 2009
New Revision: 745059
URL: http://svn.apache.org/viewvc?rev=745059view=rev
Log:
Javadoc fix
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
Modified:
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
URL:
http://svn.apache.org/viewvc/commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java?rev=745059r1=745058r2=745059view=diff
==
---
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
(original)
+++
commons/proper/collections/trunk/src/test/org/apache/commons/collections/map/TestPredicatedMap.java
Tue Feb 17 13:39:55 2009
@@ -27,7 +27,7 @@
import org.apache.commons.collections.PredicateUtils;
/**
- * Extension of {...@link TestMap} for exercising the
+ * Extension of {...@link AbstractTestMap} for exercising the
* {...@link PredicatedMap} implementation.
*
* @since Commons Collections 3.0
svn commit: r745074 - in /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils: BeanComparatorTestCase.java DynaRowSetTestCase.java
Author: sebb
Date: Tue Feb 17 14:00:58 2009
New Revision: 745074
URL: http://svn.apache.org/viewvc?rev=745074view=rev
Log:
Remove unused imports
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaRowSetTestCase.java
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java?rev=745074r1=745073r2=745074view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BeanComparatorTestCase.java
Tue Feb 17 14:00:58 2009
@@ -18,11 +18,8 @@
package org.apache.commons.beanutils;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Map;
-import junit.framework.TestCase;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
@@ -216,7 +213,7 @@
}
catch (ClassCastException cce){
- ; // Expected result
+ // Expected result
}
catch (Exception e) {
fail(Exception + e);
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaRowSetTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaRowSetTestCase.java?rev=745074r1=745073r2=745074view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaRowSetTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/DynaRowSetTestCase.java
Tue Feb 17 14:00:58 2009
@@ -20,16 +20,13 @@
import java.math.BigDecimal;
-import java.sql.Date;
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.SQLException;
-import java.sql.Timestamp;
-import java.sql.Types;
import java.util.List;
-import junit.framework.TestCase;
import junit.framework.Test;
+import junit.framework.TestCase;
import junit.framework.TestSuite;
svn commit: r745075 - in /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils: LazyDynaListTestCase.java MappedPropertyChildBean.java MappedPropertyChildInterface.java MappedPropertyT
Author: sebb Date: Tue Feb 17 14:01:41 2009 New Revision: 745075 URL: http://svn.apache.org/viewvc?rev=745075view=rev Log: Remove unused imports Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/LazyDynaListTestCase.java commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildBean.java commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildInterface.java commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestCase.java Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/LazyDynaListTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/LazyDynaListTestCase.java?rev=745075r1=745074r2=745075view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/LazyDynaListTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/LazyDynaListTestCase.java Tue Feb 17 14:01:41 2009 @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.TreeMap; import java.util.ArrayList; -import java.util.LinkedList; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildBean.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildBean.java?rev=745075r1=745074r2=745075view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildBean.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildBean.java Tue Feb 17 14:01:41 2009 @@ -18,8 +18,6 @@ package org.apache.commons.beanutils; -import java.util.HashMap; -import java.util.Map; /** * Inherited Mapped property test bean. Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildInterface.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildInterface.java?rev=745075r1=745074r2=745075view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildInterface.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyChildInterface.java Tue Feb 17 14:01:41 2009 @@ -18,8 +18,6 @@ package org.apache.commons.beanutils; -import java.util.HashMap; -import java.util.Map; /** * Test Child Interface Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestCase.java?rev=745075r1=745074r2=745075view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/MappedPropertyTestCase.java Tue Feb 17 14:01:41 2009 @@ -19,7 +19,6 @@ import junit.framework.TestCase; import junit.framework.Test; import junit.framework.TestSuite; -import java.lang.reflect.Method; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
svn commit: r745077 - in /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils: WrapDynaBeanTestCase.java bugs/Jira157TestCase.java
Author: sebb
Date: Tue Feb 17 14:02:16 2009
New Revision: 745077
URL: http://svn.apache.org/viewvc?rev=745077view=rev
Log:
Unnecessary ;
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/WrapDynaBeanTestCase.java?rev=745077r1=745076r2=745077view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/WrapDynaBeanTestCase.java
Tue Feb 17 14:02:16 2009
@@ -103,7 +103,7 @@
Object result = bean.get(invalidProperty);
fail(Invalid get should have thrown IllegalArgumentException);
} catch (IllegalArgumentException t) {
-; // Expected result
+// Expected result
}
// Invalid setter
@@ -111,7 +111,7 @@
bean.set(invalidProperty, XYZ);
fail(Invalid set should have thrown IllegalArgumentException);
} catch (IllegalArgumentException t) {
-; // Expected result
+// Expected result
}
// Set up initial Value
@@ -143,7 +143,7 @@
Object result = bean.get(invalidProperty, 0);
fail(Invalid get should have thrown IllegalArgumentException);
} catch (IllegalArgumentException t) {
-; // Expected result
+// Expected result
}
// Invalid setter
@@ -151,7 +151,7 @@
bean.set(invalidProperty, 0, XYZ);
fail(Invalid set should have thrown IllegalArgumentException);
} catch (IllegalArgumentException t) {
-; // Expected result
+// Expected result
}
// Set up initial Value
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java?rev=745077r1=745076r2=745077view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/bugs/Jira157TestCase.java
Tue Feb 17 14:02:16 2009
@@ -165,7 +165,7 @@
public static interface XY {
String getX();
String getY();
-};
+}
public static class FooBar {
String getPackageFoo() {
@@ -180,5 +180,5 @@
public String getPublicFoo() {
return PublicFoo Value;
}
-};
+}
}
svn commit: r745078 - in /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters: ArrayConverterTestCase.java IntegerConverterTestCase.java MemoryTestCase.java
Author: sebb Date: Tue Feb 17 14:03:10 2009 New Revision: 745078 URL: http://svn.apache.org/viewvc?rev=745078view=rev Log: Remove unused imports Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/MemoryTestCase.java Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java?rev=745078r1=745077r2=745078view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/ArrayConverterTestCase.java Tue Feb 17 14:03:10 2009 @@ -20,8 +20,6 @@ import java.util.ArrayList; import java.util.Locale; -import org.apache.commons.beanutils.ConversionException; - import junit.framework.TestCase; import junit.framework.TestSuite; Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java?rev=745078r1=745077r2=745078view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/IntegerConverterTestCase.java Tue Feb 17 14:03:10 2009 @@ -17,13 +17,8 @@ package org.apache.commons.beanutils.converters; -import java.text.DecimalFormat; -import java.text.NumberFormat; -import java.util.Locale; - import junit.framework.TestSuite; -import org.apache.commons.beanutils.ConversionException; import org.apache.commons.beanutils.Converter; Modified: commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/MemoryTestCase.java URL: http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/MemoryTestCase.java?rev=745078r1=745077r2=745078view=diff == --- commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/MemoryTestCase.java (original) +++ commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/converters/MemoryTestCase.java Tue Feb 17 14:03:10 2009 @@ -21,8 +21,6 @@ import org.apache.commons.beanutils.Converter; import org.apache.commons.beanutils.ConvertUtils; -import org.apache.commons.beanutils.ConversionException; - import junit.framework.TestCase; /**
svn commit: r745079 - in /commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils: ConvertUtilsBean.java LazyDynaList.java
Author: sebb
Date: Tue Feb 17 14:04:10 2009
New Revision: 745079
URL: http://svn.apache.org/viewvc?rev=745079view=rev
Log:
Remove unnecessary casts
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaList.java
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java?rev=745079r1=745078r2=745079view=diff
==
---
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
(original)
+++
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/ConvertUtilsBean.java
Tue Feb 17 14:04:10 2009
@@ -424,14 +424,14 @@
public String convert(Object value) {
if (value == null) {
-return ((String) null);
+return null;
} else if (value.getClass().isArray()) {
if (Array.getLength(value) 1) {
return (null);
}
value = Array.get(value, 0);
if (value == null) {
-return ((String) null);
+return null;
} else {
Converter converter = lookup(String.class);
return ((String) converter.convert(String.class, value));
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaList.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaList.java?rev=745079r1=745078r2=745079view=diff
==
---
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaList.java
(original)
+++
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/LazyDynaList.java
Tue Feb 17 14:04:10 2009
@@ -417,7 +417,7 @@
if (Map.class.isAssignableFrom(elementType)) {
array[i] = ((LazyDynaMap)get(i)).getMap();
} else if (DynaBean.class.isAssignableFrom(elementType)) {
-array[i] = (DynaBean)get(i);
+array[i] = get(i);
} else {
array[i] = ((WrapDynaBean)get(i)).getInstance();
}
svn commit: r745081 - /commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
Author: sebb
Date: Tue Feb 17 14:05:20 2009
New Revision: 745081
URL: http://svn.apache.org/viewvc?rev=745081view=rev
Log:
Remove unnecessary cast
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java?rev=745081r1=745080r2=745081view=diff
==
---
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
(original)
+++
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/converters/NumberConverter.java
Tue Feb 17 14:05:20 2009
@@ -537,7 +537,7 @@
*/
private Number parse(Class sourceType, Class targetType, String value,
NumberFormat format) {
ParsePosition pos = new ParsePosition(0);
-Number parsedNumber = (Number)format.parse(value, pos);
+Number parsedNumber = format.parse(value, pos);
if (pos.getErrorIndex() = 0 || pos.getIndex() != value.length() ||
parsedNumber == null) {
String msg = Error converting from ' + toString(sourceType) + '
to ' + toString(targetType) + ';
if (format instanceof DecimalFormat) {
svn commit: r745087 - /commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
Author: sebb
Date: Tue Feb 17 14:10:44 2009
New Revision: 745087
URL: http://svn.apache.org/viewvc?rev=745087view=rev
Log:
If you mean null, use it ...
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
Modified:
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java?rev=745087r1=745086r2=745087view=diff
==
---
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
(original)
+++
commons/proper/beanutils/trunk/src/java/org/apache/commons/beanutils/BeanUtilsBean.java
Tue Feb 17 14:10:44 2009
@@ -980,8 +980,8 @@
if (type.isArray() (index 0)) { // Scalar value into array
if (value == null) {
String[] values = new String[1];
-values[0] = (String) value;
-newValue = getConvertUtils().convert((String[]) values, type);
+values[0] = null;
+newValue = getConvertUtils().convert(values, type);
} else if (value instanceof String) {
newValue = getConvertUtils().convert(value, type);
} else if (value instanceof String[]) {
svn commit: r745089 - /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java
Author: sebb
Date: Tue Feb 17 14:11:20 2009
New Revision: 745089
URL: http://svn.apache.org/viewvc?rev=745089view=rev
Log:
Remove unnecessary cast
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java?rev=745089r1=745088r2=745089view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/IndexedTestBean.java
Tue Feb 17 14:11:20 2009
@@ -61,7 +61,7 @@
* Indexed Getter for the String[] property.
*/
public String getStringArray(int index) {
-return (String)stringArray[index];
+return stringArray[index];
}
/**
svn commit: r745090 - /commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
Author: sebb
Date: Tue Feb 17 14:12:41 2009
New Revision: 745090
URL: http://svn.apache.org/viewvc?rev=745090view=rev
Log:
Remove casts that prevent the assertions from working
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
Modified:
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
URL:
http://svn.apache.org/viewvc/commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java?rev=745090r1=745089r2=745090view=diff
==
---
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
(original)
+++
commons/proper/beanutils/trunk/src/test/org/apache/commons/beanutils/BasicDynaBeanTestCase.java
Tue Feb 17 14:12:41 2009
@@ -740,7 +740,7 @@
try {
bean.set(intArray, 0, new Integer(1));
-value = (Integer) bean.get(intArray, 0);
+value = bean.get(intArray, 0);
assertNotNull(Returned new value 0, value);
assertTrue(Returned Integer new value 0,
value instanceof Integer);
@@ -752,7 +752,7 @@
try {
bean.set(intIndexed, 1, new Integer(11));
-value = (Integer) bean.get(intIndexed, 1);
+value = bean.get(intIndexed, 1);
assertNotNull(Returned new value 1, value);
assertTrue(Returned Integer new value 1,
value instanceof Integer);
@@ -764,7 +764,7 @@
try {
bean.set(listIndexed, 2, New Value 2);
-value = (String) bean.get(listIndexed, 2);
+value = bean.get(listIndexed, 2);
assertNotNull(Returned new value 2, value);
assertTrue(Returned String new value 2,
value instanceof String);
@@ -776,7 +776,7 @@
try {
bean.set(stringArray, 3, New Value 3);
-value = (String) bean.get(stringArray, 3);
+value = bean.get(stringArray, 3);
assertNotNull(Returned new value 3, value);
assertTrue(Returned String new value 3,
value instanceof String);
@@ -788,7 +788,7 @@
try {
bean.set(stringIndexed, 4, New Value 4);
-value = (String) bean.get(stringIndexed, 4);
+value = bean.get(stringIndexed, 4);
assertNotNull(Returned new value 4, value);
assertTrue(Returned String new value 4,
value instanceof String);
svn commit: r745188 - in /commons/proper/math/trunk/src/java/org/apache/commons/math/estimation: AbstractEstimator.java GaussNewtonEstimator.java
Author: luc
Date: Tue Feb 17 18:38:32 2009
New Revision: 745188
URL: http://svn.apache.org/viewvc?rev=745188view=rev
Log:
added a no-args constructor for GaussNewtonEstimator
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/AbstractEstimator.java
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/AbstractEstimator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/AbstractEstimator.java?rev=745188r1=745187r2=745188view=diff
==
---
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/AbstractEstimator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/AbstractEstimator.java
Tue Feb 17 18:38:32 2009
@@ -34,10 +34,16 @@
*/
public abstract class AbstractEstimator implements Estimator {
+/** Default maximal number of cost evaluations allowed. */
+public static final int DEFAULT_MAX_COST_EVALUATIONS = 100;
+
/**
* Build an abstract estimator for least squares problems.
+ * pThe maximal number of cost evaluations allowed is set
+ * to its default value {...@link #DEFAULT_MAX_COST_EVALUATIONS}./p
*/
protected AbstractEstimator() {
+setMaxCostEval(DEFAULT_MAX_COST_EVALUATIONS);
}
/**
Modified:
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java
URL:
http://svn.apache.org/viewvc/commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java?rev=745188r1=745187r2=745188view=diff
==
---
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java
(original)
+++
commons/proper/math/trunk/src/java/org/apache/commons/math/estimation/GaussNewtonEstimator.java
Tue Feb 17 18:38:32 2009
@@ -40,6 +40,34 @@
public class GaussNewtonEstimator extends AbstractEstimator implements
Serializable {
+/** Serializable version identifier */
+private static final long serialVersionUID = 5485001826076289109L;
+
+/** Default threshold for cost steady state detection. */
+private static final double DEFAULT_STEADY_STATE_THRESHOLD = 1.0e-6;
+
+/** Default threshold for cost convergence. */
+private static final double DEFAULT_CONVERGENCE = 1.0e-6;
+
+/** Threshold for cost steady state detection. */
+private double steadyStateThreshold;
+
+/** Threshold for cost convergence. */
+private double convergence;
+
+/** Simple constructor with default settings.
+ * p
+ * The estimator is built with default values for all settings.
+ * /p
+ * @see #DEFAULT_STEADY_STATE_THRESHOLD
+ * @see #DEFAULT_CONVERGENCE
+ * @see AbstractEstimator#DEFAULT_MAX_COST_EVALUATIONS
+ */
+public GaussNewtonEstimator() {
+this.steadyStateThreshold = DEFAULT_STEADY_STATE_THRESHOLD;
+this.convergence = DEFAULT_CONVERGENCE;
+}
+
/**
* Simple constructor.
*
@@ -66,19 +94,42 @@
* to improve the criterion anymore
* @param steadyStateThreshold steady state detection threshold, the
* problem has converged has reached a steady state if
- * codeMath.abs (Jn - Jn-1) Jn * convergence/code, where
- * codeJn/code and codeJn-1/code are the current and
- * preceding criterion value (square sum of the weighted residuals
- * of considered measurements).
+ * codeMath.abs(Jsubn/sub - Jsubn-1/sub) lt;
+ * Jsubn/sub times convergence/code, where
codeJsubn/sub/code
+ * and codeJsubn-1/sub/code are the current and preceding criterion
+ * values (square sum of the weighted residuals of considered
measurements).
*/
-public GaussNewtonEstimator(int maxCostEval,
-double convergence,
-double steadyStateThreshold) {
+public GaussNewtonEstimator(final int maxCostEval, final double
convergence,
+final double steadyStateThreshold) {
setMaxCostEval(maxCostEval);
this.steadyStateThreshold = steadyStateThreshold;
this.convergence = convergence;
}
+/**
+ * Set the convergence criterion threshold.
+ * @param convergence criterion threshold below which we do not need
+ * to improve the criterion anymore
+ */
+public void setConvergence(final double convergence) {
+this.convergence = convergence;
+}
+
+/**
+ * Set the steady state detection threshold.
+ * p
+ * The problem has converged has reached a steady state if
+ * codeMath.abs(Jsubn/sub - Jsubn-1/sub) lt;
+ * Jsubn/sub times convergence/code, where
codeJsubn/sub/code
+ * and
svn commit: r745279 - /commons/proper/exec/trunk/src/changes/changes.xml
Author: sgoeschl Date: Tue Feb 17 22:34:27 2009 New Revision: 745279 URL: http://svn.apache.org/viewvc?rev=745279view=rev Log: Mhmm, forgot to commit this file ... Modified: commons/proper/exec/trunk/src/changes/changes.xml Modified: commons/proper/exec/trunk/src/changes/changes.xml URL: http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=745279r1=745278r2=745279view=diff == --- commons/proper/exec/trunk/src/changes/changes.xml (original) +++ commons/proper/exec/trunk/src/changes/changes.xml Tue Feb 17 22:34:27 2009 @@ -23,7 +23,10 @@ author email=sgoes...@apache.orgSiegfried Goeschl/author /properties body -release version=1.0.0 date=2009-01-05 description=Sandbox release +release version=1.0.0 date=As in SVN description=Sandbox release + action dev=sgoeschl type=fix due-to=Marco Ferrante issue=EXEC-32 +Handle null streams consistently. + /action action dev=sgoeschl type=fix After a long discussion we decided to stick to following groupId org.apache.commons instead of commons-exec.
svn commit: r745289 - in /commons/proper/exec/trunk/src/main/java/org/apache/commons/exec: DefaultExecutor.java util/MapUtils.java
Author: sgoeschl
Date: Tue Feb 17 23:17:52 2009
New Revision: 745289
URL: http://svn.apache.org/viewvc?rev=745289view=rev
Log:
[EXEC-35] Fixing minor findbugs issues.
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java?rev=745289r1=745288r2=745289view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/DefaultExecutor.java
Tue Feb 17 23:17:52 2009
@@ -198,7 +198,7 @@
/** @see org.apache.commons.exec.Executor#setExitValues(int[]) */
public void setExitValues(final int[] values) {
-this.exitValues = values;
+this.exitValues = (int[]) values.clone();
}
/** @see org.apache.commons.exec.Executor#isFailure(int) */
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java?rev=745289r1=745288r2=745289view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/util/MapUtils.java
Tue Feb 17 23:17:52 2009
@@ -65,11 +65,12 @@
return null;
}
-Iterator iter = source.keySet().iterator();
+Iterator iter = source.entrySet().iterator();
while(iter.hasNext()) {
-Object key = iter.next();
-Object value = source.get(key);
+Map.Entry entry = (Map.Entry) iter.next();
+Object key = entry.getKey();
+Object value = entry.getValue();
result.put(prefix + '.' + key.toString(), value);
}
svn commit: r745296 - in /commons/proper/exec/trunk: findbugs-exclude-filter.xml pom.xml src/changes/changes.xml src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
Author: sgoeschl
Date: Tue Feb 17 23:31:09 2009
New Revision: 745296
URL: http://svn.apache.org/viewvc?rev=745296view=rev
Log:
[EXEC-35] Fixing minor findbugs issues.
Added:
commons/proper/exec/trunk/findbugs-exclude-filter.xml
Modified:
commons/proper/exec/trunk/pom.xml
commons/proper/exec/trunk/src/changes/changes.xml
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
Added: commons/proper/exec/trunk/findbugs-exclude-filter.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/findbugs-exclude-filter.xml?rev=745296view=auto
==
--- commons/proper/exec/trunk/findbugs-exclude-filter.xml (added)
+++ commons/proper/exec/trunk/findbugs-exclude-filter.xml Tue Feb 17 23:31:09
2009
@@ -0,0 +1,33 @@
+?xml version=1.0?
+!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the License); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an AS IS BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+--
+
+!--
+ This file contains some false positive bugs detected by findbugs. Their
+ false positive nature has been analyzed individually and they have been
+ put here to instruct findbugs it must ignore them.
+--
+FindBugsFilter
+
+ !-- The following cases are intentional hard-coded paths for different
operating systems --
+ Match
+Class
name=org.apache.commons.exec.environment.DefaultProcessingEnvironment /
+Method name=getProcEnvCommand params=
returns=org.apache.commons.exec.CommandLine /
+Bug pattern=DMI_HARDCODED_ABSOLUTE_FILENAME /
+ /Match
+
+/FindBugsFilter
Modified: commons/proper/exec/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/pom.xml?rev=745296r1=745295r2=745296view=diff
==
--- commons/proper/exec/trunk/pom.xml (original)
+++ commons/proper/exec/trunk/pom.xml Tue Feb 17 23:31:09 2009
@@ -128,6 +128,16 @@
/reportSet
/reportSets
/plugin
+ plugin
+groupIdorg.codehaus.mojo/groupId
+artifactIdfindbugs-maven-plugin/artifactId
+version1.2/version
+configuration
+ thresholdNormal/threshold
+ effortDefault/effort
+
excludeFilterFile${basedir}/findbugs-exclude-filter.xml/excludeFilterFile
+ /configuration
+ /plugin
/plugins
/reporting
Modified: commons/proper/exec/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/changes/changes.xml?rev=745296r1=745295r2=745296view=diff
==
--- commons/proper/exec/trunk/src/changes/changes.xml (original)
+++ commons/proper/exec/trunk/src/changes/changes.xml Tue Feb 17 23:31:09 2009
@@ -24,6 +24,9 @@
/properties
body
release version=1.0.0 date=As in SVN description=Sandbox release
+ action dev=sgoeschl type=fix due-to=Luc Maisonobe issue=EXEC-35
+Fixing a few findbugs issues.
+ /action
action dev=sgoeschl type=fix due-to=Marco Ferrante
issue=EXEC-32
Handle null streams consistently.
/action
Modified:
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java?rev=745296r1=745295r2=745296view=diff
==
---
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
(original)
+++
commons/proper/exec/trunk/src/main/java/org/apache/commons/exec/environment/OpenVmsProcessingEnvironment.java
Tue Feb 17 23:31:09 2009
@@ -109,8 +109,8 @@
logicals.put(logName, logValue);
}
-for (Iterator i = logicals.keySet().iterator(); i.hasNext();) {
-String logical = (String) i.next();
+for (Iterator i = logicals.entrySet().iterator(); i.hasNext();) {
+String logical = (String) ((Map.Entry) i.next()).getKey();
environment.put(logical, logicals.get(logical));
}
return environment;
svn commit: r745301 - /commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java
Author: sebb
Date: Tue Feb 17 23:50:08 2009
New Revision: 745301
URL: http://svn.apache.org/viewvc?rev=745301view=rev
Log:
Use more efficient entrySet() iteration
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java
Modified:
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java?rev=745301r1=745300r2=745301view=diff
==
---
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java
(original)
+++
commons/proper/exec/trunk/src/test/java/org/apache/commons/exec/environment/EnvironmentUtilTest.java
Tue Feb 17 23:50:08 2009
@@ -80,11 +80,12 @@
// ensure that we have the same value for upper and lowercase keys
Map procEnvironment = EnvironmentUtils.getProcEnvironment();
-for (Iterator it = procEnvironment.keySet().iterator(); it.hasNext();)
{
-String variable = (String) it.next();
-String value = (String) procEnvironment.get(variable);
-assertEquals(value,
procEnvironment.get(variable.toLowerCase(Locale.ENGLISH)));
-assertEquals(value,
procEnvironment.get(variable.toUpperCase(Locale.ENGLISH)));
+for (Iterator it = procEnvironment.entrySet().iterator();
it.hasNext();) {
+Map.Entry entry = (Map.Entry) it.next();
+String key = (String) entry.getKey();
+String value = (String) entry.getValue();
+assertEquals(value,
procEnvironment.get(key.toLowerCase(Locale.ENGLISH)));
+assertEquals(value,
procEnvironment.get(key.toUpperCase(Locale.ENGLISH)));
}
// add an environment variable and check access
svn commit: r745388 - in /commons/proper/cli/branches/cli-1.x/src: java/org/apache/commons/cli/HelpFormatter.java test/org/apache/commons/cli/bug/BugCLI162Test.java
Author: bayard
Date: Wed Feb 18 05:42:58 2009
New Revision: 745388
URL: http://svn.apache.org/viewvc?rev=745388view=rev
Log:
Applying my second attempt at a patch to CLI-162. This fixes Gary's reported
bug (one of which was an example of CLI-162, and one a bug in my first attempt
to patch). Open question is whether to output text that is too long, or try and
break it up to fit the screen width.
Modified:
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/HelpFormatter.java
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/bug/BugCLI162Test.java
Modified:
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/HelpFormatter.java
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/HelpFormatter.java?rev=745388r1=745387r2=745388view=diff
==
---
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/HelpFormatter.java
(original)
+++
commons/proper/cli/branches/cli-1.x/src/java/org/apache/commons/cli/HelpFormatter.java
Wed Feb 18 05:42:58 2009
@@ -821,7 +821,6 @@
while (true)
{
-int lastPos = pos;
text = padding + text.substring(pos).trim();
pos = findWrapPos(text, width, 0);
@@ -830,10 +829,12 @@
sb.append(text);
return sb;
-} else
-if (pos == lastPos)
-{
-throw new RuntimeException(Text too long for line - throwing
exception to avoid infinite loop [CLI-162]: + text);
+}
+
+if ( (text.length() width) (pos == nextLineTabStop - 1) ) {
+sb.append(text);
+
+return sb;
}
sb.append(rtrim(text.substring(0, pos))).append(defaultNewLine);
Modified:
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/bug/BugCLI162Test.java
URL:
http://svn.apache.org/viewvc/commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/bug/BugCLI162Test.java?rev=745388r1=745387r2=745388view=diff
==
---
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/bug/BugCLI162Test.java
(original)
+++
commons/proper/cli/branches/cli-1.x/src/test/org/apache/commons/cli/bug/BugCLI162Test.java
Wed Feb 18 05:42:58 2009
@@ -42,11 +42,7 @@
public void testInfiniteLoop() {
HelpFormatter formatter = new HelpFormatter();
formatter.setWidth(20);
-try {
-formatter.printHelp(app, options); // hang crash
-} catch(RuntimeException re) {
-assertTrue(re.getMessage().startsWith(Text too long for line -
throwing exception to avoid infinite loop [CLI-162]: ));
-}
+formatter.printHelp(app, options); // used to hang crash
}
private void testPrintHelp(Options options) throws ParseException,
IOException {
