Author: bayard
Date: Mon Aug 8 05:26:12 2011
New Revision: 1154844
URL: http://svn.apache.org/viewvc?rev=1154844&view=rev
Log:
Fixing package names and adding excludes to the pom.xml for the parts of the
collections framework that followed over
Modified:
commons/proper/lang/trunk/pom.xml
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java
Modified: commons/proper/lang/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/pom.xml?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
--- commons/proper/lang/trunk/pom.xml (original)
+++ commons/proper/lang/trunk/pom.xml Mon Aug 8 05:26:12 2011
@@ -469,6 +469,10 @@
<includes>
<include>**/*Test.java</include>
</includes>
+ <excludes>
+ <exclude>**/BulkTest.java</exclude>
+ <exclude>**/AbstractTestObject.java</exclude>
+ </excludes>
</configuration>
</plugin>
<plugin>
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -24,8 +24,6 @@ import java.util.Comparator;
import java.util.LinkedList;
import java.util.List;
-import org.apache.commons.collections.AbstractTestObject;
-
/**
* Abstract test class for testing the Comparator interface.
* <p>
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.util.Comparator;
import java.util.LinkedList;
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections;
+package org.apache.commons.lang3.compare;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -44,7 +44,7 @@ import java.io.Serializable;
* @author Stephen Colebourne
* @author Anonymous
*/
-public abstract class AbstractTestObject extends BulkTest {
+abstract class AbstractTestObject extends BulkTest {
/** Current major release for Collections */
public static final int COLLECTIONS_MAJOR_VERSION = 3;
@@ -316,7 +316,7 @@ public abstract class AbstractTestObject
}
protected boolean skipSerializedCanonicalTests() {
- return
Boolean.getBoolean("org.apache.commons.collections:with-clover");
+ return Boolean.getBoolean("org.apache.commons.lang3:with-clover");
}
// private implementation
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/BulkTest.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections;
+package org.apache.commons.lang3.compare;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
@@ -136,7 +136,7 @@ import junit.framework.TestSuite;
* @author Paul Jack
* @version $Id$
*/
-public class BulkTest extends TestCase implements Cloneable {
+class BulkTest extends TestCase implements Cloneable {
// Note: BulkTest is Cloneable to make it easier to construct
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.util.Comparator;
import java.util.LinkedList;
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.io.Serializable;
import java.util.Comparator;
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.util.Arrays;
import java.util.Comparator;
Modified:
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java
URL:
http://svn.apache.org/viewvc/commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java?rev=1154844&r1=1154843&r2=1154844&view=diff
==============================================================================
---
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java
(original)
+++
commons/proper/lang/trunk/src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java
Mon Aug 8 05:26:12 2011
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.commons.collections.comparators;
+package org.apache.commons.lang3.compare;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
