[richfaces-svn-commits] JBoss Rich Faces SVN: r19426 - in trunk/archetypes/richfaces-archetype-simpleapp: src/main/resources/META-INF/maven and 1 other directories.

Author: jbalunas(a)redhat.com Date: 2010-10-04 10:39:19 -0400 (Mon, 04 Oct 2010) New Revision: 19426 Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml Log: RF-9400, RF-9404 - fixed filtering overrides, and updated version correctly Modified: trunk/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-04 14:30:28 UTC (rev 19425) +++ trunk/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-04 14:39:19 UTC (rev 19426) @@ -17,10 +17,6 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Setting this property for resource filtering so that generated project - uses correct version of richfaces. - --> - <archetype.project.version>${project.version}</archetype.project.version> </properties> <build> @@ -39,10 +35,17 @@ </plugin> </plugins> <resources> - <!-- Trigger filtering on resource directory --> + <!-- Selectively trigger filtering on resource directory + The second element turns on filtering only for META-INF directory + --> <resource> - <directory>src/main/resources</directory> + <directory>src/main/resources/</directory> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/resources/META-INF/maven</directory> <filtering>true</filtering> + <targetPath>META-INF/maven</targetPath> </resource> </resources> </build> Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 14:30:28 UTC (rev 19425) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 14:39:19 UTC (rev 19426) @@ -1,4 +1,12 @@ -<?xml version="1.0" encoding="UTF-8"?><archetype-descriptor name="richfaces-archetype-simpleapp"> +<?xml version="1.0" encoding="UTF-8"?> + <archetype-descriptor xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archet... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" + name="richfaces-archetype-simpleapp"> + <requiredProperties> + <requiredProperty key="richfaces-version"> + <defaultValue>${project.version}</defaultValue> + </requiredProperty> + </requiredProperties> <fileSets> <fileSet filtered="true" packaged="true" encoding="UTF-8"> <directory>src/main/java</directory> Modified: trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-04 14:30:28 UTC (rev 19425) +++ trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-04 14:39:19 UTC (rev 19426) @@ -1,7 +1,6 @@ #set( $symbol_pound = '#' ) #set( $symbol_dollar = '$' ) -#set( -$symbol_escape = '\' ) +#set($symbol_escape = '\' ) <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> @@ -31,14 +30,14 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Setting this property for resource filtering so that generated project - uses correct version of richfaces. + <!-- Setting this property using archetype-metadata.xml requiredPorperty + so that generated project uses correct version of richfaces. --> - <org.richfaces.bom.version>${archetype.project.version}</org.richfaces.bom.version> + <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version> </properties> <build> - <finalName>${artifactId}-${symbol_dollar}{project.version}</finalName> + <finalName>${artifactId}-${project.version}</finalName> <plugins> <plugin> <artifactId>maven-compiler-plugin</artifactId> @@ -52,7 +51,7 @@ <configuration> <webResources> <resource> - <directory>${symbol_dollar}{basedir}/src/main/java</directory> + <directory>${basedir}/src/main/java</directory> <targetPath>/WEB-INF/src</targetPath> </resource> </webResources> @@ -108,7 +107,7 @@ <goal>war</goal> </goals> <configuration> - <webappDirectory>${symbol_dollar}{project.build.directory}/${symbol_dollar}{project.build.finalName}-jee6</webappDirectory> + <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</packagingExcludes> <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes> @@ -118,7 +117,7 @@ <configuration> <webResources> <resource> - <directory>${symbol_dollar}{basedir}/src/main/java</directory> + <directory>${basedir}/src/main/java</directory> <targetPath>/WEB-INF/src</targetPath> </resource> </webResources>