inteligr8/alfresco-sdk
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-sdk.git synced 2025-05-26 17:25:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: http://maven-alfresco-archetypes.googlecode.com/svn/trunk@378 04253f4f-3451-0410-a141-5562f1e59037
This commit is contained in:
maoo 2012-04-04 16:56:48 +00:00
parent 1d8f9bf3c0
commit b74ac65a6a
7 changed files with 6 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<archetype-descriptor name="amp"> <archetype-descriptor name="amp">
<requiredProperties>
<requiredProperty key="alfresco-default-edition">
<defaultValue>community</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSets> <fileSets>
<fileSet filtered="false" packaged="false" encoding="UTF-8"> <fileSet filtered="false" packaged="false" encoding="UTF-8">
<directory>src/main/java</directory> <directory>src/main/java</directory>

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

@ -87,7 +87,7 @@
default in target/alfresco.log default in target/alfresco.log
--> -->
<alfresco.version>3.4.a</alfresco.version> <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.data.location>./alf_data_jetty</alfresco.data.location>
<alfresco.db.name>alf_jetty</alfresco.db.name> <alfresco.db.name>alf_jetty</alfresco.db.name>
<alfresco.db.username>alfresco</alfresco.db.username> <alfresco.db.username>alfresco</alfresco.db.username>

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

@ -1,11 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="maven-alfresco-extension-archetype"> <?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="maven-alfresco-extension-archetype">
<fileSets> <fileSets>
<requiredProperties> <fileSet filtered="true" encoding="UTF-8">
<requiredProperty key="alfresco-default-edition">
<defaultValue>community</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSet filtered="true" encoding="UTF-8">
<directory>src/main/java</directory> <directory>src/main/java</directory>
<includes> <includes>
<include>**/*.java</include> <include>**/*.java</include>
@ -113,6 +108,7 @@
<includes> <includes>
<include>.classpath</include> <include>.classpath</include>
<include>.project</include> <include>.project</include>
<include>pom.xml</include>
<include>build.xml</include> <include>build.xml</include>
<include>maven-eclipse.xml</include> <include>maven-eclipse.xml</include>
<include>README-ANT.txt</include> <include>README-ANT.txt</include>

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

@ -38,7 +38,7 @@
<properties> <properties>
<!-- Alfresco version/edition selection --> <!-- Alfresco version/edition selection -->
<alfresco.version>4.0.b</alfresco.version> <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 --> <!-- Build environment ==> src/main/properties/<env>/alfresco-global.properties is loaded -->
<env>local</env> <env>local</env>
<!-- Webapp packaged name --> <!-- Webapp packaged name -->

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

@ -1,10 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="alfresco-share-extension"> <?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="alfresco-share-extension">
<fileSets> <fileSets>
<requiredProperties>
<requiredProperty key="alfresco-default-edition">
<defaultValue>community</defaultValue>
</requiredProperty>
</requiredProperties>
<fileSet filtered="false" encoding="UTF-8"> <fileSet filtered="false" encoding="UTF-8">
<directory>src/main/properties</directory> <directory>src/main/properties</directory>
<includes> <includes>

2
maven-alfresco-archetypes/maven-alfresco-share-archetype/src/main/resources/archetype-resources/pom.xml
View File

@ -31,7 +31,7 @@
<properties> <properties>
<env>local</env> <env>local</env>
<alfresco.version>4.0.b</alfresco.version> <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.log.level>info</share.log.level>
<share.servlet.port>8081</share.servlet.port> <share.servlet.port>8081</share.servlet.port>
<surf.wiring.mode>development</surf.wiring.mode><!-- "production" is the other allowed value --> <surf.wiring.mode>development</surf.wiring.mode><!-- "production" is the other allowed value -->

2
plugins/maven-amp-plugin-test/pom.xml
View File

@ -26,7 +26,7 @@
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<alfresco.version>3.4.a</alfresco.version> <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> <spring.version>3.0.0.RELEASE</spring.version>
<amp-plugin.version>3.0.3-SNAPSHOT</amp-plugin.version> <amp-plugin.version>3.0.3-SNAPSHOT</amp-plugin.version>
<alfresco.module.id>${project.artifactId}</alfresco.module.id> <alfresco.module.id>${project.artifactId}</alfresco.module.id>