From 49f3014c5eb377c038c2777cd3423ea178f5a80f Mon Sep 17 00:00:00 2001
From: maoo <maurizio.pillitu@alfresco.com>
Date: Thu, 9 Jan 2014 20:37:07 +0000
Subject: [PATCH] issue #175 - Reverted archetype-metadata.xml to previous
 version; the real issue was caused by a wrong mention (in the all-in-one
 archetype) of a property (alfresco_target_amp_client_war) that is not needed.

The amp module now has alfresco.client.war=alfresco hardcoded in the pom.xml

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@735 04253f4f-3451-0410-a141-5562f1e59037
---
 .../resources/META-INF/maven/archetype-metadata.xml  |  9 ---------
 .../main/resources/archetype-resources/amp/pom.xml   | 12 ++++++------
 2 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 1706e7c7..20d6c3b0 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -12,15 +12,6 @@
     <requiredProperty key="alfresco_target_version">
       <defaultValue>4.2.e</defaultValue>
     </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war">
-      <defaultValue>alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_groupId">
-      <defaultValue>org.alfresco</defaultValue>
-    </requiredProperty>
-    <requiredProperty key="alfresco_target_amp_client_war_version">
-      <defaultValue>4.2.e</defaultValue>
-    </requiredProperty>
     <requiredProperty key="package">
       <defaultValue>(not used)</defaultValue>
     </requiredProperty>
diff --git a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
index 2f60855a..af4de8c7 100644
--- a/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
+++ b/archetypes/alfresco-allinone-archetype/src/main/resources/archetype-resources/amp/pom.xml
@@ -12,11 +12,11 @@
         <version>${version}</version>
     </parent>
 
-    <!--
-    Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>
-    is inherited for each of the following; for more info, please refer to alfresco-integration-parent
-    POM definition
-    @TODO - document
+    <!--
+    Following dependencies are needed for compiling Java code in src/main/java; <scope>provided</scope>
+    is inherited for each of the following; for more info, please refer to alfresco-integration-parent
+    POM definition
+    @TODO - document
     -->
     <dependencies>
         <dependency>
@@ -28,7 +28,7 @@
     <properties>
         <!-- Defines the target WAR artifactId to run this amp, only used with the -Pamp-to-war switch
         .    | Allowed values: alfresco | share. Defaults to a repository AMP, but could point to your custom corporate Alfresco WAR -->
-        <alfresco.client.war>${alfresco_target_amp_client_war}</alfresco.client.war>
+        <alfresco.client.war>alfresco</alfresco.client.war>
         <!-- Defines the target WAR groupId to run this amp, only used with the -Pamp-to-war switch
         .    | Could be org.alfresco | org.alfresco.enterprise or your corporate groupId -->
         <!-- <alfresco.client.war.groupId>org.alfresco</alfresco.client.war.groupId> -->