diff --git a/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
index 0cda129..058aaa1 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -17,21 +17,74 @@
 specific language governing permissions and limitations
 under the License.
 -->
-<archetype xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype/1.0.0 http://maven.apache.org/xsd/archetype-1.0.0.xsd">
-  <id>j2ee</id>
+<archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-plugin/archetype-descriptor/1.0.0 http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd"
+  name="j2ee">
 
-  <resources>
-    <resource>pom.xml</resource>
-    <resource>ear/pom.xml</resource>
-    <resource>ejbs/src/main/resources/META-INF/ejb-jar.xml</resource>
-    <resource>ejbs/pom.xml</resource>
-    <resource>primary-source/pom.xml</resource>
-    <resource>projects/logging/pom.xml</resource>
-    <resource>projects/pom.xml</resource>
-    <resource>servlets/pom.xml</resource>
-    <resource>servlets/servlet/pom.xml</resource>
-    <resource>servlets/servlet/src/main/webapp/index.jsp</resource>
-    <resource>servlets/servlet/src/main/webapp/WEB-INF/web.xml</resource>
-  </resources>
-</archetype>
+  <modules>
+    <module id="ear" dir="ear" name="ear">
+      <fileSets>
+        <fileSet>
+          <directory>src/main/java</directory>
+        </fileSet>
+        <fileSet>
+          <directory>src/test/java</directory>
+        </fileSet>
+      </fileSets>
+    </module>
+    <module id="ejbs" dir="ejbs" name="ejbs">
+      <fileSets>
+        <fileSet>
+          <directory>src/main/java</directory>
+        </fileSet>
+        <fileSet>
+          <directory>src/main/resources</directory>
+        </fileSet>
+        <fileSet>
+          <directory>src/test/java</directory>
+        </fileSet>
+      </fileSets>
+    </module>
+    <module id="primary-source" dir="primary-source" name="primary-source">
+      <fileSets>
+        <fileSet>
+          <directory>src/main/java</directory>
+        </fileSet>
+        <fileSet>
+          <directory>src/test/java</directory>
+        </fileSet>
+      </fileSets>
+    </module>
+    <module id="projects" dir="projects" name="projects">
+      <modules>
+        <module id="logging" dir="logging" name="logging">
+          <fileSets>
+            <fileSet>
+              <directory>src/main/java</directory>
+            </fileSet>
+            <fileSet>
+              <directory>src/test/java</directory>
+            </fileSet>
+          </fileSets>
+        </module>
+      </modules>
+    </module>
+    <module id="servlets" dir="servlets" name="servlets">
+      <modules>
+        <module id="servlet" dir="servlet" name="servlet">
+          <fileSets>
+            <fileSet>
+              <directory>src/main/java</directory>
+            </fileSet>
+            <fileSet>
+              <directory>src/main/webapp</directory>
+            </fileSet>
+            <fileSet>
+              <directory>src/test/java</directory>
+            </fileSet>
+          </fileSets>
+        </module>
+      </modules>
+    </module>
+  </modules>
+</archetype-descriptor>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
index 8bf56ce..db7f50a 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ear/pom.xml
@@ -5,35 +5,33 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project</groupId>
   <artifactId>ear</artifactId>
-  <version>1.0</version>
   <packaging>ear</packaging>
 
   <name>ear assembly</name>
 
   <dependencies>
     <dependency>
-      <groupId>root.project</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>ejbs</artifactId>
       <type>ejb</type>
     </dependency>
     <dependency>
-      <groupId>root.project.servlets</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>servlet</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
-      <groupId>root.project</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>primary-source</artifactId>
     </dependency>
     <dependency>
-      <groupId>root.project.projects</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>logging</artifactId>
     </dependency>
   </dependencies>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
index 9cd468e..209773a 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/ejbs/pom.xml
@@ -5,25 +5,23 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project</groupId>
   <artifactId>ejbs</artifactId>
-  <version>1.0</version>
   <packaging>ejb</packaging>
 
   <name>enterprise java beans</name>
 
   <dependencies>
     <dependency>
-      <groupId>root.project</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>primary-source</artifactId>
     </dependency>
     <dependency>
-      <groupId>root.project.projects</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>logging</artifactId>
     </dependency>
   </dependencies>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
index 6653b79..7b19f84 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/pom.xml
@@ -4,12 +4,12 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
-  <groupId>root</groupId>
-  <artifactId>project</artifactId>
-  <version>1.0</version>
+  <groupId>${groupId}</groupId>
+  <artifactId>${artifactId}</artifactId>
+  <version>${version}</version>
   <packaging>pom</packaging>
 
-  <name>project</name>
+  <name>${artifactId}</name>
 
   <modules>
     <module>projects</module>
@@ -34,25 +34,25 @@
   <dependencyManagement>
     <dependencies>
       <dependency>
-        <groupId>root.project.projects</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>logging</artifactId>
-        <version>1.0</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
-        <groupId>root.project</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>primary-source</artifactId>
-        <version>1.0</version>
+        <version>${version}</version>
       </dependency>
       <dependency>
-        <groupId>root.project.servlets</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>servlet</artifactId>
-        <version>1.0</version>
+        <version>${version}</version>
         <type>war</type>
       </dependency>
       <dependency>
-        <groupId>root.project</groupId>
+        <groupId>${groupId}</groupId>
         <artifactId>ejbs</artifactId>
-        <version>1.0</version>
+        <version>${version}</version>
         <type>ejb</type>
       </dependency>
     </dependencies>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
index c8cbf3f..06df82e 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/primary-source/pom.xml
@@ -5,12 +5,11 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project</groupId>
   <artifactId>primary-source</artifactId>
   <packaging>jar</packaging>
 
@@ -18,7 +17,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>root.project.projects</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>logging</artifactId>
     </dependency>
   </dependencies>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
index 84004cb..b19da47 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/logging/pom.xml
@@ -5,14 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root.project</groupId>
+    <groupId>${groupId}</groupId>
     <artifactId>projects</artifactId>
-    <version>1.0</version>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project.projects</groupId>
   <artifactId>logging</artifactId>
-  <packaging>jar</packaging>
 
   <name>logging</name>
 </project>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
index 7c0e3c5..ad7fa25 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/projects/pom.xml
@@ -5,14 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project</groupId>
   <artifactId>projects</artifactId>
-  <version>1.0</version>
   <packaging>pom</packaging>
 
   <name>sub projects</name>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
index 28a0ab6..000152c 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/pom.xml
@@ -5,14 +5,12 @@
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root</groupId>
-    <artifactId>project</artifactId>
-    <version>1.0</version>
+    <groupId>${groupId}</groupId>
+    <artifactId>${rootArtifactId}</artifactId>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project</groupId>
   <artifactId>servlets</artifactId>
-  <version>1.0</version>
   <packaging>pom</packaging>
 
   <name>servlets</name>
diff --git a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
index 2d0ca2d..bb73e0d 100644
--- a/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
+++ b/maven-archetype-j2ee-simple/src/main/resources/archetype-resources/servlets/servlet/pom.xml
@@ -1,16 +1,15 @@
-<<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 
-project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<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/xsd/maven-4.0.0.xsd">
   <modelVersion>4.0.0</modelVersion>
 
   <parent>
-    <groupId>root.project</groupId>
+    <groupId>${groupId}</groupId>
     <artifactId>servlets</artifactId>
-    <version>1.0</version>
+    <version>${version}</version>
   </parent>
 
-  <groupId>root.project.servlets</groupId>
   <artifactId>servlet</artifactId>
   <packaging>war</packaging>
 
@@ -18,7 +17,7 @@
 
   <dependencies>
     <dependency>
-      <groupId>root.project</groupId>
+      <groupId>${groupId}</groupId>
       <artifactId>primary-source</artifactId>
       <scope>provided</scope>
     </dependency>
diff --git a/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt b/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
index e69de29..4a1a71d 100644
--- a/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
+++ b/maven-archetype-j2ee-simple/src/test/resources/projects/it-basic/goal.txt
@@ -0,0 +1 @@
+verify
\ No newline at end of file