android-with-test: submodule's dir named after artifactId

- explicitly defines modules and remove 'application*' from
  directories' name
- reference root artifact id via property
- move resources from application* to __rootArtifactId__*

Signed-off-by: Mykola Nikishov <mn@mn.com.ua>

android-with-test/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -11,75 +11,81 @@
     </requiredProperty>
   </requiredProperties>
 
+  <modules>
+    <module id="${rootArtifactId}" dir="__rootArtifactId__" name="${rootArtifactId}">
   <fileSets>
-    <!-- application -->
     <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>application/src/main/java</directory>
+      <directory>src/main/java</directory>
       <includes>
         <include>**/*.java</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application/res</directory>
+      <directory>res</directory>
       <includes>
         <include>**/*.xml</include>
       </includes>
     </fileSet>
     <fileSet filtered="false" encoding="UTF-8">
-      <directory>application/res</directory>
+      <directory>res</directory>
       <includes>
         <include>**/*.png</include>
       </includes>
     </fileSet>
     <fileSet filtered="false" encoding="UTF-8">
-      <directory>application/assets</directory>
+      <directory>assets</directory>
       <includes>
         <include>**/*</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application</directory>
+      <directory></directory>
       <includes>
         <include>*.xml</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application</directory>
+      <directory></directory>
       <includes>
         <include>*.properties</include>
       </includes>
     </fileSet>
+  </fileSets>
+    </module>
 
-    <!-- it -->
+    <module id="${rootArtifactId}-it" dir="__rootArtifactId__-it" name="${rootArtifactId}-it">
+  <fileSets>
     <fileSet filtered="true" packaged="true" encoding="UTF-8">
-      <directory>application-it/src/main/java</directory>
+      <directory>src/main/java</directory>
       <includes>
         <include>**/*.java</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application-it/res</directory>
+      <directory>res</directory>
       <includes>
         <include>**/*.xml</include>
       </includes>
     </fileSet>
     <fileSet filtered="false" encoding="UTF-8">
-      <directory>application-it/res</directory>
+      <directory>res</directory>
       <includes>
         <include>**/*.png</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application-it</directory>
+      <directory></directory>
       <includes>
         <include>*.xml</include>
       </includes>
     </fileSet>
     <fileSet filtered="true" encoding="UTF-8">
-      <directory>application-it</directory>
+      <directory></directory>
       <includes>
         <include>*.properties</include>
       </includes>
     </fileSet>
   </fileSets>
+    </module>
+</modules>
 </archetype-descriptor>

android-with-test/src/main/resources/archetype-resources/application-it/pom.xml → android-with-test/src/main/resources/archetype-resources/__rootArtifactId__-it/pom.xml

@@ -5,7 +5,7 @@
 
     <parent>
         <groupId>${groupId}</groupId>
-        <artifactId>${artifactId}-parent</artifactId>
+        <artifactId>${rootArtifactId}-parent</artifactId>
         <version>${version}</version>
     </parent>
 
@@ -26,13 +26,13 @@
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${artifactId}</artifactId>
+            <artifactId>${rootArtifactId}</artifactId>
             <type>apk</type>
             <version>${version}</version>
         </dependency>
         <dependency>
             <groupId>${groupId}</groupId>
-            <artifactId>${artifactId}</artifactId>
+            <artifactId>${rootArtifactId}</artifactId>
             <type>jar</type>
             <version>${version}</version>
         </dependency>

android-with-test/src/main/resources/archetype-resources/application/pom.xml → android-with-test/src/main/resources/archetype-resources/__rootArtifactId__/pom.xml

@@ -5,7 +5,7 @@
 
   <parent>
     <groupId>${groupId}</groupId>
-    <artifactId>${artifactId}-parent</artifactId>
+    <artifactId>${rootArtifactId}-parent</artifactId>
     <version>${version}</version>
   </parent>
 

android-with-test/src/main/resources/archetype-resources/pom.xml

@@ -9,8 +9,8 @@
     <name>${artifactId} - Parent</name>
 
     <modules>
-        <module>application</module>
-        <module>application-it</module>
+        <module>${rootArtifactId}</module>
+        <module>${rootArtifactId}-it</module>
     </modules>
 
     <dependencyManagement>