[richfaces-svn-commits] JBoss Rich Faces SVN: r19435 - in trunk/archetypes/rf-gae-sample: src/main/resources/META-INF/maven and 2 other directories.

Author: jbalunas(a)redhat.com Date: 2010-10-04 15:16:38 -0400 (Mon, 04 Oct 2010) New Revision: 19435 Modified: trunk/archetypes/rf-gae-sample/pom.xml trunk/archetypes/rf-gae-sample/readme.txt trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java Log: RF-9400, RF-9404 - fixed filtering overrides, and updated version correctly Modified: trunk/archetypes/rf-gae-sample/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/pom.xml 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/pom.xml 2010-10-04 19:16:38 UTC (rev 19435) @@ -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,9 +35,17 @@ </plugin> </plugins> <resources> + <!-- 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/rf-gae-sample/readme.txt =================================================================== --- trunk/archetypes/rf-gae-sample/readme.txt 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/readme.txt 2010-10-04 19:16:38 UTC (rev 19435) @@ -22,7 +22,7 @@ 3) Then just execute appcfg from GAE SDK(link) to publish to your account: appcfg update <PATH: "generated-application-target-folder/output application folder"> -NOTE:Do not forget to register your own application name and make sure that the demo uses the same name accordingly. +NOTE:Do not forget to register your own application name and make sure that the demo uses the same name accordingly. By default the applications name is "rf-${artifactId}" 4) now visit your application using http://<application-name>.appspot.com Modified: trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-04 19:16:38 UTC (rev 19435) @@ -2,6 +2,11 @@ <archetype-descriptor xsi:schemaLocation="http://maven.apache.org/plugins/maven-archetype-... http://maven.apache.org/xsd/archetype-descriptor-1.0.0.xsd" name="gae-sample" xmlns="http://maven.apache.org/plugins/maven-archetype-plugin/archet... xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <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/rf-gae-sample/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-04 19:16:38 UTC (rev 19435) @@ -26,10 +26,10 @@ <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> @@ -127,7 +127,6 @@ </execution> </executions> </plugin> - </plugins> </build> @@ -180,8 +179,8 @@ <configuration> <webappDirectory>${project.build.directory}/${project.build.finalName}-jee6</webappDirectory> <classifier>jee6</classifier> - <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</packagingExcludes> - <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*,WEB-INF/lib/slf4j-*</warSourceExcludes> + <packagingExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</packagingExcludes> + <warSourceExcludes>WEB-INF/lib/jsf-api*,WEB-INF/lib/jsf-impl*</warSourceExcludes> </configuration> </execution> </executions> @@ -239,33 +238,12 @@ <groupId>javax.servlet</groupId> <artifactId>jstl</artifactId> </dependency> + <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-api</artifactId> - </dependency> - - <dependency> <groupId>net.sf.ehcache</groupId> <artifactId>ehcache</artifactId> </dependency> - - <!-- - simple logger binding: only messages of level INFO and - higher are printed - --> - <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-log4j12</artifactId> - <version>1.5.8</version> - </dependency> - - <!-- Log4J dependency used in examples --> - <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> - <version>1.2.14</version> - </dependency> - + <!-- Tests --> <dependency> <groupId>org.testng</groupId> Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-10-04 19:16:38 UTC (rev 19435) @@ -9,7 +9,7 @@ 2) Then just execute appcfg from GAE SDK(link) to publish to your account: appcfg update <PATH: "generated-application-target-folder/output application folder"> -NOTE:Do not forget to register your own application name and make sure that the demo uses the same name accordingly. +NOTE:Do not forget to register your own application name and make sure that the demo uses the same name accordingly. By default the applications name is "rf-${artifactId}" 3) now visit your application using http://<application-name>.appspot.com @@ -31,8 +31,8 @@ ============================================================================================================ LOCAL DEPLOYMENT -you still could deploy your application as usually using -1) mvn clean install -Prelease -2) put to tomcat6 or jboss (war's for both application servers will be created) -3) run choosen server -4) enjoy going to http:\\localhost:8080\<app-name> \ No newline at end of file +you still can deploy your application to a local tomcat instance. +1) mvn clean install +2) put target war into tomcat6 webapp directory +3) Launch tomcat +4) Go to http:\\localhost:8080\<app-name> \ No newline at end of file Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java 2010-10-04 17:27:49 UTC (rev 19434) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java 2010-10-04 19:16:38 UTC (rev 19435) @@ -3,20 +3,15 @@ #set( $symbol_escape = '\' ) package ${package}; -import org.slf4j.LoggerFactory; -import org.slf4j.Logger; - import java.io.Serializable; public class RichBean implements Serializable { private static final long serialVersionUID = -2403138958014741653L; - private Logger logger; private String name; public RichBean() { - logger = LoggerFactory.getLogger(RichBean.class); - logger.info("post construct: initialize"); + System.out.println("post construct: initialize"); name = "John"; }