Issue #68 - Replaced ${artifactId} instances of the pom.xml archetype template of maven-alfresco-amp-archetype (which are replaced by the artifactId during archetype creation) with ${project.artifactId}, which is preserved and can be read and used by the archetype end user

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@373 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
maoo 2012-04-04 07:37:09 +00:00
parent db4b7448bd
commit f4e6dc30cd

View File

@ -70,7 +70,7 @@
--> -->
<env>local</env> <env>local</env>
<!-- Webapp used to test/develop locally the AMP --> <!-- Webapp used to test/develop locally the AMP -->
<webapp.name>${artifactId}-webapp</webapp.name> <webapp.name>${project.artifactId}-webapp</webapp.name>
<!-- <!--
| | By default the src/test/properties/local/alfresco-global.properties | | By default the src/test/properties/local/alfresco-global.properties
uses the property "alfresco.data.location" to specify where | uses the property "alfresco.data.location" to specify where |
@ -225,13 +225,13 @@
</resource> </resource>
<!-- <!--
Copies and filters AMP config in the proper package Copies and filters AMP config in the proper package
'alfresco/module/${artifactId}' so to enforce full module 'alfresco/module/${project.artifactId}' so to enforce full module
naming single sourcing from POM properties naming single sourcing from POM properties
--> -->
<resource> <resource>
<filtering>true</filtering> <filtering>true</filtering>
<directory>src/main/config</directory> <directory>src/main/config</directory>
<targetPath>alfresco/module/${artifactId}</targetPath> <targetPath>alfresco/module/${project.artifactId}</targetPath>
<excludes> <excludes>
<exclude>**README-*</exclude> <exclude>**README-*</exclude>
</excludes> </excludes>
@ -398,7 +398,7 @@
</testResource> </testResource>
<!-- <!--
src/main/config/ is copied into ==> src/main/config/ is copied into ==>
target/test-classes/alfresco/module/${artifactId} to be target/test-classes/alfresco/module/${project.artifactId} to be
picked up by the maven-war plugin Best practice tacken from picked up by the maven-war plugin Best practice tacken from
recordsmanagement.amp, is enforced troughout the whole archetype. recordsmanagement.amp, is enforced troughout the whole archetype.
This convention is also used for module.properties filtering. This convention is also used for module.properties filtering.
@ -409,7 +409,7 @@
<includes> <includes>
<include>module.properties</include> <include>module.properties</include>
</includes> </includes>
<targetPath>alfresco/module/${artifactId}</targetPath> <targetPath>alfresco/module/${project.artifactId}</targetPath>
</testResource> </testResource>
</testResources> </testResources>
</build> </build>