From 6bebe802e32bb1e4ad472fd609d0439ea8e288fc Mon Sep 17 00:00:00 2001 From: John Dennis Casey Date: Tue, 8 Jul 2008 22:52:08 +0000 Subject: [PATCH] Shortening paths for test projects used in mng-3380. git-svn-id: https://svn.apache.org/repos/asf/maven/core-integration-testing/trunk@675014 13f79535-47bb-0310-9956-ffa450edef68 --- ...nITmng3380ManagedRelocatedTransdepsTest.java | 17 +++++++++-------- .../root-artifactId/1 => consumer}/pom.xml | 0 .../src/main/java/tests/RootComponent.java | 0 .../java/tests/DependencyManagementTest.java | 0 .../1 => direct-dep}/pom.xml | 0 .../other-artifactId-a/1 => other-a}/pom.xml | 0 .../src/main/java/tests/OtherComponentA.java | 0 .../other-artifactId-b/1 => other-b}/pom.xml | 0 .../src/main/java/tests/OtherComponentB.java | 0 .../other-artifactId-c/1 => other-c}/pom.xml | 0 .../src/main/java/tests/OtherComponentC.java | 0 .../1 => transdep-new-1}/pom.xml | 0 .../main/java/tests/TransitiveComponent1.java | 0 .../2 => transdep-new-2}/pom.xml | 0 .../main/java/tests/TransitiveComponent2.java | 0 .../1 => transdep-old}/pom.xml | 0 .../java/tests/TransitiveOldComponent1.java | 0 17 files changed, 9 insertions(+), 8 deletions(-) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/root-groupId/root-artifactId/1 => consumer}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/root-groupId/root-artifactId/1 => consumer}/src/main/java/tests/RootComponent.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/root-groupId/root-artifactId/1 => consumer}/src/test/java/tests/DependencyManagementTest.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/direct-dependency-groupId/direct-dependency-artifactId/1 => direct-dep}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-a/1 => other-a}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-a/1 => other-a}/src/main/java/tests/OtherComponentA.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-b/1 => other-b}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-b/1 => other-b}/src/main/java/tests/OtherComponentB.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-c/1 => other-c}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/other-groupId/other-artifactId-c/1 => other-c}/src/main/java/tests/OtherComponentC.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1 => transdep-new-1}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1 => transdep-new-1}/src/main/java/tests/TransitiveComponent1.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2 => transdep-new-2}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2 => transdep-new-2}/src/main/java/tests/TransitiveComponent2.java (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1 => transdep-old}/pom.xml (100%) rename its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/{projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1 => transdep-old}/src/main/java/tests/TransitiveOldComponent1.java (100%) diff --git a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java index c9a2fc992f..495112553d 100755 --- a/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java +++ b/its/core-integration-tests/src/test/java/org/apache/maven/integrationtests/MavenITmng3380ManagedRelocatedTransdepsTest.java @@ -38,7 +38,8 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest installDependencies( testDir ); String path = testDir.getAbsolutePath() // - + "/projects/root-groupId/root-artifactId/1"; + + "/consumer"; + verifier = new Verifier(path); verifier.executeGoal("package"); @@ -52,37 +53,37 @@ public class MavenITmng3380ManagedRelocatedTransdepsTest { // install projects String path = testDir.getAbsolutePath() // - + "/projects/other-groupId/other-artifactId-c/1"; + + "/other-c"; Verifier verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/other-groupId/other-artifactId-b/1"; + + "/other-b"; verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/other-groupId/other-artifactId-a/1"; + + "/other-a"; verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1"; + + "/transdep-old"; verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1"; + + "/transdep-new-1"; verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2"; + + "/transdep-new-2"; verifier = new Verifier(path); verifier.executeGoal("install"); path = testDir.getAbsolutePath() // - + "/projects/direct-dependency-groupId/direct-dependency-artifactId/1"; + + "/direct-dep"; verifier = new Verifier(path); verifier.executeGoal("install"); } diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/src/main/java/tests/RootComponent.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/src/main/java/tests/RootComponent.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/src/main/java/tests/RootComponent.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/src/main/java/tests/RootComponent.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/src/test/java/tests/DependencyManagementTest.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/src/test/java/tests/DependencyManagementTest.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/root-groupId/root-artifactId/1/src/test/java/tests/DependencyManagementTest.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/consumer/src/test/java/tests/DependencyManagementTest.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/direct-dependency-groupId/direct-dependency-artifactId/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/direct-dep/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/direct-dependency-groupId/direct-dependency-artifactId/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/direct-dep/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-a/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-a/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-a/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-a/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-a/1/src/main/java/tests/OtherComponentA.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-a/src/main/java/tests/OtherComponentA.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-a/1/src/main/java/tests/OtherComponentA.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-a/src/main/java/tests/OtherComponentA.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-b/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-b/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-b/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-b/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-b/1/src/main/java/tests/OtherComponentB.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-b/src/main/java/tests/OtherComponentB.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-b/1/src/main/java/tests/OtherComponentB.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-b/src/main/java/tests/OtherComponentB.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-c/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-c/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-c/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-c/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-c/1/src/main/java/tests/OtherComponentC.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-c/src/main/java/tests/OtherComponentC.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/other-groupId/other-artifactId-c/1/src/main/java/tests/OtherComponentC.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/other-c/src/main/java/tests/OtherComponentC.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-1/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-1/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1/src/main/java/tests/TransitiveComponent1.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-1/src/main/java/tests/TransitiveComponent1.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/1/src/main/java/tests/TransitiveComponent1.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-1/src/main/java/tests/TransitiveComponent1.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-2/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-2/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2/src/main/java/tests/TransitiveComponent2.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-2/src/main/java/tests/TransitiveComponent2.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-new-groupId/transitive-dependency-artifactId/2/src/main/java/tests/TransitiveComponent2.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-new-2/src/main/java/tests/TransitiveComponent2.java diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1/pom.xml b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-old/pom.xml similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1/pom.xml rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-old/pom.xml diff --git a/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1/src/main/java/tests/TransitiveOldComponent1.java b/its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-old/src/main/java/tests/TransitiveOldComponent1.java similarity index 100% rename from its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/projects/transitive-dependency-old-groupId/transitive-dependency-artifactId/1/src/main/java/tests/TransitiveOldComponent1.java rename to its/core-integration-tests/src/test/resources/mng-3380-managedRelocatedTransdeps/transdep-old/src/main/java/tests/TransitiveOldComponent1.java