From 48de6a055e37d36712246facbe642462423c34fa Mon Sep 17 00:00:00 2001
From: Jason van Zyl <jvanzyl@apache.org>
Date: Wed, 25 Oct 2006 13:41:43 +0000
Subject: [PATCH] o lots of fixes that I missed because I fixed the copy and
 not the source

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@467652 13f79535-47bb-0310-9956-ffa450edef68
---
 .../src/test/resources/it0012/child-project/pom.xml       | 2 +-
 .../src/test/resources/it0039/project/pom.xml             | 2 +-
 .../src/test/resources/it0039/project/release-pom.xml     | 2 +-
 .../src/main/java/org/apache/maven/it0039/Person.java     | 2 +-
 .../src/test/java/org/apache/maven/it0039/PersonTest.java | 2 +-
 .../src/test/resources/it0039/project2/pom.xml            | 2 +-
 .../src/test/resources/it0039/project2/release-pom.xml    | 2 +-
 .../src/main/java/org/apache/maven/it0039/Person2.java    | 2 +-
 .../test/java/org/apache/maven/it0039/Person2Test.java    | 4 ++--
 .../src/test/resources/it0040/pom.xml                     | 2 +-
 .../src/test/resources/it0041/pom.xml                     | 2 +-
 .../test/java/org/apache/maven/it0065/PersonTwoTest.java  | 2 +-
 .../src/test/resources/it0077/sub2/pom.xml                | 8 ++++----
 .../src/test/resources/it0082/test-plugin/pom.xml         | 4 +---
 14 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml b/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
index 11f7631909..68ae6f4634 100644
--- a/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0012/child-project/pom.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven</groupId>
-  <artifactId>maven-core-it0012-child-project</artifactId>
+  <artifactId>child-project</artifactId>
   <packaging>jar</packaging>
   <version>3.0.3</version>
   <build>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
index 9532c92167..f3c57e5c3b 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/pom.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-core-it0039-p1</artifactId>
+  <artifactId>maven-it-it0039-p1</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
index ad2dc5f428..93ed141837 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/release-pom.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-core-it0039-p1</artifactId>
+  <artifactId>maven-it-it0039-p1</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java b/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
index a9fb4bc9d2..6d58f083b4 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/src/main/java/org/apache/maven/it0039/Person.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
 
 public class Person
 {
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java b/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
index 354f917f46..cd28579751 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project/src/test/java/org/apache/maven/it0039/PersonTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
index c28c287c3e..02a1cf21d5 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/pom.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-core-it0039-p2</artifactId>
+  <artifactId>maven-it-it0039-p2</artifactId>
   <packaging>jar</packaging>
   <version>1.0-SNAPSHOT</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml b/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
index 60fe926e84..c3c0b0e587 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/release-pom.xml
@@ -1,7 +1,7 @@
 <model>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.maven.its.it0039</groupId>
-  <artifactId>maven-core-it0039-p2</artifactId>
+  <artifactId>maven-it-it0039-p2</artifactId>
   <packaging>jar</packaging>
   <version>1.0</version>
   <dependencies>
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java b/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
index 75a6704aea..eff2bcaa0f 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/src/main/java/org/apache/maven/it0039/Person2.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it0000;
+package org.apache.maven.it0039;
 
 public class Person2
 {
diff --git a/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java b/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
index cce3404608..2fd5181e02 100644
--- a/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
+++ b/maven-core-integration-tests/src/test/resources/it0039/project2/src/test/java/org/apache/maven/it0039/Person2Test.java
@@ -1,4 +1,4 @@
-package it0039.project2.src.test.java.org.apache.maven.it0039;
+package org.apache.maven.it0039;
 
 import junit.framework.TestCase;
 
@@ -7,7 +7,7 @@ public class Person2Test
 {
     public void testPerson()
     {
-        Person person = new Person();
+        Person2 person = new Person2();
 
         person.setName( "foo" );
 
diff --git a/maven-core-integration-tests/src/test/resources/it0040/pom.xml b/maven-core-integration-tests/src/test/resources/it0040/pom.xml
index b3ada958ff..5a6879c0d3 100644
--- a/maven-core-integration-tests/src/test/resources/it0040/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0040/pom.xml
@@ -4,7 +4,7 @@
   <groupId>org.apache.maven.its.it0040</groupId>
   <artifactId>maven-it-it0040</artifactId>
   <description>Test the use of a packaging from a plugin</description>
-  <packaging>coreit-packaging</packaging>
+  <packaging>it-packaging</packaging>
   <version>1.0</version>
   <build>
     <plugins>
diff --git a/maven-core-integration-tests/src/test/resources/it0041/pom.xml b/maven-core-integration-tests/src/test/resources/it0041/pom.xml
index 6eca8bbdd9..e9a67bf33d 100644
--- a/maven-core-integration-tests/src/test/resources/it0041/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0041/pom.xml
@@ -10,7 +10,7 @@
       <groupId>org.apache.maven</groupId>
       <artifactId>maven-core-it-support</artifactId>
       <version>1.2</version>
-      <type>coreit-artifact</type>
+      <type>it-artifact</type>
     </dependency>
   </dependencies>
   <build>
diff --git a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
index eb1aa6aff3..5caea7be62 100644
--- a/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
+++ b/maven-core-integration-tests/src/test/resources/it0065/subproject/src/test/java/org/apache/maven/it0065/PersonTwoTest.java
@@ -1,4 +1,4 @@
-package org.apache.maven.it00065;
+package org.apache.maven.it0065;
 
 import junit.framework.TestCase;
 
diff --git a/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml b/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
index c245bcee64..f127b8525f 100644
--- a/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0077/sub2/pom.xml
@@ -9,14 +9,14 @@
   <version>1.0</version>
   <dependencies>
     <dependency>
-      <groupId>org.apache.maven.it</groupId>
-      <artifactId>maven-it0077-sub1</artifactId>
+      <groupId>org.apache.maven.its.it0077</groupId>
+      <artifactId>sub1</artifactId>
       <version>1.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.maven.it</groupId>
-      <artifactId>maven-it0077-sub1</artifactId>
+      <groupId>org.apache.maven.its.it0077</groupId>
+      <artifactId>sub1</artifactId>
       <type>test-jar</type>
       <version>1.0</version>
       <scope>test</scope>
diff --git a/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml b/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
index 9a775643a6..a0a2ae55a3 100644
--- a/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
+++ b/maven-core-integration-tests/src/test/resources/it0082/test-plugin/pom.xml
@@ -5,9 +5,7 @@
 		<groupId>org.apache.maven.its.it0082</groupId>
 		<version>0.1</version>
 	</parent>
-
-  <groupId>org.apache.maven.plugins</groupId>
-  <artifactId>maven-core-it-plugin</artifactId>
+  <artifactId>test-plugin</artifactId>
   <packaging>maven-plugin</packaging>
   <version>1.0-SNAPSHOT</version>
   <name>Test Plugin</name>