Fixing package names and adding excludes to the pom.xml for the parts of the collections framework that followed over

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/lang/trunk@1154844 13f79535-47bb-0310-9956-ffa450edef68

pom.xml

@@ -469,6 +469,10 @@
           <includes>
             <include>**/*Test.java</include>
           </includes>
+          <excludes>
+            <exclude>**/BulkTest.java</exclude>
+            <exclude>**/AbstractTestObject.java</exclude>
+          </excludes>
         </configuration>
       </plugin>
       <plugin>

src/test/java/org/apache/commons/lang3/compare/AbstractTestComparator.java

@@ -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.LinkedList;
 import java.util.List;
 
-import org.apache.commons.collections.AbstractTestObject;
-
 /**
  * Abstract test class for testing the Comparator interface.
  * <p>

src/test/java/org/apache/commons/lang3/compare/AbstractTestNullComparator.java

@@ -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;

src/test/java/org/apache/commons/lang3/compare/AbstractTestObject.java

@@ -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 @@
  * @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 @@ protected Object readExternalFormFromBytes(byte[] b) throws IOException, ClassNo
     }
 
     protected boolean skipSerializedCanonicalTests() {
-        return Boolean.getBoolean("org.apache.commons.collections:with-clover");
+        return Boolean.getBoolean("org.apache.commons.lang3:with-clover");
     }
 
     // private implementation

src/test/java/org/apache/commons/lang3/compare/BulkTest.java

@@ -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 @@
  *  @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 

src/test/java/org/apache/commons/lang3/compare/TestComparableComparator.java

@@ -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;

src/test/java/org/apache/commons/lang3/compare/TestComparatorChain.java

@@ -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;

src/test/java/org/apache/commons/lang3/compare/TestFixedOrderComparator.java

@@ -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;

src/test/java/org/apache/commons/lang3/compare/TestReverseComparator.java

@@ -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;