use a different artifactId

git-svn-id: https://svn.apache.org/repos/asf/archiva/trunk@1356096 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
index edc637b5186e23076ce79b49ac598ad210aadf44..f784228e8480d84a0a6b386b3068ccdfbd0a40c8 100644 (file)
--- a/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-artifact-converter/pom.xml
@@ -77,7 +77,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-checksum/pom.xml b/archiva-modules/archiva-base/archiva-checksum/pom.xml
index 27f90135fc7a88c0bf33a822602faa69fb61ab80..ea13f933a99cba9cb4459808a2fc9dab34e42d62 100644 (file)
--- a/archiva-modules/archiva-base/archiva-checksum/pom.xml
+++ b/archiva-modules/archiva-base/archiva-checksum/pom.xml
@@ -39,7 +39,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/archiva-base/archiva-configuration/pom.xml b/archiva-modules/archiva-base/archiva-configuration/pom.xml
index b44c303aa50469daed82c48d8b59e601a1e68966..03e142d4c7cddb772ec2a9ade131127d1904c96e 100644 (file)
--- a/archiva-modules/archiva-base/archiva-configuration/pom.xml
+++ b/archiva-modules/archiva-base/archiva-configuration/pom.xml
@@ -104,7 +104,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
index b8165f315f5c0ff58ce99fdddfd56b2ae6d8b652..a90b4b6fb496c5e3798a7d964e1295ff35bba4fa 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-core-consumers/pom.xml
@@ -68,7 +68,7 @@
     <!-- test dependencies -->
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
index 19e7e0d2276ec06be5f3e7376f96470f6d39aa94..686319b3241b5663b97aad2b0b1535cc5e902ed8 100644 (file)
--- a/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
+++ b/archiva-modules/archiva-base/archiva-consumers/archiva-lucene-consumers/pom.xml
@@ -75,7 +75,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-converter/pom.xml b/archiva-modules/archiva-base/archiva-converter/pom.xml
index 77b522e7ebea3dd4945745da874b869c8b3db9a8..24095f6e614ce878a60a527faa8cd9fd47b58b1f 100644 (file)
--- a/archiva-modules/archiva-base/archiva-converter/pom.xml
+++ b/archiva-modules/archiva-base/archiva-converter/pom.xml
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-indexer/pom.xml b/archiva-modules/archiva-base/archiva-indexer/pom.xml
index 6752ca2dd0a13d96d0f8a5c9eafdca9474c8c694..a42e1974e622dcba94cac63dc69c081e8cce9652 100644 (file)
--- a/archiva-modules/archiva-base/archiva-indexer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-indexer/pom.xml
@@ -114,7 +114,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-model/pom.xml b/archiva-modules/archiva-base/archiva-model/pom.xml
index c008802f447624126763d4403f8f019dcffed260..bca357ae371730f873ca2b763350bf64990166ad 100755 (executable)
--- a/archiva-modules/archiva-base/archiva-model/pom.xml
+++ b/archiva-modules/archiva-base/archiva-model/pom.xml
@@ -43,7 +43,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-policies/pom.xml b/archiva-modules/archiva-base/archiva-policies/pom.xml
index 5c756a08917ddd1fcf213cd6c9a8db7f942c40ce..2cd0db9780f28efb4f600a1f008a162fa83c4edd 100644 (file)
--- a/archiva-modules/archiva-base/archiva-policies/pom.xml
+++ b/archiva-modules/archiva-base/archiva-policies/pom.xml
@@ -82,7 +82,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
index 1fe13a205fe8502c7e8be99de6aff01f37163f26..e0eb5f3a70f51923e979c1d0bcbeb319c5e4ecf6 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy-common/pom.xml
@@ -63,7 +63,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-proxy/pom.xml b/archiva-modules/archiva-base/archiva-proxy/pom.xml
index 394034c6f1c173c0e06c27782a05da6ec1b235df..16a4e5ba36088da6982f7db56d0c453bbe7b1b2d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-proxy/pom.xml
+++ b/archiva-modules/archiva-base/archiva-proxy/pom.xml
@@ -130,7 +130,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
index 595a7dfa544a8c27e6c439c7130970c632344f40..888ec4258bf21663209bebe2b64a8564ce2f6468 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-admin/archiva-repository-admin-default/pom.xml
@@ -94,7 +94,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
index 4005a4a9c93670eebfa328ca817518a3336ddbba..c8ef219a0b617be4728da9bc8a9d90bce7c7e8ec 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-layer/pom.xml
@@ -68,7 +68,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>    

diff --git a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
index d19988931dd954ae970f88824b49baf5f1bc7fee..6f82df254eebdbe959ce0e964aabd3d70a08514d 100644 (file)
--- a/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
+++ b/archiva-modules/archiva-base/archiva-repository-scanner/pom.xml
@@ -59,7 +59,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-test-utils/pom.xml b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
new file mode 100644 (file)
index 0000000..74dfcb3
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-test-utils/pom.xml
@@ -0,0 +1,51 @@
+<?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.
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <parent>
+    <groupId>org.apache.archiva</groupId>
+    <artifactId>archiva</artifactId>
+    <version>1.4-M3-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>archiva-test-utils</artifactId>
+  <name>Archiva :: Test Utility</name>
+  <dependencies>
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring-test</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>xmlunit</groupId>
+      <artifactId>xmlunit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-simple</artifactId>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>  
+</project>

diff --git a/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java
new file mode 100644 (file)
index 0000000..4a6a2bb
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java
@@ -0,0 +1,43 @@
+package org.apache.archiva.test;
+
+/*
+ * Copyright 2012 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.junit.runners.BlockJUnit4ClassRunner;
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+
+import java.util.List;
+
+/**
+ * @author Eric
+ */
+public class ArchivaBlockJUnit4ClassRunner
+    extends BlockJUnit4ClassRunner
+{
+
+    public ArchivaBlockJUnit4ClassRunner( Class<?> klass )
+        throws InitializationError
+    {
+        super( klass );
+    }
+
+    @Override
+    protected List<FrameworkMethod> computeTestMethods()
+    {
+        return ListGenerator.getShuffleList( super.computeTestMethods() );
+    }
+}

diff --git a/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java
new file mode 100644 (file)
index 0000000..7dbdebe
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java
@@ -0,0 +1,45 @@
+package org.apache.archiva.test;
+
+/*
+ * Copyright 2012 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.junit.runners.model.FrameworkMethod;
+import org.junit.runners.model.InitializationError;
+import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+
+import java.util.List;
+
+/**
+ * @author Eric
+ */
+public class ArchivaSpringJUnit4ClassRunner
+    extends SpringJUnit4ClassRunner
+{
+
+    public ArchivaSpringJUnit4ClassRunner( Class<?> clazz )
+        throws InitializationError
+    {
+        super( clazz );
+    }
+
+    @Override
+    protected List<FrameworkMethod> computeTestMethods()
+    {
+        return ListGenerator.getShuffleList( super.computeTestMethods() );
+    }
+
+
+}

diff --git a/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ListGenerator.java b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ListGenerator.java
new file mode 100644 (file)
index 0000000..69ee4e7
--- /dev/null
+++ b/archiva-modules/archiva-base/archiva-test-utils/src/main/java/org/apache/archiva/test/ListGenerator.java
@@ -0,0 +1,77 @@
+package org.apache.archiva.test;
+
+/*
+ * Copyright 2012 The Apache Software Foundation.
+ *
+ * Licensed 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.
+ */
+
+import org.junit.runners.model.FrameworkMethod;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * @author Eric
+ */
+public class ListGenerator
+{
+    private static int MAXROUND = 1;
+
+    private ListGenerator()
+    {
+    }
+
+    static List<FrameworkMethod> getShuffleList( List<FrameworkMethod> computeTestMethods )
+    {
+        String javaSpecVersion = System.getProperty( "java.specification.version" );
+        // 1.6 1.5 version not shuffled to allow build
+        if ( javaSpecVersion.equals( "1.6" ) || javaSpecVersion.equals( "1.5" ) )
+        {
+            return computeTestMethods;
+        }
+        if ( computeTestMethods == null )
+        {
+            return null;
+        }
+        List<FrameworkMethod> generated = new ArrayList<FrameworkMethod>( computeTestMethods );
+
+        Collections.sort( generated, new FrameworkMethodComparator() );
+
+        // 1.7 and more generated shuffled list
+        // double test method to have more change of failure
+        /*for ( int i = 0; i < MAXROUND; i++ )
+        {
+            Collections.shuffle( computeTestMethods );
+            generated.addAll( computeTestMethods );
+        }*/
+        //generated.add( computeTestMethods.get( 0 ) );
+
+        //Collections.shuffle( computeTestMethods );
+        //generated.addAll( computeTestMethods );
+
+        return generated;
+    }
+
+    private static class FrameworkMethodComparator
+        implements Comparator<FrameworkMethod>
+    {
+        public int compare( FrameworkMethod frameworkMethod, FrameworkMethod frameworkMethod1 )
+        {
+            return frameworkMethod.getName().compareTo( frameworkMethod1.getName() );
+        }
+    }
+
+}

diff --git a/archiva-modules/archiva-base/archiva-testutil/pom.xml b/archiva-modules/archiva-base/archiva-testutil/pom.xml
deleted file mode 100644 (file)
index 829385f..0000000
--- a/archiva-modules/archiva-base/archiva-testutil/pom.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?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.
-  -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <parent>
-    <groupId>org.apache.archiva</groupId>
-    <artifactId>archiva</artifactId>
-    <version>1.4-M3-SNAPSHOT</version>
-  </parent>
-  <modelVersion>4.0.0</modelVersion>
-  <artifactId>archiva-testutil</artifactId>
-  <name>Archiva :: Test Utility</name>
-  <dependencies>
-    <dependency>
-      <groupId>org.springframework</groupId>
-      <artifactId>spring-test</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>xmlunit</groupId>
-      <artifactId>xmlunit</artifactId>
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.slf4j</groupId>
-      <artifactId>slf4j-simple</artifactId>
-      <scope>compile</scope>
-    </dependency>
-  </dependencies>  
-</project>

diff --git a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java b/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java
deleted file mode 100644 (file)
index 4a6a2bb..0000000
--- a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaBlockJUnit4ClassRunner.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package org.apache.archiva.test;
-
-/*
- * Copyright 2012 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.junit.runners.BlockJUnit4ClassRunner;
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-
-import java.util.List;
-
-/**
- * @author Eric
- */
-public class ArchivaBlockJUnit4ClassRunner
-    extends BlockJUnit4ClassRunner
-{
-
-    public ArchivaBlockJUnit4ClassRunner( Class<?> klass )
-        throws InitializationError
-    {
-        super( klass );
-    }
-
-    @Override
-    protected List<FrameworkMethod> computeTestMethods()
-    {
-        return ListGenerator.getShuffleList( super.computeTestMethods() );
-    }
-}

diff --git a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java b/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java
deleted file mode 100644 (file)
index 7dbdebe..0000000
--- a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ArchivaSpringJUnit4ClassRunner.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package org.apache.archiva.test;
-
-/*
- * Copyright 2012 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.junit.runners.model.FrameworkMethod;
-import org.junit.runners.model.InitializationError;
-import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
-
-import java.util.List;
-
-/**
- * @author Eric
- */
-public class ArchivaSpringJUnit4ClassRunner
-    extends SpringJUnit4ClassRunner
-{
-
-    public ArchivaSpringJUnit4ClassRunner( Class<?> clazz )
-        throws InitializationError
-    {
-        super( clazz );
-    }
-
-    @Override
-    protected List<FrameworkMethod> computeTestMethods()
-    {
-        return ListGenerator.getShuffleList( super.computeTestMethods() );
-    }
-
-
-}

diff --git a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ListGenerator.java b/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ListGenerator.java
deleted file mode 100644 (file)
index 69ee4e7..0000000
--- a/archiva-modules/archiva-base/archiva-testutil/src/main/java/org/apache/archiva/test/ListGenerator.java
+++ /dev/null
@@ -1,77 +0,0 @@
-package org.apache.archiva.test;
-
-/*
- * Copyright 2012 The Apache Software Foundation.
- *
- * Licensed 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.
- */
-
-import org.junit.runners.model.FrameworkMethod;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
-/**
- * @author Eric
- */
-public class ListGenerator
-{
-    private static int MAXROUND = 1;
-
-    private ListGenerator()
-    {
-    }
-
-    static List<FrameworkMethod> getShuffleList( List<FrameworkMethod> computeTestMethods )
-    {
-        String javaSpecVersion = System.getProperty( "java.specification.version" );
-        // 1.6 1.5 version not shuffled to allow build
-        if ( javaSpecVersion.equals( "1.6" ) || javaSpecVersion.equals( "1.5" ) )
-        {
-            return computeTestMethods;
-        }
-        if ( computeTestMethods == null )
-        {
-            return null;
-        }
-        List<FrameworkMethod> generated = new ArrayList<FrameworkMethod>( computeTestMethods );
-
-        Collections.sort( generated, new FrameworkMethodComparator() );
-
-        // 1.7 and more generated shuffled list
-        // double test method to have more change of failure
-        /*for ( int i = 0; i < MAXROUND; i++ )
-        {
-            Collections.shuffle( computeTestMethods );
-            generated.addAll( computeTestMethods );
-        }*/
-        //generated.add( computeTestMethods.get( 0 ) );
-
-        //Collections.shuffle( computeTestMethods );
-        //generated.addAll( computeTestMethods );
-
-        return generated;
-    }
-
-    private static class FrameworkMethodComparator
-        implements Comparator<FrameworkMethod>
-    {
-        public int compare( FrameworkMethod frameworkMethod, FrameworkMethod frameworkMethod1 )
-        {
-            return frameworkMethod.getName().compareTo( frameworkMethod1.getName() );
-        }
-    }
-
-}

diff --git a/archiva-modules/archiva-base/archiva-transaction/pom.xml b/archiva-modules/archiva-base/archiva-transaction/pom.xml
index 7ea8aefa019f10493f27da40a3ccbddd71299656..23d87993a564f4e846f9cd823f92704958105528 100644 (file)
--- a/archiva-modules/archiva-base/archiva-transaction/pom.xml
+++ b/archiva-modules/archiva-base/archiva-transaction/pom.xml
@@ -53,7 +53,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
index fb800d186cd0d841de6070e2584eb3e166a34873..c7ca2b6383f36d6694d9b466e605c77effd8caea 100644 (file)
--- a/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
+++ b/archiva-modules/archiva-base/archiva-xml-tools/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
      <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/archiva-base/pom.xml b/archiva-modules/archiva-base/pom.xml
index 981d47d79cf98e1e5a48adc9f9af8442436c0d1f..364bb01320de5ce4fbbc980c1bd2608a0d24834b 100644 (file)
--- a/archiva-modules/archiva-base/pom.xml
+++ b/archiva-modules/archiva-base/pom.xml
@@ -29,7 +29,7 @@
   <packaging>pom</packaging>
 
   <modules>
-    <module>archiva-testutil</module>
+    <module>archiva-test-utils</module>
     <module>archiva-common</module>
     <module>archiva-model</module>
     <module>archiva-configuration</module>

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
index 8dde3020793cc14878bd3c617115aded3ab5a303..89e37193aede4aecb3e48cb206b1dc8745f0e266 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-indexing/pom.xml
@@ -93,7 +93,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency> 

diff --git a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
index 66828df98798afcc32d7ce401b25aad67c4c7998..25238293efb85fa38d918b50e2ca7e2f76da7be9 100644 (file)
--- a/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
+++ b/archiva-modules/archiva-scheduler/archiva-scheduler-repository/pom.xml
@@ -87,7 +87,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency> 

diff --git a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
index 251ae0a496b8b587a1911929a07b0af7a54d5417..26d0cc3414378a0c206238b91a6876163898b6fa 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/pom.xml
@@ -227,7 +227,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/archiva-web/archiva-rss/pom.xml b/archiva-modules/archiva-web/archiva-rss/pom.xml
index faf93bd14a8790544d9bce78fe3d336c03c10cfc..ec3cb4cbd66ba9b03cb2514cc4f72465fe303545 100644 (file)
--- a/archiva-modules/archiva-web/archiva-rss/pom.xml
+++ b/archiva-modules/archiva-web/archiva-rss/pom.xml
@@ -58,7 +58,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency> 

diff --git a/archiva-modules/archiva-web/archiva-security/pom.xml b/archiva-modules/archiva-web/archiva-security/pom.xml
index c7ee2cf48f56d4a40e736e118b12587c789666e4..347592b5726dec64f99ab4b4ff97e410b1136ff0 100644 (file)
--- a/archiva-modules/archiva-web/archiva-security/pom.xml
+++ b/archiva-modules/archiva-web/archiva-security/pom.xml
@@ -148,7 +148,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/archiva-web/archiva-web-common/pom.xml b/archiva-modules/archiva-web/archiva-web-common/pom.xml
index e0be6b22c4d4e2cd6ad958f6e27bf3e1eb15f102..2285a1b2d05f7a903d2a5ab3a8013be0a1019488 100644 (file)
--- a/archiva-modules/archiva-web/archiva-web-common/pom.xml
+++ b/archiva-modules/archiva-web/archiva-web-common/pom.xml
@@ -141,7 +141,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency> 

diff --git a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
index 035db48ab270914c1dddf1bd8c87daf7be70b650..570167f36a037a139f8c8ab6f14414a6df6d7028 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp-js/pom.xml
@@ -652,7 +652,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/archiva-web/archiva-webapp/pom.xml b/archiva-modules/archiva-web/archiva-webapp/pom.xml
index ae764b2245a94c2147fa3b6ac0bfc530cfefc353..db8bc144c856e9fd6bb76172e6f1b05374056c50 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webapp/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webapp/pom.xml
@@ -878,7 +878,7 @@
     
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency> 

diff --git a/archiva-modules/archiva-web/archiva-webdav/pom.xml b/archiva-modules/archiva-web/archiva-webdav/pom.xml
index bbf0d30c5d5418a70c5fe604479db91a154359a2..9a8c2d61c9690329b2d926bef70c61c085a0399e 100644 (file)
--- a/archiva-modules/archiva-web/archiva-webdav/pom.xml
+++ b/archiva-modules/archiva-web/archiva-webdav/pom.xml
@@ -185,7 +185,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/metadata/metadata-repository-api/pom.xml b/archiva-modules/metadata/metadata-repository-api/pom.xml
index 482b2590b61d43c5e587d2935846e0d58117a4fd..5fd53a3c4b11848ad426d522c244da512356a417 100644 (file)
--- a/archiva-modules/metadata/metadata-repository-api/pom.xml
+++ b/archiva-modules/metadata/metadata-repository-api/pom.xml
@@ -50,7 +50,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/plugins/audit/pom.xml b/archiva-modules/plugins/audit/pom.xml
index 6996d45c6d740bd0b7bd3b6234646803d60009c9..fdfed8e8d25759aa92ccd4dc5b513e88bb1e448e 100644 (file)
--- a/archiva-modules/plugins/audit/pom.xml
+++ b/archiva-modules/plugins/audit/pom.xml
@@ -38,7 +38,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/plugins/maven2-repository/pom.xml b/archiva-modules/plugins/maven2-repository/pom.xml
index cb51fa248e8a92ee69803a71b522bf27b34c10ee..4b0de9b6f3b3c2997c4e90271da965b8d7c83893 100644 (file)
--- a/archiva-modules/plugins/maven2-repository/pom.xml
+++ b/archiva-modules/plugins/maven2-repository/pom.xml
@@ -130,7 +130,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/plugins/metadata-store-file/pom.xml b/archiva-modules/plugins/metadata-store-file/pom.xml
index 67ed7a038a4b069d260026628ddccd805bf6598f..b0ff306cc0fecd06b769e97ec81e2835868e167b 100644 (file)
--- a/archiva-modules/plugins/metadata-store-file/pom.xml
+++ b/archiva-modules/plugins/metadata-store-file/pom.xml
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>

diff --git a/archiva-modules/plugins/metadata-store-jcr/pom.xml b/archiva-modules/plugins/metadata-store-jcr/pom.xml
index a4796a78adeb802125e403a1ff52edfd9d9ccb08..eecfeeb05930aefe368631d1a76716f7e18b1b72 100644 (file)
--- a/archiva-modules/plugins/metadata-store-jcr/pom.xml
+++ b/archiva-modules/plugins/metadata-store-jcr/pom.xml
@@ -45,7 +45,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/plugins/problem-reports/pom.xml b/archiva-modules/plugins/problem-reports/pom.xml
index 2a7576a1b7beb6a5f0ead61193c5dc23d91d02ab..02241f356acdb07e2fdb617ee984bd3052a4c8ff 100644 (file)
--- a/archiva-modules/plugins/problem-reports/pom.xml
+++ b/archiva-modules/plugins/problem-reports/pom.xml
@@ -55,7 +55,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/plugins/repository-statistics/pom.xml b/archiva-modules/plugins/repository-statistics/pom.xml
index 3784367fd37142a03efb460afc88cf9d54adcab4..eee8231ed6ffce1d616b60cbd28ca6cf8e64c3a5 100644 (file)
--- a/archiva-modules/plugins/repository-statistics/pom.xml
+++ b/archiva-modules/plugins/repository-statistics/pom.xml
@@ -51,7 +51,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>  

diff --git a/archiva-modules/plugins/stage-repository-merge/pom.xml b/archiva-modules/plugins/stage-repository-merge/pom.xml
index 8e4222520517df1ff6c0c5a0f9a11a3f8e49f0ba..835a549192c1edbe7595c20a7943cafb0b76298b 100644 (file)
--- a/archiva-modules/plugins/stage-repository-merge/pom.xml
+++ b/archiva-modules/plugins/stage-repository-merge/pom.xml
@@ -88,7 +88,7 @@
     </dependency>
     <dependency>
       <groupId>org.apache.archiva</groupId>
-      <artifactId>archiva-testutil</artifactId>
+      <artifactId>archiva-test-utils</artifactId>
       <version>${project.version}</version>
       <scope>test</scope>
     </dependency>