renamed basic directory to it-basic and generated artifactId to basic-${archetype objective}
git-svn-id: https://svn.apache.org/repos/asf/maven/archetypes/trunk@1824653 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/maven-archetype-archetype/src/test/resources/projects/basic/archetype.properties b/maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties
similarity index 60%
rename from maven-archetype-archetype/src/test/resources/projects/basic/archetype.properties
rename to maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties
index f896b3a..f255eaf 100644
--- a/maven-archetype-archetype/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-archetype/src/test/resources/projects/it-basic/archetype.properties
@@ -1,3 +1,3 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-archetype
version=0.1-SNAPSHOT
diff --git a/maven-archetype-archetype/src/test/resources/projects/basic/goal.txt b/maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-archetype/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-archetype/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/archetype.properties
similarity index 66%
copy from maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
copy to maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/archetype.properties
index 2c3b543..0ed1466 100644
--- a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-j2ee-simple
version=0.1-SNAPSHOT
package=it.pkg
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/goal.txt b/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-j2ee-simple/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-plugin-site/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin-site/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c3b543..0000000
--- a/maven-archetype-plugin-site/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
-package=it.pkg
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin-site/src/test/resources/projects/it-basic/archetype.properties
similarity index 66%
copy from maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
copy to maven-archetype-plugin-site/src/test/resources/projects/it-basic/archetype.properties
index 2c3b543..93ce69e 100644
--- a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-plugin-site/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-plugin-site
version=0.1-SNAPSHOT
package=it.pkg
diff --git a/maven-archetype-plugin-site/src/test/resources/projects/basic/goal.txt b/maven-archetype-plugin-site/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-plugin-site/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-plugin-site/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-plugin/src/test/resources/projects/basic/archetype.properties b/maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
similarity index 100%
rename from maven-archetype-plugin/src/test/resources/projects/basic/archetype.properties
rename to maven-archetype-plugin/src/test/resources/projects/it-basic/archetype.properties
diff --git a/maven-archetype-plugin/src/test/resources/projects/basic/goal.txt b/maven-archetype-plugin/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-plugin/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-plugin/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-plugin/src/test/resources/projects/basic/verify.groovy b/maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
similarity index 100%
rename from maven-archetype-plugin/src/test/resources/projects/basic/verify.groovy
rename to maven-archetype-plugin/src/test/resources/projects/it-basic/verify.groovy
diff --git a/maven-archetype-portlet/src/test/resources/projects/basic/archetype.properties b/maven-archetype-portlet/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c3b543..0000000
--- a/maven-archetype-portlet/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
-package=it.pkg
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-portlet/src/test/resources/projects/it-basic/archetype.properties
similarity index 69%
rename from maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
rename to maven-archetype-portlet/src/test/resources/projects/it-basic/archetype.properties
index 2c3b543..b82c615 100644
--- a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-portlet/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-portlet
version=0.1-SNAPSHOT
package=it.pkg
diff --git a/maven-archetype-portlet/src/test/resources/projects/basic/goal.txt b/maven-archetype-portlet/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-portlet/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-portlet/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-profiles/src/test/resources/projects/basic/archetype.properties b/maven-archetype-profiles/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index 2c3b543..0000000
--- a/maven-archetype-profiles/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
-package=it.pkg
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-profiles/src/test/resources/projects/it-basic/archetype.properties
similarity index 68%
copy from maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
copy to maven-archetype-profiles/src/test/resources/projects/it-basic/archetype.properties
index 2c3b543..7225b1c 100644
--- a/maven-archetype-j2ee-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-profiles/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-profiles
version=0.1-SNAPSHOT
package=it.pkg
diff --git a/maven-archetype-profiles/src/test/resources/projects/basic/goal.txt b/maven-archetype-profiles/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-profiles/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-profiles/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties b/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
index d4ec539..51202b4 100644
--- a/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
+++ b/maven-archetype-quickstart/src/test/resources/projects/it-basic/archetype.properties
@@ -1,4 +1,4 @@
groupId=archetype.it
-artifactId=gen-basic
+artifactId=basic-quickstart
version=0.1-SNAPSHOT
package=it.pkg
diff --git a/maven-archetype-site-simple/src/test/resources/projects/it-basic/archetype.properties b/maven-archetype-site-simple/src/test/resources/projects/it-basic/archetype.properties
new file mode 100644
index 0000000..224f7da
--- /dev/null
+++ b/maven-archetype-site-simple/src/test/resources/projects/it-basic/archetype.properties
@@ -0,0 +1,3 @@
+groupId=archetype.it
+artifactId=basic-site-simple
+version=0.1-SNAPSHOT
\ No newline at end of file
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/goal.txt b/maven-archetype-site-simple/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-site-simple/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-site-simple/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/reference/pom.xml b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
similarity index 94%
rename from maven-archetype-site-simple/src/test/resources/projects/basic/reference/pom.xml
rename to maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
index 364a2d1..9fcdd60 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/basic/reference/pom.xml
+++ b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/pom.xml
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>archetype.it</groupId>
- <artifactId>basic</artifactId>
+ <artifactId>basic-site-simple</artifactId>
<version>0.1-SNAPSHOT</version>
<packaging>pom</packaging>
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/reference/src/site/apt/index.apt b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt
similarity index 100%
rename from maven-archetype-site-simple/src/test/resources/projects/basic/reference/src/site/apt/index.apt
rename to maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/apt/index.apt
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/reference/src/site/site.xml b/maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
similarity index 100%
rename from maven-archetype-site-simple/src/test/resources/projects/basic/reference/src/site/site.xml
rename to maven-archetype-site-simple/src/test/resources/projects/it-basic/reference/src/site/site.xml
diff --git a/maven-archetype-site/src/test/resources/projects/basic/archetype.properties b/maven-archetype-site/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index eb36b30..0000000
--- a/maven-archetype-site/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
\ No newline at end of file
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-site/src/test/resources/projects/it-basic/archetype.properties
similarity index 65%
rename from maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties
rename to maven-archetype-site/src/test/resources/projects/it-basic/archetype.properties
index eb36b30..7452ed8 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-site/src/test/resources/projects/it-basic/archetype.properties
@@ -1,3 +1,3 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-site
version=0.1-SNAPSHOT
\ No newline at end of file
diff --git a/maven-archetype-site/src/test/resources/projects/basic/goal.txt b/maven-archetype-site/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-site/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-site/src/test/resources/projects/it-basic/goal.txt
diff --git a/maven-archetype-site/src/test/resources/projects/basic/verify.groovy b/maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy
similarity index 100%
rename from maven-archetype-site/src/test/resources/projects/basic/verify.groovy
rename to maven-archetype-site/src/test/resources/projects/it-basic/verify.groovy
diff --git a/maven-archetype-webapp/src/test/resources/projects/basic/archetype.properties b/maven-archetype-webapp/src/test/resources/projects/basic/archetype.properties
deleted file mode 100644
index eb36b30..0000000
--- a/maven-archetype-webapp/src/test/resources/projects/basic/archetype.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-groupId=archetype.it
-artifactId=basic
-version=0.1-SNAPSHOT
\ No newline at end of file
diff --git a/maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties b/maven-archetype-webapp/src/test/resources/projects/it-basic/archetype.properties
similarity index 63%
copy from maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties
copy to maven-archetype-webapp/src/test/resources/projects/it-basic/archetype.properties
index eb36b30..0edde34 100644
--- a/maven-archetype-site-simple/src/test/resources/projects/basic/archetype.properties
+++ b/maven-archetype-webapp/src/test/resources/projects/it-basic/archetype.properties
@@ -1,3 +1,3 @@
groupId=archetype.it
-artifactId=basic
+artifactId=basic-webapp
version=0.1-SNAPSHOT
\ No newline at end of file
diff --git a/maven-archetype-webapp/src/test/resources/projects/basic/goal.txt b/maven-archetype-webapp/src/test/resources/projects/it-basic/goal.txt
similarity index 100%
rename from maven-archetype-webapp/src/test/resources/projects/basic/goal.txt
rename to maven-archetype-webapp/src/test/resources/projects/it-basic/goal.txt
