Commit b74ac65a authored by maoo's avatar maoo
Browse files

reopening Issue #43 - requiredProperties is not working as expected, it does... 

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
parent 1d8f9bf3

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

+0 −5
Original line number Diff line number Diff line 
<?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>

maven-alfresco-archetypes/maven-alfresco-amp-archetype/src/main/resources/archetype-resources/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+2 −6
Original line number Diff line number Diff line 
<?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">

      <directory>src/main/java</directory>

      <includes>
@@ -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>

maven-alfresco-archetypes/maven-alfresco-extension-archetype/src/main/resources/archetype-resources/pom.xml

+1 −1
Original line number Diff line number Diff line
@@ -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 -->

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

+0 −5
Original line number Diff line number Diff line 
<?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>