Revert "Revert "DEVPLAT-338, Incorrect naming of AIO AMPs, #311""

This reverts commit b2afebed09befcbbe1214d056b6f976da5303968.

archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml

@@ -10,7 +10,7 @@
         </requiredProperty>
     </requiredProperties>
     <modules>
-        <module id="repo-amp" dir="repo-amp" name="repo-amp">
+        <module id="${rootArtifactId}-repo-amp" name="${rootArtifactId}-repo-amp" dir="__rootArtifactId__-repo-amp">
             <fileSets>
                 <fileSet filtered="true" packaged="true" encoding="UTF-8">
                     <directory>src/main/java</directory>
@@ -54,7 +54,7 @@
             </fileSets>
         </module>
 
-        <module id="share-amp" dir="share-amp" name="share-amp">
+        <module id="${rootArtifactId}-share-amp" name="${rootArtifactId}-share-amp" dir="__rootArtifactId__-share-amp" >
             <fileSets>
                 <fileSet filtered="true" packaged="true" encoding="UTF-8">
                     <directory>src/main/java</directory>
@@ -153,7 +153,7 @@
 
         <module id="runner" dir="runner" name="runner" filtered="false">
             <fileSets>
-                <fileSet encoding="UTF-8" filtered="false">
+                <fileSet encoding="UTF-8" filtered="true">
                     <directory>tomcat</directory>
                     <includes>
                         <include>**</include>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/repo/pom.xml

@@ -42,7 +42,7 @@
         <!-- Demonstrating the dependency / installation of the repo AMP developed in the 'repo-amp' module -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>repo-amp</artifactId>
+            <artifactId>${rootArtifactId}-repo-amp</artifactId>
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
@@ -91,7 +91,7 @@
                         <!-- Add / sort your AMPs here -->
                         <overlay>
                             <groupId>${project.groupId}</groupId>
-                            <artifactId>repo-amp</artifactId>
+                            <artifactId>${rootArtifactId}-repo-amp</artifactId>
                             <type>amp</type>
                         </overlay>
                         <!-- Uncomment if you are using SPP -->

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/pom.xml

@@ -307,9 +307,9 @@
                         <version>2.18.1</version>
                         <configuration>
                             <suiteXmlFiles>
-                                <suiteXmlFile>${project.parent.basedir}/share-amp/target/test-classes/testng.xml</suiteXmlFile>
+                                <suiteXmlFile>${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes/testng.xml</suiteXmlFile>
                             </suiteXmlFiles>
-                            <testClassesDirectory>${project.parent.basedir}/share-amp/target/test-classes</testClassesDirectory>
+                            <testClassesDirectory>${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes</testClassesDirectory>
                             <systemPropertyVariables>
                                 <!-- Where is the Alfresco Share Webapp that we are testing -->
                                 <share.target>${share.client.url}</share.target>

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-repo.xml

@@ -13,7 +13,7 @@
 <Context docBase="${project.parent.basedir}/alfresco-war/target/${project.build.finalName}">
     <!-- Pick up static resource files from AMPs and other directories (this should not include docBase) -->
     <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/repo-amp/target/repo-amp/web" />
+               extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/web" />
     <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Repo AMP,
                     it would look something like this:
     <Resources className="org.apache.naming.resources.VirtualDirContext"
@@ -30,9 +30,9 @@
     -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
             searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/repo-amp/target/classes;
+            virtualClasspath="${project.parent.basedir}/${rootArtifactId}-repo-amp/target/classes;
-            ${project.parent.basedir}/repo-amp/target/repo-amp/config;
+            ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/${rootArtifactId}-repo-amp/config;
-            ${project.parent.basedir}/repo-amp/target/test-classes" />
+            ${project.parent.basedir}/${rootArtifactId}-repo-amp/target/test-classes" />
 
     <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->
     <JarScanner scanAllDirectories="true" />

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/runner/tomcat/context-share.xml

@@ -10,18 +10,18 @@
     <!-- Pick up static resource files from any Share extensions, being it a JAR or an AMP
          (this should not include docBase) -->
     <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web" />
+               extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/${rootArtifactId}-share-amp/web" />
     <!-- IMPORTANT! The extraResourcePaths string need to be on one continues line, so if we add another Share AMP,
                     it would look something like this:
     <Resources className="org.apache.naming.resources.VirtualDirContext"
-               extraResourcePaths="/=${project.parent.basedir}/share-amp/target/share-amp/web,/=${project.parent.basedir}/component-a-share/target/component-a-share/web" />
+               extraResourcePaths="/=${project.parent.basedir}/${rootArtifactId}-share-amp/target/${rootArtifactId}-share-amp/web,/=${project.parent.basedir}/component-a-share/target/component-a-share/web" />
                -->
 
     <!-- Configure where the Share (share.war) web application can load classes, config, and test classes (in that order) -->
     <!-- Setup the virtual class path like this:
-         1) share-amp/target/classes
+         1) ${rootArtifactId}-share-amp/target/classes
-         2) share-amp/target/${project.build.finalName}/config
+         2) ${rootArtifactId}-share-amp/target/${project.build.finalName}/config
-         3) share-amp/target/test-classes
+         3) ${rootArtifactId}-share-amp/target/test-classes
          4)     Add other AMP paths here....
          5) share/target/test-classes              (loads the share-config-custom.xml used during test runs)
 
@@ -29,9 +29,9 @@
     -->
     <Loader className="org.apache.catalina.loader.VirtualWebappLoader"
             searchVirtualFirst="true"
-            virtualClasspath="${project.parent.basedir}/share-amp/target/classes;
+            virtualClasspath="${project.parent.basedir}/${rootArtifactId}-share-amp/target/classes;
-            ${project.parent.basedir}/share-amp/target/share-amp/config;
+            ${project.parent.basedir}/${rootArtifactId}-share-amp/target/${rootArtifactId}-share-amp/config;
-            ${project.parent.basedir}/share-amp/target/test-classes;
+            ${project.parent.basedir}/${rootArtifactId}-share-amp/target/test-classes;
             ${project.parent.basedir}/share/target/test-classes" />
 
     <!-- Load from all directories, not just when the META-INF directory is found in exploded JAR -->

archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/share/pom.xml

@@ -29,7 +29,7 @@
         <!-- Demonstrating the dependency / installation of the share AMP developed in the 'share-amp' module -->
         <dependency>
             <groupId>${project.groupId}</groupId>
-            <artifactId>share-amp</artifactId>
+            <artifactId>${rootArtifactId}-share-amp</artifactId>
             <version>${project.version}</version>
             <type>amp</type>
         </dependency>
@@ -69,7 +69,7 @@
                         <!-- Add / sort your AMPs here -->
                         <overlay>
                             <groupId>${project.groupId}</groupId>
-                            <artifactId>share-amp</artifactId>
+                            <artifactId>${rootArtifactId}-share-amp</artifactId>
                             <type>amp</type>
                         </overlay>
                         <!-- Uncomment if you are using RM module -->

archetypes/alfresco-allinone-archetype/src/site/apt/usage.apt.vm

@@ -16,9 +16,9 @@ Project layout
 
 +---+
     pom.xml
-    |-> repo-amp
+    |-> rootArtifactid-repo-amp
+    |-> rootArtifactid-share-amp
     |-> repo
-    |-> share-amp
     |-> share
     |-> solr
     |-> runner (a Tomcat embedded runner / integration test runner)
@@ -28,14 +28,14 @@ Project layout
 
     The All-in-One Alfresco project is composed by the following modules:
    
-    * <<<repo-amp>>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading
+    * <<<rootArtifactid-repo-amp>>>: An Repository Tier AMP project, demonstrating sample project structure and demo component loading
      
     * <<<repo>>>: An <<<alfresco.war>>> Repository Extension, overlaying the Alfresco WAR with custom resources / classes 
     and depending on the <<<amp>>> project
     
-    * <<<share-amp>>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading
+    * <<<rootArtifactid-share-amp>>>: A Share Tier AMP project, demonstrating sample project structure and demo component loading
     
-    * <<<share>>>: A <<<share.war>>> extension, overlaying the Share WAR with the custom developed <<<share-amp>>>
+    * <<<share>>>: A <<<share.war>>> extension, overlaying the Share WAR with the custom developed <<<rootArtifactid-share-amp>>>
     
     * <<<solr>>>: An Alfresco <<<alfresco-*-*-solr.zip>>> overlay / customization to configure {{{http://solr.apache.org}Apache Solr}} cores properties