From 82d38f6a42106bf59bd3a0e10ad4754105e6031b Mon Sep 17 00:00:00 2001
From: billerby <billerby@gmail.com>
Date: Mon, 1 Mar 2010 14:20:54 +0000
Subject: [PATCH] Change the way moduleId is generated, from
 ${groupId}.${artifactId} to just ${artifactId}. The former way caused
 problems when loading classpath resources.

This solves issues 26 and 42.

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@298 04253f4f-3451-0410-a141-5562f1e59037
---
 .../src/main/resources/archetype-resources/README.txt     | 4 ++--
 .../main/resources/archetype-resources/module.properties  | 2 +-
 .../src/main/resources/archetype-resources/pom.xml        | 8 ++++----
 .../src/main/config/context/service-context.xml           | 2 +-
 .../src/main/config/module-context.xml                    | 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
index 2875f453..b319edb1 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/README.txt
@@ -72,9 +72,9 @@ src --------------------------------------------------------> (source folder)
 		|__ main ___ __ resources --------------------------> mapped in the classpath. Add here classpath resources
 		|			|
 		|			|__ config-----   alfresco module config goes here.
-		|			|			  |	  Get's copied (by best practice) by build into package alfresco/module/groupId.artifactId.
+		|			|			  |	  Get's copied (by best practice) by build into package alfresco/module/artifactId.
 		|			|			  |   This convention is used by the archetype and by the AMP unpacker.
-		|			|			  |__ ex: alfresco/module/com.sourcesense.alfresco.mymodule ---> Example Alfresco module config 
+		|			|			  |__ ex: alfresco/module/mymodule ---> Example Alfresco module config 
 		|			|
 		|			|
 		|			|__ java ------------------------------->  customization java classes
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
index d317e526..9275bba5 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/module.properties
@@ -19,7 +19,7 @@
 
 # ==== Beginning of Alfresco required/optional properties ====== #
 
-module.id=${pom.groupId}.${pom.artifactId}
+module.id=${pom.artifactId}
 #module.aliases=myModule-123, my-module
 module.title=${pom.name}
 module.description=${pom.description}
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
index 01b33b95..db65e81b 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml
@@ -227,13 +227,13 @@
 			</resource>
 			<!--
 				Copies and filters AMP config in the proper package
-				'alfresco/module/${groupId}.${artifactId}' so to enforce full module
+				'alfresco/module/${artifactId}' so to enforce full module
 				naming single sourcing from POM properties
 			-->
 			<resource>
 				<filtering>true</filtering>
 				<directory>src/main/config</directory>
-				<targetPath>alfresco/module/${groupId}.${artifactId}</targetPath>
+				<targetPath>alfresco/module/${artifactId}</targetPath>
 				<excludes>
 					<exclude>**README-*</exclude>
 				</excludes>
@@ -389,7 +389,7 @@
 					</testResource>
 					<!--
 						src/main/config/ is copied into ==>
-						target/test-classes/alfresco/module/${groupId}.${artifactId} to be
+						target/test-classes/alfresco/module/${artifactId} to be
 						picked up by the maven-war plugin Best practice tacken from
 						recordsmanagement.amp, is enforced troughout the whole archetype.
 						This convention is also used for module.properties filtering.
@@ -400,7 +400,7 @@
 						<includes>
 							<include>module.properties</include>
 						</includes>
-						<targetPath>alfresco/module/${groupId}.${artifactId}</targetPath>
+						<targetPath>alfresco/module/${artifactId}</targetPath>
 					</testResource>
 				</testResources>
 			</build>
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
index edf2a037..5cb23f6a 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/context/service-context.xml
@@ -23,7 +23,7 @@
     <bean id="${groupId}.${artifactId}.exampleBean" class="org.alfresco.demoamp.Demo" init-method="init" />
     
     <!-- A simple module component that will be executed once -->
-    <bean id="${groupId}.${artifactId}.exampleComponent" class="org.alfresco.demoamp.DemoComponent" parent="module.baseComponent" >
+    <bean id="${artifactId}.exampleComponent" class="org.alfresco.demoamp.DemoComponent" parent="module.baseComponent" >
         <property name="moduleId" value="${pom.groupId}.${pom.artifactId}" />  <!-- See module.properties -->
         <property name="name" value="exampleComponent" />
         <property name="description" value="A demonstration component" />
diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
index 2421dacb..2111526d 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/src/main/config/module-context.xml
@@ -20,6 +20,6 @@
 
 <beans>
 	
-    <import resource="classpath:alfresco/module/${groupId}.${artifactId}/context/service-context.xml" />
+    <import resource="classpath:alfresco/module/${artifactId}/context/service-context.xml" />
     
 </beans>