From b74ac65a6a21a8cfc8556aeec6619a5c21d3f45b Mon Sep 17 00:00:00 2001
From: maoo <maurizio.pillitu@alfresco.com>
Date: Wed, 4 Apr 2012 16:56:48 +0000
Subject: [PATCH] reopening Issue #43 - requiredProperties is not working as
 expected, it does not respect default value. Reverting changes to
 archetype-metadata.xml, use property <alfresco.edition> in each pom.xml

git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@378 04253f4f-3451-0410-a141-5562f1e59037
---
 .../main/resources/META-INF/maven/archetype-metadata.xml  | 5 -----
 .../src/main/resources/archetype-resources/pom.xml        | 2 +-
 .../main/resources/META-INF/maven/archetype-metadata.xml  | 8 ++------
 .../src/main/resources/archetype-resources/pom.xml        | 2 +-
 .../main/resources/META-INF/maven/archetype-metadata.xml  | 5 -----
 .../src/main/resources/archetype-resources/pom.xml        | 2 +-
 plugins/maven-amp-plugin-test/pom.xml                     | 2 +-
 7 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 32f79153..0ecbb6ab 100644
--- a/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <archetype-descriptor name="amp">
-  <requiredProperties>
-    <requiredProperty key="alfresco-default-edition">
-       <defaultValue>community</defaultValue>
-    </requiredProperty>
-  </requiredProperties>
   <fileSets>
     <fileSet filtered="false" packaged="false" encoding="UTF-8">
       <directory>src/main/java</directory>
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 7b1061e9..12f48e19 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
@@ -87,7 +87,7 @@
 			default in target/alfresco.log
 		-->
         <alfresco.version>3.4.a</alfresco.version>
-        <alfresco.edition>${alfresco-default-edition}</alfresco.edition>
+        <alfresco.edition>community</alfresco.edition>
 		<alfresco.data.location>./alf_data_jetty</alfresco.data.location>
 		<alfresco.db.name>alf_jetty</alfresco.db.name>
 		<alfresco.db.username>alfresco</alfresco.db.username>
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index 6a6c7433..e7eb7c45 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="maven-alfresco-extension-archetype">
   <fileSets>
-      <requiredProperties>
-          <requiredProperty key="alfresco-default-edition">
-              <defaultValue>community</defaultValue>
-          </requiredProperty>
-      </requiredProperties>
-      <fileSet filtered="true" encoding="UTF-8">
+    <fileSet filtered="true" encoding="UTF-8">
       <directory>src/main/java</directory>
       <includes>
         <include>**/*.java</include>
@@ -113,6 +108,7 @@
       <includes>
         <include>.classpath</include>
         <include>.project</include>
+        <include>pom.xml</include>
         <include>build.xml</include>
         <include>maven-eclipse.xml</include>
         <include>README-ANT.txt</include>
diff --git a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
index 907b5303..d9e65412 100644
--- a/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml
@@ -38,7 +38,7 @@
 	<properties>
         <!-- Alfresco version/edition selection -->
         <alfresco.version>4.0.b</alfresco.version>
-        <alfresco.edition>${alfresco-default-edition}</alfresco.edition>
+        <alfresco.edition>${alfedition}</alfresco.edition>
         <!-- Build environment ==> src/main/properties/<env>/alfresco-global.properties is loaded -->
         <env>local</env>
         <!-- Webapp packaged name -->
diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index b5af1b04..e04fb48d 100644
--- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="alfresco-share-extension">
   <fileSets>
-      <requiredProperties>
-          <requiredProperty key="alfresco-default-edition">
-              <defaultValue>community</defaultValue>
-          </requiredProperty>
-      </requiredProperties>
       <fileSet filtered="false" encoding="UTF-8">
       <directory>src/main/properties</directory>
       <includes>
diff --git a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml
index 0678b330..d455fb07 100644
--- a/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml
+++ b/maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml
@@ -31,7 +31,7 @@
 	<properties>
 		<env>local</env>
 		<alfresco.version>4.0.b</alfresco.version>
-        <alfresco.edition>${alfresco-default-edition}</alfresco.edition>
+        <alfresco.edition>community</alfresco.edition>
 		<share.log.level>info</share.log.level>
 		<share.servlet.port>8081</share.servlet.port>
         <surf.wiring.mode>development</surf.wiring.mode><!-- "production" is the other allowed value -->
diff --git a/plugins/maven-amp-plugin-test/pom.xml b/plugins/maven-amp-plugin-test/pom.xml
index fcd0c62d..af8073dc 100755
--- a/plugins/maven-amp-plugin-test/pom.xml
+++ b/plugins/maven-amp-plugin-test/pom.xml
@@ -26,7 +26,7 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<alfresco.version>3.4.a</alfresco.version>
-        <alfresco.edition>${alfresco-default-edition}</alfresco.edition>
+        <alfresco.edition>community</alfresco.edition>
 		<spring.version>3.0.0.RELEASE</spring.version>
 		<amp-plugin.version>3.0.3-SNAPSHOT</amp-plugin.version>
 		<alfresco.module.id>${project.artifactId}</alfresco.module.id>