[richfaces-svn-commits] JBoss Rich Faces SVN: r19703 - in branches/RF-7817/archetypes: rf-gae-sample and 25 other directories.

Author: nbelaevski Date: 2010-10-27 12:17:45 -0400 (Wed, 27 Oct 2010) New Revision: 19703 Added: branches/RF-7817/archetypes/rf-gae-sample/ branches/RF-7817/archetypes/rf-gae-sample/assembler.xml branches/RF-7817/archetypes/rf-gae-sample/pom.xml branches/RF-7817/archetypes/rf-gae-sample/readme.txt branches/RF-7817/archetypes/rf-gae-sample/src/ branches/RF-7817/archetypes/rf-gae-sample/src/main/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/RichBean.java Removed: branches/RF-7817/archetypes/rf-gae-sample/assembler.xml branches/RF-7817/archetypes/rf-gae-sample/pom.xml branches/RF-7817/archetypes/rf-gae-sample/readme.txt branches/RF-7817/archetypes/rf-gae-sample/src/ branches/RF-7817/archetypes/rf-gae-sample/src/main/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/org/ Modified: branches/RF-7817/archetypes/pom.xml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/pom.xml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml Log: Merged revisions 19156-19157,19159-19160,19176,19186-19187,19190,19194,19196,19199,19203-19204,19231-19234,19248-19249,19255-19256,19258-19262,19276,19279-19281,19283,19285,19291-19299,19307,19312,19315,19318-19319,19325,19341-19342,19345-19351,19353-19355,19358-19359,19364,19367-19369,19371,19374-19377,19379-19385,19387,19393-19394,19400,19402-19404,19418-19422,19426,19430-19431,19434-19441,19443-19444,19446,19468,19470,19477,19491,19498-19499,19501,19504,19506-19507,19517-19519,19525,19542-19543,19548,19550,19555,19557,19560-19561,19565-19566,19571-19573,19582-19585,19592-19593,19599,19601-19602,19613,19646,19657-19659,19665,19671-19674 via svnmerge from https://svn.jboss.org/repos/richfaces/trunk Modified: branches/RF-7817/archetypes/pom.xml =================================================================== --- branches/RF-7817/archetypes/pom.xml 2010-10-27 16:03:48 UTC (rev 19702) +++ branches/RF-7817/archetypes/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -39,6 +39,7 @@ <module>richfaces-component</module> <module>richfaces-component-short</module> <module>richfaces-components-aggregator</module> + <module>rf-gae-sample</module> </modules> <properties> Copied: branches/RF-7817/archetypes/rf-gae-sample (from rev 19674, trunk/archetypes/rf-gae-sample) Property changes on: branches/RF-7817/archetypes/rf-gae-sample ___________________________________________________________________ Name: svn:ignore + target Deleted: branches/RF-7817/archetypes/rf-gae-sample/assembler.xml =================================================================== --- trunk/archetypes/rf-gae-sample/assembler.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/assembler.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,22 +0,0 @@ -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> - <formats> - <format>dir</format> - </formats> - - <files> - <file> - <source>pom.xml</source> - </file> - <file> - <source>readme.txt</source> - </file> - </files> - - <fileSets> - <fileSet> - <directory>src</directory> - </fileSet> - </fileSets> -</assembly> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/assembler.xml (from rev 19674, trunk/archetypes/rf-gae-sample/assembler.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/assembler.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/assembler.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,22 @@ +<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembl... + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-p... http://maven.apache.org/xsd/assembly-1.1.0.xsd"> + <formats> + <format>dir</format> + </formats> + + <files> + <file> + <source>pom.xml</source> + </file> + <file> + <source>readme.txt</source> + </file> + </files> + + <fileSets> + <fileSet> + <directory>src</directory> + </fileSet> + </fileSets> +</assembly> \ No newline at end of file Deleted: branches/RF-7817/archetypes/rf-gae-sample/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/pom.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,100 +0,0 @@ -<?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"> - - <parent> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-parent</artifactId> - <version>10</version> - <relativePath>../../build/parent/pom.xml</relativePath> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.richfaces.archetypes</groupId> - <artifactId>richfaces-archetype-gae</artifactId> - <version>4.0.0-SNAPSHOT</version> - <packaging>maven-archetype</packaging> - <name>RichFaces Archetypes: GAE Application</name> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - </properties> - - <build> - <extensions> - <extension> - <groupId>org.apache.maven.archetype</groupId> - <artifactId>archetype-packaging</artifactId> - <version>2.0-alpha-4</version> - </extension> - </extensions> - <plugins> - <plugin> - <artifactId>maven-archetype-plugin</artifactId> - <version>2.0-alpha-4</version> - <extensions>true</extensions> - </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> - <filtering>false</filtering> - </resource> - <resource> - <directory>src/main/resources/META-INF/maven</directory> - <filtering>true</filtering> - <targetPath>META-INF/maven</targetPath> - </resource> - </resources> - </build> - - <profiles> - <profile> - <id>release</id> - <build> - <plugins> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>group-sources</id> - <goals> - <goal>single</goal> - </goals> - <phase>package</phase> - <configuration> - <finalName>sources</finalName> - <descriptor>assembler.xml</descriptor> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <goals> - <goal>jar</goal> - </goals> - <phase>package</phase> - <configuration> - <classesDirectory>${basedir}/target/sources/sources</classesDirectory> - <classifier>sources</classifier> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> - - <scm> - <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... - <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... - <url>http://fisheye.jboss.org/browse/richfaces/</url> - </scm> -</project> - Copied: branches/RF-7817/archetypes/rf-gae-sample/pom.xml (from rev 19674, trunk/archetypes/rf-gae-sample/pom.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/pom.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,100 @@ +<?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"> + + <parent> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-parent</artifactId> + <version>10</version> + <relativePath>../../build/parent/pom.xml</relativePath> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.richfaces.archetypes</groupId> + <artifactId>richfaces-archetype-gae</artifactId> + <version>4.0.0-SNAPSHOT</version> + <packaging>maven-archetype</packaging> + <name>RichFaces Archetypes: GAE Application</name> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + </properties> + + <build> + <extensions> + <extension> + <groupId>org.apache.maven.archetype</groupId> + <artifactId>archetype-packaging</artifactId> + <version>2.0-alpha-4</version> + </extension> + </extensions> + <plugins> + <plugin> + <artifactId>maven-archetype-plugin</artifactId> + <version>2.0-alpha-4</version> + <extensions>true</extensions> + </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> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/resources/META-INF/maven</directory> + <filtering>true</filtering> + <targetPath>META-INF/maven</targetPath> + </resource> + </resources> + </build> + + <profiles> + <profile> + <id>release</id> + <build> + <plugins> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <executions> + <execution> + <id>group-sources</id> + <goals> + <goal>single</goal> + </goals> + <phase>package</phase> + <configuration> + <finalName>sources</finalName> + <descriptor>assembler.xml</descriptor> + </configuration> + </execution> + </executions> + </plugin> + <plugin> + <artifactId>maven-jar-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>jar</goal> + </goals> + <phase>package</phase> + <configuration> + <classesDirectory>${basedir}/target/sources/sources</classesDirectory> + <classifier>sources</classifier> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + </profile> + </profiles> + + <scm> + <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... + <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... + <url>http://fisheye.jboss.org/browse/richfaces/</url> + </scm> +</project> + Deleted: branches/RF-7817/archetypes/rf-gae-sample/readme.txt =================================================================== --- trunk/archetypes/rf-gae-sample/readme.txt 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/readme.txt 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,46 +0,0 @@ -RichFaces 4 Archetype - -GENERATING THE PROJECT - -This archetype creates a simple RichFaces 4 application with all the settings and custom artifacts you need to perform deploy to GAE cloud. - -1) To generate a project from the archetype, run - - mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<richfaces-version> - -DgroupId=<yourGroupId> -DartifactId=<yourArtifactId> -Dversion=1.0-SNAPSHOT - -2) Navigate into the new project directory and build by running: - mvn clean install - -*BEFORE NEXT STEP: - -- You should setup your GAE account at http://appspot.com - -- Register your new application there. By default the applications name is "rf-${artifactId}" - -- Download and install the GAE SDK for deployment and local server tools - -3) Execute appcfg from GAE SDK to publish to your account: - appcfg update <PATH: "generated-application-target-folder/output application folder"> - -4) Once uploaded, visit your application using http://<application-name>.appspot.com -4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-i... - -NOTE: -During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to -solve the compatibility problem with GAE and java2D API. - -NOTE: about additional artifacts in webapp folder: -1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities -issues exist in GAE for JSF applications. - -2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml -is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with -com.sun.faces.enableThreading context parameter as GAE not allows threads. - -============================================================================================================ - -LOCAL DEPLOYMENTS -To test your application on your local machine you can use GAE SDK development server. -1) Build archetype as above -2) Navigate GAE SDK /bin -3) Execute" - ./dev_appserver.sh <PATH: "generated-application-target-folder/output application folder"> -4) Once loaded, access your application at http:\\localhost:8080\ \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/readme.txt (from rev 19674, trunk/archetypes/rf-gae-sample/readme.txt) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/readme.txt (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/readme.txt 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,46 @@ +RichFaces 4 Archetype + +GENERATING THE PROJECT + +This archetype creates a simple RichFaces 4 application with all the settings and custom artifacts you need to perform deploy to GAE cloud. + +1) To generate a project from the archetype, run + + mvn archetype:generate -DarchetypeGroupId=org.richfaces.archetypes -DarchetypeArtifactId=richfaces-archetype-gae -DarchetypeVersion=<richfaces-version> + -DgroupId=<yourGroupId> -DartifactId=<yourArtifactId> -Dversion=1.0-SNAPSHOT + +2) Navigate into the new project directory and build by running: + mvn clean install + +*BEFORE NEXT STEP: + -- You should setup your GAE account at http://appspot.com + -- Register your new application there. By default the applications name is "rf-${artifactId}" + -- Download and install the GAE SDK for deployment and local server tools + +3) Execute appcfg from GAE SDK to publish to your account: + appcfg update <PATH: "generated-application-target-folder/output application folder"> + +4) Once uploaded, visit your application using http://<application-name>.appspot.com +4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-i... + +NOTE: +During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to +solve the compatibility problem with GAE and java2D API. + +NOTE: about additional artifacts in webapp folder: +1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities +issues exist in GAE for JSF applications. + +2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml +is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with +com.sun.faces.enableThreading context parameter as GAE not allows threads. + +============================================================================================================ + +LOCAL DEPLOYMENTS +To test your application on your local machine you can use GAE SDK development server. +1) Build archetype as above +2) Navigate GAE SDK /bin +3) Execute" + ./dev_appserver.sh <PATH: "generated-application-target-folder/output application folder"> +4) Once loaded, access your application at http:\\localhost:8080\ \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src (from rev 19674, trunk/archetypes/rf-gae-sample/src) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main (from rev 19674, trunk/archetypes/rf-gae-sample/src/main) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/META-INF) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven) Deleted: branches/RF-7817/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-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<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> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/webapp</directory> - <includes> - <include>**/*.jsp</include> - <include>**/*.xhtml</include> - <include>**/*.xml</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/java-gae-jsf-ri</directory> - <includes> - <include>**/*.java</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/resources</directory> - <includes> - <include>**/*.properties</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>src/main/webapp-gae</directory> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> - <fileSet encoding="UTF-8"> - <directory>src/main/webapp</directory> - <includes> - <include>**/*.jsfdia</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory>.settings</directory> - <includes> - <include>**/*.xml</include> - </includes> - </fileSet> - <fileSet encoding="UTF-8"> - <directory>.settings</directory> - <includes> - <include>**/*.prefs</include> - <include>**/*.component</include> - </includes> - </fileSet> - <fileSet filtered="true" encoding="UTF-8"> - <directory></directory> - <includes> - <include>.classpath</include> - <include>.project</include> - <include>readme.txt</include> - </includes> - </fileSet> - </fileSets> -</archetype-descriptor> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,71 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.jsp</include> + <include>**/*.xhtml</include> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/java-gae-jsf-ri</directory> + <includes> + <include>**/*.java</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/resources</directory> + <includes> + <include>**/*.properties</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>src/main/webapp-gae</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>src/main/webapp</directory> + <includes> + <include>**/*.jsfdia</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory>.settings</directory> + <includes> + <include>**/*.xml</include> + </includes> + </fileSet> + <fileSet encoding="UTF-8"> + <directory>.settings</directory> + <includes> + <include>**/*.prefs</include> + <include>**/*.component</include> + </includes> + </fileSet> + <fileSet filtered="true" encoding="UTF-8"> + <directory></directory> + <includes> + <include>.classpath</include> + <include>.project</include> + <include>readme.txt</include> + </includes> + </fileSet> + </fileSets> +</archetype-descriptor> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources) Deleted: branches/RF-7817/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-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,224 +0,0 @@ -<?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"> - - <modelVersion>4.0.0</modelVersion> - - <groupId>${groupId}</groupId> - <artifactId>${artifactId}</artifactId> - <name>${artifactId}</name> - <version>${version}</version> - <packaging>war</packaging> - - <url>http://jboss.org/richfaces</url> - - <repositories> - <repository> - <id>jboss-public-repository-group</id> - <name>Jboss Repository for Maven</name> - <url>https://repository.jboss.org/nexus/content/groups/public/</url> - </repository> - <repository> - <id>java-net</id> - <name>Java.net Maven Repository</name> - <url>http://download.java.net/maven/2</url> - </repository> - </repositories> - - <properties> - <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <!-- Setting this property using archetype-metadata.xml requiredPorperty - so that generated project uses correct version of richfaces. - --> - <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version> - </properties> - - <build> - <finalName>${artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-source</goal> - </goals> - <configuration> - <sources> - <source>src/main/java-gae-jsf-ri</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <source>1.5</source> - <target>1.5</target> - </configuration> - </plugin> - <plugin> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <webResources> - <resource> - <directory>src/main/webapp-gae</directory> - </resource> - <resource> - <directory>src/main/webapp</directory> - </resource> - <resource> - <directory>${project.build.directory}/generated-resources</directory> - <targetPath>static-resources</targetPath> - </resource> - <resource> - <directory>${basedir}/src/main/java</directory> - <targetPath>/WEB-INF/src</targetPath> - </resource> - </webResources> - </configuration> - </plugin> - <plugin> - <groupId>org.richfaces.cdk</groupId> - <artifactId>maven-resources-plugin</artifactId> - <version>${org.richfaces.bom.version}</version> - <configuration></configuration> - <executions> - <execution> - <id>process</id> - <goals> - <goal>process</goal> - </goals> - <configuration> - <outputDir>generated-resources</outputDir> - <skins> - <skin>blueSky</skin> - <skin>classic</skin> - <skin>deepMarine</skin> - <skin>emeraldTown</skin> - <skin>japanCherry</skin> - <skin>ruby</skin> - <skin>wine</skin> - </skins> - <includedContentTypes> - <include>application/javascript</include> - <include>text/css</include> - <include>image/.+</include> - </includedContentTypes> - <fileNameMappings> - <property> - <name>^\Qorg.richfaces.renderkit.html\E</name> - <value>org.richfaces/images</value> - </property> - <property> - <name>^\Qorg.richfaces.renderkit.html.images\E</name> - <value>org.richfaces/images</value> - </property> - <property> - <name>^css/</name> - <value>org.richfaces/css/</value> - </property> - </fileNameMappings> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - - <dependencyManagement> - <dependencies> - <dependency> - <groupId>org.richfaces</groupId> - <artifactId>richfaces-bom</artifactId> - <version>${org.richfaces.bom.version}</version> - <scope>import</scope> - <type>pom</type> - </dependency> - </dependencies> - </dependencyManagement> - - <dependencies> - <dependency> - <groupId>org.richfaces.ui</groupId> - <artifactId>richfaces-components-ui</artifactId> - </dependency> - - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> - </dependency> - <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet.jsp</groupId> - <artifactId>jsp-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>jstl</artifactId> - </dependency> - - <dependency> - <groupId>net.sf.ehcache</groupId> - <artifactId>ehcache</artifactId> - </dependency> - - <!-- Tests --> - <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <version>5.10</version> - <classifier>jdk15</classifier> - <scope>test</scope> - </dependency> - - <!-- GAE PROFILE DEPENDENCIES --> - <dependency> - <groupId>org.glassfish.web</groupId> - <artifactId>el-impl</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>javax.el</groupId> - <artifactId>el-api</artifactId> - <version>2.2</version> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jta_1.1_spec</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.geronimo.specs</groupId> - <artifactId>geronimo-jpa_3.0_spec</artifactId> - <version>1.1.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>xalan</groupId> - <artifactId>xalan</artifactId> - <version>2.7.1</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.9.1</version> - <scope>runtime</scope> - </dependency> - </dependencies> -</project> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,224 @@ +<?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"> + + <modelVersion>4.0.0</modelVersion> + + <groupId>${groupId}</groupId> + <artifactId>${artifactId}</artifactId> + <name>${artifactId}</name> + <version>${version}</version> + <packaging>war</packaging> + + <url>http://jboss.org/richfaces</url> + + <repositories> + <repository> + <id>jboss-public-repository-group</id> + <name>Jboss Repository for Maven</name> + <url>https://repository.jboss.org/nexus/content/groups/public/</url> + </repository> + <repository> + <id>java-net</id> + <name>Java.net Maven Repository</name> + <url>http://download.java.net/maven/2</url> + </repository> + </repositories> + + <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <!-- Setting this property using archetype-metadata.xml requiredPorperty + so that generated project uses correct version of richfaces. + --> + <org.richfaces.bom.version>${richfaces-version}</org.richfaces.bom.version> + </properties> + + <build> + <finalName>${artifactId}</finalName> + <plugins> + <plugin> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <executions> + <execution> + <id>add-source</id> + <phase>generate-sources</phase> + <goals> + <goal>add-source</goal> + </goals> + <configuration> + <sources> + <source>src/main/java-gae-jsf-ri</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> + + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + <plugin> + <artifactId>maven-war-plugin</artifactId> + <configuration> + <webResources> + <resource> + <directory>src/main/webapp-gae</directory> + </resource> + <resource> + <directory>src/main/webapp</directory> + </resource> + <resource> + <directory>${project.build.directory}/generated-resources</directory> + <targetPath>static-resources</targetPath> + </resource> + <resource> + <directory>${basedir}/src/main/java</directory> + <targetPath>/WEB-INF/src</targetPath> + </resource> + </webResources> + </configuration> + </plugin> + <plugin> + <groupId>org.richfaces.cdk</groupId> + <artifactId>maven-resources-plugin</artifactId> + <version>${org.richfaces.bom.version}</version> + <configuration></configuration> + <executions> + <execution> + <id>process</id> + <goals> + <goal>process</goal> + </goals> + <configuration> + <outputDir>generated-resources</outputDir> + <skins> + <skin>blueSky</skin> + <skin>classic</skin> + <skin>deepMarine</skin> + <skin>emeraldTown</skin> + <skin>japanCherry</skin> + <skin>ruby</skin> + <skin>wine</skin> + </skins> + <includedContentTypes> + <include>application/javascript</include> + <include>text/css</include> + <include>image/.+</include> + </includedContentTypes> + <fileNameMappings> + <property> + <name>^\Qorg.richfaces.renderkit.html\E</name> + <value>org.richfaces/images</value> + </property> + <property> + <name>^\Qorg.richfaces.renderkit.html.images\E</name> + <value>org.richfaces/images</value> + </property> + <property> + <name>^css/</name> + <value>org.richfaces/css/</value> + </property> + </fileNameMappings> + </configuration> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <dependencyManagement> + <dependencies> + <dependency> + <groupId>org.richfaces</groupId> + <artifactId>richfaces-bom</artifactId> + <version>${org.richfaces.bom.version}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + </dependencies> + </dependencyManagement> + + <dependencies> + <dependency> + <groupId>org.richfaces.ui</groupId> + <artifactId>richfaces-components-ui</artifactId> + </dependency> + + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-api</artifactId> + </dependency> + <dependency> + <groupId>com.sun.faces</groupId> + <artifactId>jsf-impl</artifactId> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet.jsp</groupId> + <artifactId>jsp-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>jstl</artifactId> + </dependency> + + <dependency> + <groupId>net.sf.ehcache</groupId> + <artifactId>ehcache</artifactId> + </dependency> + + <!-- Tests --> + <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <version>5.10</version> + <classifier>jdk15</classifier> + <scope>test</scope> + </dependency> + + <!-- GAE PROFILE DEPENDENCIES --> + <dependency> + <groupId>org.glassfish.web</groupId> + <artifactId>el-impl</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>javax.el</groupId> + <artifactId>el-api</artifactId> + <version>2.2</version> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jta_1.1_spec</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-jpa_3.0_spec</artifactId> + <version>1.1.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>xalan</groupId> + <artifactId>xalan</artifactId> + <version>2.7.1</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.9.1</version> + <scope>runtime</scope> + </dependency> + </dependencies> +</project> Deleted: branches/RF-7817/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-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,37 +0,0 @@ -RichFaces 4 Archetype - -1) Build by running: - mvn clean install - -*BEFORE NEXT STEP: - -- You should setup your GAE account at http://appspot.com - -- Register your new application there. By default the applications name is "rf-${artifactId}" - -- Download and install the GAE SDK for deployment and local server tools - -3) Execute appcfg from GAE SDK to publish to your account: - appcfg update <PATH: "generated-application-target-folder/output application folder"> - -4) Once uploaded, visit your application using http://<application-name>.appspot.com -4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-i... - -NOTE: -During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to -solve the compatibility problem with GAE and java2D API. - -NOTE: about additional artifacts in webapp folder: -1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities -issues exist in GAE for JSF applications. - -2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml -is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with -com.sun.faces.enableThreading context parameter as GAE not allows threads. - -============================================================================================================ - -LOCAL DEPLOYMENTS -To test your application on your local machine you can use GAE SDK development server. -1) Build archetype as above -2) Navigate GAE SDK /bin -3) Execute" - ./dev_appserver.sh <PATH: "generated-application-target-folder/output application folder"> -4) Once loaded, access your application at http:\\localhost:8080\ \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/readme.txt 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,37 @@ +RichFaces 4 Archetype + +1) Build by running: + mvn clean install + +*BEFORE NEXT STEP: + -- You should setup your GAE account at http://appspot.com + -- Register your new application there. By default the applications name is "rf-${artifactId}" + -- Download and install the GAE SDK for deployment and local server tools + +3) Execute appcfg from GAE SDK to publish to your account: + appcfg update <PATH: "generated-application-target-folder/output application folder"> + +4) Once uploaded, visit your application using http://<application-name>.appspot.com +4.1) check all the information about deployed application at https://appengine.google.com/dashboard?&app_id=<your-application-i... + +NOTE: +During build the "org.richfaces.cdk:maven-resource-plugin" executed and generated static resources(web-app\static-resources\) for all skins in order to +solve the compatibility problem with GAE and java2D API. + +NOTE: about additional artifacts in webapp folder: +1) java-gae-jsf-ri - contains modified WebConfiguration.java class which will be put to Web-inf\classes when building with GAE profile. It solves compatibilities +issues exist in GAE for JSF applications. + +2) Webapp-gae folder contains GAE descriptor(appengine-web.xml) and modified application web.xml. They will be placed in the WEB-INF folder. The web.xml +is different in order to use static resources generated by plugin instead of dynamic resources. And also restricts threading with +com.sun.faces.enableThreading context parameter as GAE not allows threads. + +============================================================================================================ + +LOCAL DEPLOYMENTS +To test your application on your local machine you can use GAE SDK development server. +1) Build archetype as above +2) Navigate GAE SDK /bin +3) Execute" + ./dev_appserver.sh <PATH: "generated-application-target-folder/output application folder"> +4) Once loaded, access your application at http:\\localhost:8080\ \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java) Deleted: branches/RF-7817/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-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,25 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -package ${package}; - -import java.io.Serializable; - -public class RichBean implements Serializable { - - private static final long serialVersionUID = -2403138958014741653L; - private String name; - - public RichBean() { - System.out.println("post construct: initialize"); - name = "John"; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } -} Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java/RichBean.java 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,25 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}; + +import java.io.Serializable; + +public class RichBean implements Serializable { + + private static final long serialVersionUID = -2403138958014741653L; + private String name; + + public RichBean() { + System.out.println("post construct: initialize"); + name = "John"; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config) Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,1112 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -/* - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - * - * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - * - * The contents of this file are subject to the terms of either the GNU - * General Public License Version 2 only ("GPL") or the Common Development - * and Distribution License("CDDL") (collectively, the "License"). You - * may not use this file except in compliance with the License. You can obtain - * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - * language governing permissions and limitations under the License. - * - * When distributing the software, include this License Header Notice in each - * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - * Sun designates this particular file as subject to the "Classpath" exception - * as provided by Sun in the GPL Version 2 section of the License file that - * accompanied this code. If applicable, add the following below the License - * Header, with the fields enclosed by brackets [] replaced by your own - * identifying information: "Portions Copyrighted [year] - * [name of copyright owner]" - * - * Contributor(s): - * - * If you wish your version of this file to be governed by only the CDDL or - * only the GPL Version 2, indicate your decision by adding "[Contributor] - * elects to include this software in this distribution under the [CDDL or GPL - * Version 2] license." If you don't indicate a single choice of license, a - * recipient has the option to distribute your version of this file under - * either the CDDL, the GPL Version 2 or to extend the choice of license to - * its licensees as provided above. However, if you add GPL Version 2 code - * and therefore, elected the GPL Version 2 license, then the option applies - * only if the new code is made subject to such option by the copyright - * holder. - */ - -package com.sun.faces.config; - -import java.util.ArrayList; -import java.util.EnumMap; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.logging.Level; -import java.util.logging.Logger; -import java.util.regex.Pattern; - -import javax.faces.application.ResourceHandler; -import javax.faces.application.StateManager; -import javax.faces.application.ViewHandler; -import javax.faces.component.UIInput; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.validator.BeanValidator; -import javax.faces.view.facelets.ResourceResolver; -import javax.servlet.ServletContext; - -import com.sun.faces.util.FacesLogger; -import com.sun.faces.util.Util; - -/** Class Documentation */ -public class WebConfiguration -{ - - // Log instance for this class - private static final Logger LOGGER = FacesLogger.CONFIG.getLogger(); - - // A Simple regular expression of allowable boolean values - private static final Pattern ALLOWABLE_BOOLEANS = Pattern - .compile("true|false"); - - // Key under which we store our WebConfiguration instance. - private static final String WEB_CONFIG_KEY = "com.sun.faces.config.WebConfiguration"; - - // Logging level. Defaults to FINE - private Level loggingLevel = Level.FINE; - - private Map<BooleanWebContextInitParameter, Boolean> booleanContextParameters = new EnumMap<BooleanWebContextInitParameter, Boolean>( - BooleanWebContextInitParameter.class); - - private Map<WebContextInitParameter, String> contextParameters = new EnumMap<WebContextInitParameter, String>( - WebContextInitParameter.class); - - private Map<WebEnvironmentEntry, String> envEntries = new EnumMap<WebEnvironmentEntry, String>( - WebEnvironmentEntry.class); - - private Map<WebContextInitParameter, String[]> cachedListParams; - - private List<String> setParams = new ArrayList<String>(); - - private ServletContext servletContext; - - // ------------------------------------------------------------ Constructors - - private WebConfiguration(ServletContext servletContext) - { - - this.servletContext = servletContext; - - String contextName = getServletContextName(); - - initSetList(servletContext); - processBooleanParameters(servletContext, contextName); - processInitParameters(servletContext, contextName); - if (canProcessJndiEntries()) - { - processJndiEntries(contextName); - } - - // build the cache of list type params - cachedListParams = new HashMap<WebContextInitParameter, String[]>(3); - getOptionValue(WebContextInitParameter.ResourceExcludes, " "); - getOptionValue(WebContextInitParameter.DefaultSuffix, " "); - getOptionValue(WebContextInitParameter.FaceletsViewMappings, ";"); - - } - - // ---------------------------------------------------------- Public Methods - - /** - * Return the WebConfiguration instance for this application passing the - * result of FacesContext.getCurrentInstance().getExternalContext() to - * {@link ${symbol_pound}getInstance(javax.faces.context.ExternalContext)}. - * - * @return the WebConfiguration for this application or <code>null</code> if - * no FacesContext is available. - */ - public static WebConfiguration getInstance() - { - - FacesContext facesContext = FacesContext.getCurrentInstance(); - return getInstance(facesContext.getExternalContext()); - - } - - /** - * Return the WebConfiguration instance for this application. - * - * @param extContext - * the ExternalContext for this request - * @return the WebConfiguration for this application - */ - public static WebConfiguration getInstance(ExternalContext extContext) - { - - WebConfiguration config = (WebConfiguration) extContext - .getApplicationMap().get(WEB_CONFIG_KEY); - if (config == null) - { - return getInstance((ServletContext) extContext.getContext()); - } - else - { - return config; - } - - } - - /** - * Return the WebConfiguration instance for this application. - * - * @param servletContext - * the ServletContext - * @return the WebConfiguration for this application or <code>null</code> if - * no WebConfiguration could be located - */ - public static WebConfiguration getInstance(ServletContext servletContext) - { - - WebConfiguration webConfig = (WebConfiguration) servletContext - .getAttribute(WEB_CONFIG_KEY); - - if (webConfig == null) - { - webConfig = new WebConfiguration(servletContext); - servletContext.setAttribute(WEB_CONFIG_KEY, webConfig); - } - return webConfig; - - } - - /** - * @return The <code>ServletContext</code> originally used to construct this - * WebConfiguration instance - */ - public ServletContext getServletContext() - { - - return servletContext; - - } - - /** - * Obtain the value of the specified boolean parameter - * - * @param param - * the parameter of interest - * @return the value of the specified boolean parameter - */ - public boolean isOptionEnabled(BooleanWebContextInitParameter param) - { - - if (booleanContextParameters.get(param) != null) - { - return booleanContextParameters.get(param); - } - else - { - return param.getDefaultValue(); - } - - } - - /** - * Obtain the value of the specified parameter - * - * @param param - * the parameter of interest - * @return the value of the specified parameter - */ - public String getOptionValue(WebContextInitParameter param) - { - String result = contextParameters.get(param); - - if (null == result) - { - WebContextInitParameter alternate = param.getAlternate(); - if (null != alternate) - { - result = contextParameters.get(alternate); - } - } - - return result; - - } - - public String[] getOptionValue(WebContextInitParameter param, String sep) - { - String[] result; - - assert (null != cachedListParams); - if (null == (result = cachedListParams.get(param))) - { - String value = getOptionValue(param); - if (null == value) - { - result = new String[0]; - } - else - { - result = Util.split(value, sep); - } - cachedListParams.put(param, result); - } - - return result; - } - - /** - * Obtain the value of the specified env-entry - * - * @param entry - * the env-entry of interest - * @return the value of the specified env-entry - */ - public String getEnvironmentEntry(WebEnvironmentEntry entry) - { - - return envEntries.get(entry); - - } - - /** - * @param param - * the init parameter of interest - * @return <code>true</code> if the parameter was explicitly set, otherwise, - * <code>false</code> - */ - public boolean isSet(WebContextInitParameter param) - { - - return isSet(param.getQualifiedName()); - - } - - /** - * @param param - * the init parameter of interest - * @return <code>true</code> if the parameter was explicitly set, otherwise, - * <code>false</code> - */ - public boolean isSet(BooleanWebContextInitParameter param) - { - - return isSet(param.getQualifiedName()); - - } - - /** - * @return the name of this application - */ - public String getServletContextName() - { - - if (servletContext.getMajorVersion() == 2 - && servletContext.getMinorVersion() <= 4) - { - return servletContext.getServletContextName(); - } - else - { - return servletContext.getContextPath(); - } - - } - - public void overrideContextInitParameter( - BooleanWebContextInitParameter param, boolean value) - { - - if (param == null) { return; } - boolean oldVal = booleanContextParameters.put(param, value); - if (LOGGER.isLoggable(Level.FINE) && oldVal != value) - { - LOGGER - .log( - Level.FINE, - "Overriding init parameter {0}. Changing from {1} to {2}.", - new Object[] - { - param.getQualifiedName(), oldVal, value - }); - } - - } - - public void overrideContextInitParameter(WebContextInitParameter param, - String value) - { - - if (param == null || value == null || value.length() == 0) { return; } - value = value.trim(); - String oldVal = contextParameters.put(param, value); - cachedListParams.remove(param); - if (oldVal != null) - { - if (LOGGER.isLoggable(Level.FINE) && !(oldVal.equals(value))) - { - LOGGER - .log( - Level.FINE, - "Overriding init parameter {0}. Changing from {1} to {2}.", - new Object[] - { - param.getQualifiedName(), oldVal, value - }); - } - } - - } - - // ------------------------------------------------- Package Private Methods - - static void clear(ServletContext servletContext) - { - - servletContext.removeAttribute(WEB_CONFIG_KEY); - - } - - // --------------------------------------------------------- Private Methods - - /** - * <p> - * Is the configured value valid against the default boolean pattern. - * </p> - * - * @param param - * the boolean parameter - * @param value - * the configured value - * @return <code>true</code> if the value is valid, otherwise - * <code>false</code> - */ - private boolean isValueValid(BooleanWebContextInitParameter param, - String value) - { - - if (!ALLOWABLE_BOOLEANS.matcher(value).matches()) - { - if (LOGGER.isLoggable(Level.WARNING)) - { - LOGGER.log(Level.WARNING, - "jsf.config.webconfig.boolconfig.invalidvalue", - new Object[] - { - value, param.getQualifiedName(), "true|false" - }); - } - return false; - } - - return true; - - } - - /** - * <p> - * Process all boolean context initialization parameters. - * </p> - * - * @param servletContext - * the ServletContext of interest - * @param contextName - * the context name - */ - private void processBooleanParameters(ServletContext servletContext, - String contextName) - { - - // process boolean contxt parameters - for (BooleanWebContextInitParameter param : BooleanWebContextInitParameter - .values()) - { - String strValue = servletContext.getInitParameter(param - .getQualifiedName()); - boolean value; - - if (strValue != null && strValue.length() > 0 - && param.isDeprecated()) - { - BooleanWebContextInitParameter alternate = param.getAlternate(); - if (LOGGER.isLoggable(Level.WARNING)) - { - if (alternate != null) - { - LOGGER.log(Level.WARNING, - "jsf.config.webconfig.param.deprecated", - new Object[] - { - contextName, param.getQualifiedName(), - alternate.getQualifiedName() - }); - } - else - { - LOGGER - .log( - Level.WARNING, - "jsf.config.webconfig.param.deprecated.no_replacement", - new Object[] - { - contextName, - param.getQualifiedName() - }); - } - } - - if (alternate != null) - { - if (isValueValid(param, strValue)) - { - value = Boolean.valueOf(strValue); - } - else - { - value = param.getDefaultValue(); - } - - if (LOGGER.isLoggable(Level.INFO) && alternate != null) - { - LOGGER - .log( - Level.INFO, - ((value) ? "jsf.config.webconfig.configinfo.reset.enabled" - : "jsf.config.webconfig.configinfo.reset.disabled"), - new Object[] - { - contextName, - alternate.getQualifiedName() - }); - } - - booleanContextParameters.put(alternate, value); - } - continue; - } - - if (!param.isDeprecated()) - { - if (strValue == null) - { - value = param.getDefaultValue(); - } - else - { - if (isValueValid(param, strValue)) - { - value = Boolean.valueOf(strValue); - } - else - { - value = param.getDefaultValue(); - } - } - - // first param processed should be - // com.sun.faces.displayConfiguration - if (BooleanWebContextInitParameter.DisplayConfiguration - .equals(param) - && value) - { - loggingLevel = Level.INFO; - } - - if (LOGGER.isLoggable(loggingLevel)) - { - LOGGER - .log( - loggingLevel, - ((value) ? "jsf.config.webconfig.boolconfiginfo.enabled" - : "jsf.config.webconfig.boolconfiginfo.disabled"), - new Object[] - { - contextName, - param.getQualifiedName() - }); - } - - booleanContextParameters.put(param, value); - } - - } - - } - - /** - * Adds all com.sun.faces init parameter names to a list. This allows - * callers to determine if a parameter was explicitly set. - * - * @param servletContext - * the ServletContext of interest - */ - private void initSetList(ServletContext servletContext) - { - - for (Enumeration e = servletContext.getInitParameterNames(); e - .hasMoreElements();) - { - String name = e.nextElement().toString(); - if (name.startsWith("com.sun.faces")) - { - setParams.add(name); - } - } - - } - - /** - * @param name - * the param name - * @return <code>true</code> if the name was explicitly specified - */ - private boolean isSet(String name) - { - - return setParams.contains(name); - - } - - /** - * <p> - * Process all non-boolean context initialization parameters. - * </p> - * - * @param servletContext - * the ServletContext of interest - * @param contextName - * the context name - */ - private void processInitParameters(ServletContext servletContext, - String contextName) - { - - for (WebContextInitParameter param : WebContextInitParameter.values()) - { - String value = servletContext.getInitParameter(param - .getQualifiedName()); - - if (value != null && value.length() > 0 && param.isDeprecated()) - { - WebContextInitParameter alternate = param.getAlternate(); - if (LOGGER.isLoggable(Level.WARNING)) - { - if (alternate != null) - { - LOGGER.log(Level.WARNING, - "jsf.config.webconfig.param.deprecated", - new Object[] - { - contextName, param.getQualifiedName(), - alternate.getQualifiedName() - }); - } - else - { - LOGGER - .log( - Level.WARNING, - "jsf.config.webconfig.param.deprecated.no_replacement", - new Object[] - { - contextName, - param.getQualifiedName() - }); - } - } - - if (alternate != null) - { - if (LOGGER.isLoggable(Level.INFO)) - { - LOGGER.log(Level.INFO, - "jsf.config.webconfig.configinfo.reset", - new Object[] - { - contextName, - alternate.getQualifiedName(), value - }); - } - - contextParameters.put(alternate, value); - } - continue; - } - - if ((value == null || value.length() == 0) && !param.isDeprecated()) - { - value = param.getDefaultValue(); - } - if (value == null || value.length() == 0) - { - continue; - } - - if (value.length() > 0) - { - if (LOGGER.isLoggable(loggingLevel)) - { - LOGGER.log(loggingLevel, "jsf.config.webconfig.configinfo", - new Object[] - { - contextName, param.getQualifiedName(), - value - }); - - } - contextParameters.put(param, value); - } - else - { - if (LOGGER.isLoggable(loggingLevel)) - { - LOGGER.log(loggingLevel, - "jsf.config.webconfig.option.notconfigured", - new Object[] - { - contextName, param.getQualifiedName() - }); - } - } - - } - - } - - /** - * <p> - * Process all JNDI entries. - * </p> - * - * @param contextName - * the context name - */ - private void processJndiEntries(String contextName) - { -/* - * This section has been disabled due to incompatibilities with Google App Engine 1.2.6. - Context initialContext = null; - try - { - initialContext = new InitialContext(); - } - catch (NamingException ne) - { - if (LOGGER.isLoggable(Level.WARNING)) - { - LOGGER.log(Level.WARNING, ne.toString(), ne); - } - } - - if (initialContext != null) - { - // process environment entries - for (WebEnvironmentEntry entry : WebEnvironmentEntry.values()) - { - String entryName = entry.getQualifiedName(); - String value = null; - - try - { - value = (String) initialContext.lookup(entryName); - } - catch (NamingException root) - { - if (LOGGER.isLoggable(Level.FINE)) - { - LOGGER.fine(root.toString()); - } - } - - if (value != null) - { - if (LOGGER.isLoggable(Level.INFO)) - { - // special logic for ClientStateSavingPassword - if (!entry - .equals(WebEnvironmentEntry.ClientStateSavingPassword)) - { - if (LOGGER.isLoggable(loggingLevel)) - { - LOGGER.log(loggingLevel, - "jsf.config.webconfig.enventryinfo", - new Object[] - { - contextName, entryName, value - }); - } - } - else - { - if (LOGGER.isLoggable(loggingLevel)) - { - LOGGER - .log( - loggingLevel, - "jsf.config.webconfig.enventry.clientencrypt", - contextName); - } - } - } - envEntries.put(entry, value); - } - } - } -*/ - } - - private boolean canProcessJndiEntries() - { - - /* - * This section has been disabled due to incompatibilities with Google App Engine 1.2.6 - try - { - Util.getCurrentLoader(this) - .loadClass("javax.naming.InitialContext"); - } - catch (Exception e) - { - */ - if (LOGGER.isLoggable(Level.FINE)) - { - LOGGER - .fine("javax.naming is forced unavailable. JNDI entries related to Mojarra configuration will not be processed."); - } - return false; - /* - } - return true; - */ - - } - - // ------------------------------------------------------------------- Enums - - /** - * <p> - * An <code>enum</code> of all non-boolean context initalization parameters - * recognized by the implementation. - * </p> - */ - public enum WebContextInitParameter - { - - // implementation note: - // if a parameter is to be deprecated, - // then the <name>Deprecated enum element - // *must* appear after the one that is taking - // its place. The reporting logic depends on this - - ManagedBeanFactoryDecorator( - "com.sun.faces.managedBeanFactoryDecoratorClass", ""), StateSavingMethod( - "javax.faces.STATE_SAVING_METHOD", "server"), FaceletsSuffix( - ViewHandler.FACELETS_SUFFIX_PARAM_NAME, - ViewHandler.DEFAULT_FACELETS_SUFFIX), DefaultSuffix( - ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, - ViewHandler.DEFAULT_SUFFIX), JavaxFacesConfigFiles( - "javax.faces.CONFIG_FILES", ""), JavaxFacesProjectStage( - "javax.faces.PROJECT_STAGE", "Production"), AlternateLifecycleId( - "javax.faces.LIFECYCLE_ID", ""), ResourceExcludes( - ResourceHandler.RESOURCE_EXCLUDES_PARAM_NAME, - ResourceHandler.RESOURCE_EXCLUDES_DEFAULT_VALUE + " .groovy"), NumberOfViews( - "com.sun.faces.numberOfViewsInSession", "15"), NumberOfViewsDeprecated( - "com.sun.faces.NUMBER_OF_VIEWS_IN_SESSION", "15", true, - NumberOfViews), NumberOfLogicalViews( - "com.sun.faces.numberOfLogicalViews", "15"), NumberOfLogicalViewsDeprecated( - "com.sun.faces.NUMBER_OF_VIEWS_IN_LOGICAL_VIEW_IN_SESSION", - "15", true, NumberOfLogicalViews), NumberOfConcurrentFlashUsers( - "com.sun.faces.numberOfConcerrentFlashUsers", "5000"), NumberOfFlashesBetweenFlashReapings( - "com.sun.faces.numberOfFlashesBetweenFlashReapings", "5000"), InjectionProviderClass( - "com.sun.faces.injectionProvider", ""), SerializationProviderClass( - "com.sun.faces.serializationProvider", ""), ResponseBufferSize( - "com.sun.faces.responseBufferSize", "1024"), FaceletsBufferSize( - "javax.faces.FACELETS_BUFFER_SIZE", "1024", true, - ResponseBufferSize), FaceletsBufferSizeDeprecated( - "facelets.BUFFER_SIZE", "1024", true, FaceletsBufferSize), ClientStateWriteBufferSize( - "com.sun.faces.clientStateWriteBufferSize", "8192"), ResourceBufferSize( - "com.sun.faces.resourceBufferSize", "2048"), ExpressionFactory( - "com.sun.faces.expressionFactory", - "com.sun.el.ExpressionFactoryImpl"), ClientStateTimeout( - "com.sun.faces.clientStateTimeout", ""), DefaultResourceMaxAge( - "com.sun.faces.defaultResourceMaxAge", "604800"), ResourceUpdateCheckPeriod( - "com.sun.faces.resourceUpdateCheckPeriod", "5" // in minutes - ), CompressableMimeTypes("com.sun.faces.compressableMimeTypes", ""), DisableUnicodeEscaping( - "com.sun.faces.disableUnicodeEscaping", "auto"), FaceletsDefaultRefreshPeriod( - "javax.faces.FACELETS_REFRESH_PERIOD", "2"), FaceletsDefaultRefreshPeriodDeprecated( - "facelets.REFRESH_PERIOD", "2", true, - FaceletsDefaultRefreshPeriod), FaceletsResourceResolver( - ResourceResolver.FACELETS_RESOURCE_RESOLVER_PARAM_NAME, ""), FaceletsResourceResolverDeprecated( - "facelets.RESOURCE_RESOLVER", "", true, - FaceletsResourceResolver), FaceletsViewMappings( - ViewHandler.FACELETS_VIEW_MAPPINGS_PARAM_NAME, ""), FaceletsViewMappingsDeprecated( - "facelets.VIEW_MAPPINGS", "", true, FaceletsViewMappings), FaceletsLibraries( - "javax.faces.FACELETS_LIBRARIES", ""), FaceletsLibrariesDeprecated( - "facelets.LIBRARIES", "", true, FaceletsLibraries), FaceletsDecorators( - "javax.faces.FACELETS_DECORATORS", ""), FaceletsDecoratorsDeprecated( - "facelets.DECORATORS", "", true, FaceletsDecorators), DuplicateJARPattern( - "com.sun.faces.duplicateJARPattern", ""), ValidateEmptyFields( - UIInput.VALIDATE_EMPTY_FIELDS_PARAM_NAME, "auto"), FullStateSavingViewIds( - StateManager.FULL_STATE_SAVING_VIEW_IDS_PARAM_NAME, ""), AnnotationScanPackages( - "com.sun.faces.annotationScanPackages", ""), FaceletFactory( - "com.sun.faces.faceletFactory", ""); - - private String defaultValue; - private String qualifiedName; - private WebContextInitParameter alternate; - private boolean deprecated; - - // ---------------------------------------------------------- Public - // Methods - - public String getDefaultValue() - { - - return defaultValue; - - } - - public String getQualifiedName() - { - - return qualifiedName; - - } - - // ------------------------------------------------- Package Private - // Methods - - WebContextInitParameter(String qualifiedName, String defaultValue) - { - - this(qualifiedName, defaultValue, false, null); - - } - - WebContextInitParameter(String qualifiedName, String defaultValue, - boolean deprecated, WebContextInitParameter alternate) - { - - this.qualifiedName = qualifiedName; - this.defaultValue = defaultValue; - this.deprecated = deprecated; - this.alternate = alternate; - - } - - // --------------------------------------------------------- Private - // Methods - - private WebContextInitParameter getAlternate() - { - - return alternate; - - } - - private boolean isDeprecated() - { - - return deprecated; - - } - - } - - /** - * <p> - * An <code>enum</code> of all boolean context initalization parameters - * recognized by the implementation. - * </p> - */ - public enum BooleanWebContextInitParameter - { - - // implementation note: - // if a parameter is to be deprecated, - // then the <name>Deprecated enum element - // *must* appear after the one that is taking - // its place. The reporting logic depends on this - - DisplayConfiguration("com.sun.faces.displayConfiguration", false), ValidateFacesConfigFiles( - "com.sun.faces.validateXml", false), VerifyFacesConfigObjects( - "com.sun.faces.verifyObjects", false), ForceLoadFacesConfigFiles( - "com.sun.faces.forceLoadConfiguration", false), DisableArtifactVersioning( - "com.sun.faces.disableVersionTracking", false, true, null), EnableHtmlTagLibraryValidator( - "com.sun.faces.enableHtmlTagLibValidator", false), EnableCoreTagLibraryValidator( - "com.sun.faces.enableCoreTagLibValidator", false), PreferXHTMLContentType( - "com.sun.faces.preferXHTML", false), PreferXHTMLContextTypeDeprecated( - "com.sun.faces.PreferXHTML", false, true, - PreferXHTMLContentType), CompressViewState( - "com.sun.faces.compressViewState", true), CompressViewStateDeprecated( - "com.sun.faces.COMPRESS_STATE", true, true, CompressViewState), CompressJavaScript( - "com.sun.faces.compressJavaScript", true), ExternalizeJavaScriptDeprecated( - "com.sun.faces.externalizeJavaScript", true, true, null), SendPoweredByHeader( - "com.sun.faces.sendPoweredByHeader", true), EnableJSStyleHiding( - "com.sun.faces.enableJSStyleHiding", false), EnableScriptInAttributeValue( - "com.sun.faces.enableScriptsInAttributeValues", true), WriteStateAtFormEnd( - "com.sun.faces.writeStateAtFormEnd", true), EnableLazyBeanValidation( - "com.sun.faces.enableLazyBeanValidation", true), EnableLoadBundle11Compatibility( - "com.sun.faces.enabledLoadBundle11Compatibility", false), EnableRestoreView11Compatibility( - "com.sun.faces.enableRestoreView11Compatibility", false), SerializeServerState( - "com.sun.faces.serializeServerState", false), EnableViewStateIdRendering( - "com.sun.faces.enableViewStateIdRendering", true), RegisterConverterPropertyEditors( - "com.sun.faces.registerConverterPropertyEditors", false), EnableGroovyScripting( - "com.sun.faces.enableGroovyScripting", false), DisableFaceletJSFViewHandler( - "javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER", false), DisableDefaultBeanValidator( - BeanValidator.DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME, false), DateTimeConverterUsesSystemTimezone( - "javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE", - false), FaceletsSkipComments( - "javax.faces.FACELETS_SKIP_COMMENTS", false), FaceletsSkipCommentsDeprecated( - "facelets.SKIP_COMMENTS", false, true, FaceletsSkipComments), PartialStateSaving( - StateManager.PARTIAL_STATE_SAVING_PARAM_NAME, true), GenerateUniqueServerStateIds( - "com.sun.faces.generateUniqueServerStateIds", true), AutoCompleteOffOnViewState( - "com.sun.faces.autoCompleteOffOnViewState", true), EnableThreading( - "com.sun.faces.enableThreading", true), AllowTextChildren( - "com.sun.faces.allowTextChildren", false); - - private BooleanWebContextInitParameter alternate; - - private String qualifiedName; - private boolean defaultValue; - private boolean deprecated; - - // ---------------------------------------------------------- Public - // Methods - - public boolean getDefaultValue() - { - - return defaultValue; - - } - - public String getQualifiedName() - { - - return qualifiedName; - - } - - // ------------------------------------------------- Package Private - // Methods - - BooleanWebContextInitParameter(String qualifiedName, - boolean defaultValue) - { - - this(qualifiedName, defaultValue, false, null); - - } - - BooleanWebContextInitParameter(String qualifiedName, - boolean defaultValue, boolean deprecated, - BooleanWebContextInitParameter alternate) - { - - this.qualifiedName = qualifiedName; - this.defaultValue = defaultValue; - this.deprecated = deprecated; - this.alternate = alternate; - - } - - // --------------------------------------------------------- Private - // Methods - - private BooleanWebContextInitParameter getAlternate() - { - - return alternate; - - } - - private boolean isDeprecated() - { - - return deprecated; - - } - - } - - /** - * <p> - * An <code>enum</code> of all environment entries (specified in the - * web.xml) recognized by the implemenetation. - * </p> - */ - public enum WebEnvironmentEntry - { - - ClientStateSavingPassword("ClientStateSavingPassword"), ProjectStage( - javax.faces.application.ProjectStage.PROJECT_STAGE_JNDI_NAME); - - private static final String JNDI_PREFIX = "java:comp/env/"; - private String qualifiedName; - - // ---------------------------------------------------------- Public - // Methods - - public String getQualifiedName() - { - - return qualifiedName; - - } - - // ------------------------------------------------- Package Private - // Methods - - WebEnvironmentEntry(String qualifiedName) - { - - if (qualifiedName.startsWith(JNDI_PREFIX)) - { - this.qualifiedName = qualifiedName; - } - else - { - this.qualifiedName = JNDI_PREFIX + qualifiedName; - } - - } - - } - - /** - * <p> - * An <code>enum</code> of all possible values for the - * <code>disableUnicodeEscaping</code> configuration parameter. - * </p> - */ - public enum DisableUnicodeEscaping - { - True("true"), False("false"), Auto("auto"); - - private final String value; - - DisableUnicodeEscaping(String value) - { - this.value = value; - } - - public static DisableUnicodeEscaping getByValue(String value) - { - for (DisableUnicodeEscaping disableUnicodeEscaping : DisableUnicodeEscaping - .values()) - { - if (disableUnicodeEscaping.value.equals(value)) { return disableUnicodeEscaping; } - } - - return null; - } - } - -} // END WebConfiguration \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/com/sun/faces/config/WebConfiguration.java 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,1112 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +/* + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. + * + * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. + * + * The contents of this file are subject to the terms of either the GNU + * General Public License Version 2 only ("GPL") or the Common Development + * and Distribution License("CDDL") (collectively, the "License"). You + * may not use this file except in compliance with the License. You can obtain + * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html + * or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific + * language governing permissions and limitations under the License. + * + * When distributing the software, include this License Header Notice in each + * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. + * Sun designates this particular file as subject to the "Classpath" exception + * as provided by Sun in the GPL Version 2 section of the License file that + * accompanied this code. If applicable, add the following below the License + * Header, with the fields enclosed by brackets [] replaced by your own + * identifying information: "Portions Copyrighted [year] + * [name of copyright owner]" + * + * Contributor(s): + * + * If you wish your version of this file to be governed by only the CDDL or + * only the GPL Version 2, indicate your decision by adding "[Contributor] + * elects to include this software in this distribution under the [CDDL or GPL + * Version 2] license." If you don't indicate a single choice of license, a + * recipient has the option to distribute your version of this file under + * either the CDDL, the GPL Version 2 or to extend the choice of license to + * its licensees as provided above. However, if you add GPL Version 2 code + * and therefore, elected the GPL Version 2 license, then the option applies + * only if the new code is made subject to such option by the copyright + * holder. + */ + +package com.sun.faces.config; + +import java.util.ArrayList; +import java.util.EnumMap; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.logging.Level; +import java.util.logging.Logger; +import java.util.regex.Pattern; + +import javax.faces.application.ResourceHandler; +import javax.faces.application.StateManager; +import javax.faces.application.ViewHandler; +import javax.faces.component.UIInput; +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.faces.validator.BeanValidator; +import javax.faces.view.facelets.ResourceResolver; +import javax.servlet.ServletContext; + +import com.sun.faces.util.FacesLogger; +import com.sun.faces.util.Util; + +/** Class Documentation */ +public class WebConfiguration +{ + + // Log instance for this class + private static final Logger LOGGER = FacesLogger.CONFIG.getLogger(); + + // A Simple regular expression of allowable boolean values + private static final Pattern ALLOWABLE_BOOLEANS = Pattern + .compile("true|false"); + + // Key under which we store our WebConfiguration instance. + private static final String WEB_CONFIG_KEY = "com.sun.faces.config.WebConfiguration"; + + // Logging level. Defaults to FINE + private Level loggingLevel = Level.FINE; + + private Map<BooleanWebContextInitParameter, Boolean> booleanContextParameters = new EnumMap<BooleanWebContextInitParameter, Boolean>( + BooleanWebContextInitParameter.class); + + private Map<WebContextInitParameter, String> contextParameters = new EnumMap<WebContextInitParameter, String>( + WebContextInitParameter.class); + + private Map<WebEnvironmentEntry, String> envEntries = new EnumMap<WebEnvironmentEntry, String>( + WebEnvironmentEntry.class); + + private Map<WebContextInitParameter, String[]> cachedListParams; + + private List<String> setParams = new ArrayList<String>(); + + private ServletContext servletContext; + + // ------------------------------------------------------------ Constructors + + private WebConfiguration(ServletContext servletContext) + { + + this.servletContext = servletContext; + + String contextName = getServletContextName(); + + initSetList(servletContext); + processBooleanParameters(servletContext, contextName); + processInitParameters(servletContext, contextName); + if (canProcessJndiEntries()) + { + processJndiEntries(contextName); + } + + // build the cache of list type params + cachedListParams = new HashMap<WebContextInitParameter, String[]>(3); + getOptionValue(WebContextInitParameter.ResourceExcludes, " "); + getOptionValue(WebContextInitParameter.DefaultSuffix, " "); + getOptionValue(WebContextInitParameter.FaceletsViewMappings, ";"); + + } + + // ---------------------------------------------------------- Public Methods + + /** + * Return the WebConfiguration instance for this application passing the + * result of FacesContext.getCurrentInstance().getExternalContext() to + * {@link ${symbol_pound}getInstance(javax.faces.context.ExternalContext)}. + * + * @return the WebConfiguration for this application or <code>null</code> if + * no FacesContext is available. + */ + public static WebConfiguration getInstance() + { + + FacesContext facesContext = FacesContext.getCurrentInstance(); + return getInstance(facesContext.getExternalContext()); + + } + + /** + * Return the WebConfiguration instance for this application. + * + * @param extContext + * the ExternalContext for this request + * @return the WebConfiguration for this application + */ + public static WebConfiguration getInstance(ExternalContext extContext) + { + + WebConfiguration config = (WebConfiguration) extContext + .getApplicationMap().get(WEB_CONFIG_KEY); + if (config == null) + { + return getInstance((ServletContext) extContext.getContext()); + } + else + { + return config; + } + + } + + /** + * Return the WebConfiguration instance for this application. + * + * @param servletContext + * the ServletContext + * @return the WebConfiguration for this application or <code>null</code> if + * no WebConfiguration could be located + */ + public static WebConfiguration getInstance(ServletContext servletContext) + { + + WebConfiguration webConfig = (WebConfiguration) servletContext + .getAttribute(WEB_CONFIG_KEY); + + if (webConfig == null) + { + webConfig = new WebConfiguration(servletContext); + servletContext.setAttribute(WEB_CONFIG_KEY, webConfig); + } + return webConfig; + + } + + /** + * @return The <code>ServletContext</code> originally used to construct this + * WebConfiguration instance + */ + public ServletContext getServletContext() + { + + return servletContext; + + } + + /** + * Obtain the value of the specified boolean parameter + * + * @param param + * the parameter of interest + * @return the value of the specified boolean parameter + */ + public boolean isOptionEnabled(BooleanWebContextInitParameter param) + { + + if (booleanContextParameters.get(param) != null) + { + return booleanContextParameters.get(param); + } + else + { + return param.getDefaultValue(); + } + + } + + /** + * Obtain the value of the specified parameter + * + * @param param + * the parameter of interest + * @return the value of the specified parameter + */ + public String getOptionValue(WebContextInitParameter param) + { + String result = contextParameters.get(param); + + if (null == result) + { + WebContextInitParameter alternate = param.getAlternate(); + if (null != alternate) + { + result = contextParameters.get(alternate); + } + } + + return result; + + } + + public String[] getOptionValue(WebContextInitParameter param, String sep) + { + String[] result; + + assert (null != cachedListParams); + if (null == (result = cachedListParams.get(param))) + { + String value = getOptionValue(param); + if (null == value) + { + result = new String[0]; + } + else + { + result = Util.split(value, sep); + } + cachedListParams.put(param, result); + } + + return result; + } + + /** + * Obtain the value of the specified env-entry + * + * @param entry + * the env-entry of interest + * @return the value of the specified env-entry + */ + public String getEnvironmentEntry(WebEnvironmentEntry entry) + { + + return envEntries.get(entry); + + } + + /** + * @param param + * the init parameter of interest + * @return <code>true</code> if the parameter was explicitly set, otherwise, + * <code>false</code> + */ + public boolean isSet(WebContextInitParameter param) + { + + return isSet(param.getQualifiedName()); + + } + + /** + * @param param + * the init parameter of interest + * @return <code>true</code> if the parameter was explicitly set, otherwise, + * <code>false</code> + */ + public boolean isSet(BooleanWebContextInitParameter param) + { + + return isSet(param.getQualifiedName()); + + } + + /** + * @return the name of this application + */ + public String getServletContextName() + { + + if (servletContext.getMajorVersion() == 2 + && servletContext.getMinorVersion() <= 4) + { + return servletContext.getServletContextName(); + } + else + { + return servletContext.getContextPath(); + } + + } + + public void overrideContextInitParameter( + BooleanWebContextInitParameter param, boolean value) + { + + if (param == null) { return; } + boolean oldVal = booleanContextParameters.put(param, value); + if (LOGGER.isLoggable(Level.FINE) && oldVal != value) + { + LOGGER + .log( + Level.FINE, + "Overriding init parameter {0}. Changing from {1} to {2}.", + new Object[] + { + param.getQualifiedName(), oldVal, value + }); + } + + } + + public void overrideContextInitParameter(WebContextInitParameter param, + String value) + { + + if (param == null || value == null || value.length() == 0) { return; } + value = value.trim(); + String oldVal = contextParameters.put(param, value); + cachedListParams.remove(param); + if (oldVal != null) + { + if (LOGGER.isLoggable(Level.FINE) && !(oldVal.equals(value))) + { + LOGGER + .log( + Level.FINE, + "Overriding init parameter {0}. Changing from {1} to {2}.", + new Object[] + { + param.getQualifiedName(), oldVal, value + }); + } + } + + } + + // ------------------------------------------------- Package Private Methods + + static void clear(ServletContext servletContext) + { + + servletContext.removeAttribute(WEB_CONFIG_KEY); + + } + + // --------------------------------------------------------- Private Methods + + /** + * <p> + * Is the configured value valid against the default boolean pattern. + * </p> + * + * @param param + * the boolean parameter + * @param value + * the configured value + * @return <code>true</code> if the value is valid, otherwise + * <code>false</code> + */ + private boolean isValueValid(BooleanWebContextInitParameter param, + String value) + { + + if (!ALLOWABLE_BOOLEANS.matcher(value).matches()) + { + if (LOGGER.isLoggable(Level.WARNING)) + { + LOGGER.log(Level.WARNING, + "jsf.config.webconfig.boolconfig.invalidvalue", + new Object[] + { + value, param.getQualifiedName(), "true|false" + }); + } + return false; + } + + return true; + + } + + /** + * <p> + * Process all boolean context initialization parameters. + * </p> + * + * @param servletContext + * the ServletContext of interest + * @param contextName + * the context name + */ + private void processBooleanParameters(ServletContext servletContext, + String contextName) + { + + // process boolean contxt parameters + for (BooleanWebContextInitParameter param : BooleanWebContextInitParameter + .values()) + { + String strValue = servletContext.getInitParameter(param + .getQualifiedName()); + boolean value; + + if (strValue != null && strValue.length() > 0 + && param.isDeprecated()) + { + BooleanWebContextInitParameter alternate = param.getAlternate(); + if (LOGGER.isLoggable(Level.WARNING)) + { + if (alternate != null) + { + LOGGER.log(Level.WARNING, + "jsf.config.webconfig.param.deprecated", + new Object[] + { + contextName, param.getQualifiedName(), + alternate.getQualifiedName() + }); + } + else + { + LOGGER + .log( + Level.WARNING, + "jsf.config.webconfig.param.deprecated.no_replacement", + new Object[] + { + contextName, + param.getQualifiedName() + }); + } + } + + if (alternate != null) + { + if (isValueValid(param, strValue)) + { + value = Boolean.valueOf(strValue); + } + else + { + value = param.getDefaultValue(); + } + + if (LOGGER.isLoggable(Level.INFO) && alternate != null) + { + LOGGER + .log( + Level.INFO, + ((value) ? "jsf.config.webconfig.configinfo.reset.enabled" + : "jsf.config.webconfig.configinfo.reset.disabled"), + new Object[] + { + contextName, + alternate.getQualifiedName() + }); + } + + booleanContextParameters.put(alternate, value); + } + continue; + } + + if (!param.isDeprecated()) + { + if (strValue == null) + { + value = param.getDefaultValue(); + } + else + { + if (isValueValid(param, strValue)) + { + value = Boolean.valueOf(strValue); + } + else + { + value = param.getDefaultValue(); + } + } + + // first param processed should be + // com.sun.faces.displayConfiguration + if (BooleanWebContextInitParameter.DisplayConfiguration + .equals(param) + && value) + { + loggingLevel = Level.INFO; + } + + if (LOGGER.isLoggable(loggingLevel)) + { + LOGGER + .log( + loggingLevel, + ((value) ? "jsf.config.webconfig.boolconfiginfo.enabled" + : "jsf.config.webconfig.boolconfiginfo.disabled"), + new Object[] + { + contextName, + param.getQualifiedName() + }); + } + + booleanContextParameters.put(param, value); + } + + } + + } + + /** + * Adds all com.sun.faces init parameter names to a list. This allows + * callers to determine if a parameter was explicitly set. + * + * @param servletContext + * the ServletContext of interest + */ + private void initSetList(ServletContext servletContext) + { + + for (Enumeration e = servletContext.getInitParameterNames(); e + .hasMoreElements();) + { + String name = e.nextElement().toString(); + if (name.startsWith("com.sun.faces")) + { + setParams.add(name); + } + } + + } + + /** + * @param name + * the param name + * @return <code>true</code> if the name was explicitly specified + */ + private boolean isSet(String name) + { + + return setParams.contains(name); + + } + + /** + * <p> + * Process all non-boolean context initialization parameters. + * </p> + * + * @param servletContext + * the ServletContext of interest + * @param contextName + * the context name + */ + private void processInitParameters(ServletContext servletContext, + String contextName) + { + + for (WebContextInitParameter param : WebContextInitParameter.values()) + { + String value = servletContext.getInitParameter(param + .getQualifiedName()); + + if (value != null && value.length() > 0 && param.isDeprecated()) + { + WebContextInitParameter alternate = param.getAlternate(); + if (LOGGER.isLoggable(Level.WARNING)) + { + if (alternate != null) + { + LOGGER.log(Level.WARNING, + "jsf.config.webconfig.param.deprecated", + new Object[] + { + contextName, param.getQualifiedName(), + alternate.getQualifiedName() + }); + } + else + { + LOGGER + .log( + Level.WARNING, + "jsf.config.webconfig.param.deprecated.no_replacement", + new Object[] + { + contextName, + param.getQualifiedName() + }); + } + } + + if (alternate != null) + { + if (LOGGER.isLoggable(Level.INFO)) + { + LOGGER.log(Level.INFO, + "jsf.config.webconfig.configinfo.reset", + new Object[] + { + contextName, + alternate.getQualifiedName(), value + }); + } + + contextParameters.put(alternate, value); + } + continue; + } + + if ((value == null || value.length() == 0) && !param.isDeprecated()) + { + value = param.getDefaultValue(); + } + if (value == null || value.length() == 0) + { + continue; + } + + if (value.length() > 0) + { + if (LOGGER.isLoggable(loggingLevel)) + { + LOGGER.log(loggingLevel, "jsf.config.webconfig.configinfo", + new Object[] + { + contextName, param.getQualifiedName(), + value + }); + + } + contextParameters.put(param, value); + } + else + { + if (LOGGER.isLoggable(loggingLevel)) + { + LOGGER.log(loggingLevel, + "jsf.config.webconfig.option.notconfigured", + new Object[] + { + contextName, param.getQualifiedName() + }); + } + } + + } + + } + + /** + * <p> + * Process all JNDI entries. + * </p> + * + * @param contextName + * the context name + */ + private void processJndiEntries(String contextName) + { +/* + * This section has been disabled due to incompatibilities with Google App Engine 1.2.6. + Context initialContext = null; + try + { + initialContext = new InitialContext(); + } + catch (NamingException ne) + { + if (LOGGER.isLoggable(Level.WARNING)) + { + LOGGER.log(Level.WARNING, ne.toString(), ne); + } + } + + if (initialContext != null) + { + // process environment entries + for (WebEnvironmentEntry entry : WebEnvironmentEntry.values()) + { + String entryName = entry.getQualifiedName(); + String value = null; + + try + { + value = (String) initialContext.lookup(entryName); + } + catch (NamingException root) + { + if (LOGGER.isLoggable(Level.FINE)) + { + LOGGER.fine(root.toString()); + } + } + + if (value != null) + { + if (LOGGER.isLoggable(Level.INFO)) + { + // special logic for ClientStateSavingPassword + if (!entry + .equals(WebEnvironmentEntry.ClientStateSavingPassword)) + { + if (LOGGER.isLoggable(loggingLevel)) + { + LOGGER.log(loggingLevel, + "jsf.config.webconfig.enventryinfo", + new Object[] + { + contextName, entryName, value + }); + } + } + else + { + if (LOGGER.isLoggable(loggingLevel)) + { + LOGGER + .log( + loggingLevel, + "jsf.config.webconfig.enventry.clientencrypt", + contextName); + } + } + } + envEntries.put(entry, value); + } + } + } +*/ + } + + private boolean canProcessJndiEntries() + { + + /* + * This section has been disabled due to incompatibilities with Google App Engine 1.2.6 + try + { + Util.getCurrentLoader(this) + .loadClass("javax.naming.InitialContext"); + } + catch (Exception e) + { + */ + if (LOGGER.isLoggable(Level.FINE)) + { + LOGGER + .fine("javax.naming is forced unavailable. JNDI entries related to Mojarra configuration will not be processed."); + } + return false; + /* + } + return true; + */ + + } + + // ------------------------------------------------------------------- Enums + + /** + * <p> + * An <code>enum</code> of all non-boolean context initalization parameters + * recognized by the implementation. + * </p> + */ + public enum WebContextInitParameter + { + + // implementation note: + // if a parameter is to be deprecated, + // then the <name>Deprecated enum element + // *must* appear after the one that is taking + // its place. The reporting logic depends on this + + ManagedBeanFactoryDecorator( + "com.sun.faces.managedBeanFactoryDecoratorClass", ""), StateSavingMethod( + "javax.faces.STATE_SAVING_METHOD", "server"), FaceletsSuffix( + ViewHandler.FACELETS_SUFFIX_PARAM_NAME, + ViewHandler.DEFAULT_FACELETS_SUFFIX), DefaultSuffix( + ViewHandler.DEFAULT_SUFFIX_PARAM_NAME, + ViewHandler.DEFAULT_SUFFIX), JavaxFacesConfigFiles( + "javax.faces.CONFIG_FILES", ""), JavaxFacesProjectStage( + "javax.faces.PROJECT_STAGE", "Production"), AlternateLifecycleId( + "javax.faces.LIFECYCLE_ID", ""), ResourceExcludes( + ResourceHandler.RESOURCE_EXCLUDES_PARAM_NAME, + ResourceHandler.RESOURCE_EXCLUDES_DEFAULT_VALUE + " .groovy"), NumberOfViews( + "com.sun.faces.numberOfViewsInSession", "15"), NumberOfViewsDeprecated( + "com.sun.faces.NUMBER_OF_VIEWS_IN_SESSION", "15", true, + NumberOfViews), NumberOfLogicalViews( + "com.sun.faces.numberOfLogicalViews", "15"), NumberOfLogicalViewsDeprecated( + "com.sun.faces.NUMBER_OF_VIEWS_IN_LOGICAL_VIEW_IN_SESSION", + "15", true, NumberOfLogicalViews), NumberOfConcurrentFlashUsers( + "com.sun.faces.numberOfConcerrentFlashUsers", "5000"), NumberOfFlashesBetweenFlashReapings( + "com.sun.faces.numberOfFlashesBetweenFlashReapings", "5000"), InjectionProviderClass( + "com.sun.faces.injectionProvider", ""), SerializationProviderClass( + "com.sun.faces.serializationProvider", ""), ResponseBufferSize( + "com.sun.faces.responseBufferSize", "1024"), FaceletsBufferSize( + "javax.faces.FACELETS_BUFFER_SIZE", "1024", true, + ResponseBufferSize), FaceletsBufferSizeDeprecated( + "facelets.BUFFER_SIZE", "1024", true, FaceletsBufferSize), ClientStateWriteBufferSize( + "com.sun.faces.clientStateWriteBufferSize", "8192"), ResourceBufferSize( + "com.sun.faces.resourceBufferSize", "2048"), ExpressionFactory( + "com.sun.faces.expressionFactory", + "com.sun.el.ExpressionFactoryImpl"), ClientStateTimeout( + "com.sun.faces.clientStateTimeout", ""), DefaultResourceMaxAge( + "com.sun.faces.defaultResourceMaxAge", "604800"), ResourceUpdateCheckPeriod( + "com.sun.faces.resourceUpdateCheckPeriod", "5" // in minutes + ), CompressableMimeTypes("com.sun.faces.compressableMimeTypes", ""), DisableUnicodeEscaping( + "com.sun.faces.disableUnicodeEscaping", "auto"), FaceletsDefaultRefreshPeriod( + "javax.faces.FACELETS_REFRESH_PERIOD", "2"), FaceletsDefaultRefreshPeriodDeprecated( + "facelets.REFRESH_PERIOD", "2", true, + FaceletsDefaultRefreshPeriod), FaceletsResourceResolver( + ResourceResolver.FACELETS_RESOURCE_RESOLVER_PARAM_NAME, ""), FaceletsResourceResolverDeprecated( + "facelets.RESOURCE_RESOLVER", "", true, + FaceletsResourceResolver), FaceletsViewMappings( + ViewHandler.FACELETS_VIEW_MAPPINGS_PARAM_NAME, ""), FaceletsViewMappingsDeprecated( + "facelets.VIEW_MAPPINGS", "", true, FaceletsViewMappings), FaceletsLibraries( + "javax.faces.FACELETS_LIBRARIES", ""), FaceletsLibrariesDeprecated( + "facelets.LIBRARIES", "", true, FaceletsLibraries), FaceletsDecorators( + "javax.faces.FACELETS_DECORATORS", ""), FaceletsDecoratorsDeprecated( + "facelets.DECORATORS", "", true, FaceletsDecorators), DuplicateJARPattern( + "com.sun.faces.duplicateJARPattern", ""), ValidateEmptyFields( + UIInput.VALIDATE_EMPTY_FIELDS_PARAM_NAME, "auto"), FullStateSavingViewIds( + StateManager.FULL_STATE_SAVING_VIEW_IDS_PARAM_NAME, ""), AnnotationScanPackages( + "com.sun.faces.annotationScanPackages", ""), FaceletFactory( + "com.sun.faces.faceletFactory", ""); + + private String defaultValue; + private String qualifiedName; + private WebContextInitParameter alternate; + private boolean deprecated; + + // ---------------------------------------------------------- Public + // Methods + + public String getDefaultValue() + { + + return defaultValue; + + } + + public String getQualifiedName() + { + + return qualifiedName; + + } + + // ------------------------------------------------- Package Private + // Methods + + WebContextInitParameter(String qualifiedName, String defaultValue) + { + + this(qualifiedName, defaultValue, false, null); + + } + + WebContextInitParameter(String qualifiedName, String defaultValue, + boolean deprecated, WebContextInitParameter alternate) + { + + this.qualifiedName = qualifiedName; + this.defaultValue = defaultValue; + this.deprecated = deprecated; + this.alternate = alternate; + + } + + // --------------------------------------------------------- Private + // Methods + + private WebContextInitParameter getAlternate() + { + + return alternate; + + } + + private boolean isDeprecated() + { + + return deprecated; + + } + + } + + /** + * <p> + * An <code>enum</code> of all boolean context initalization parameters + * recognized by the implementation. + * </p> + */ + public enum BooleanWebContextInitParameter + { + + // implementation note: + // if a parameter is to be deprecated, + // then the <name>Deprecated enum element + // *must* appear after the one that is taking + // its place. The reporting logic depends on this + + DisplayConfiguration("com.sun.faces.displayConfiguration", false), ValidateFacesConfigFiles( + "com.sun.faces.validateXml", false), VerifyFacesConfigObjects( + "com.sun.faces.verifyObjects", false), ForceLoadFacesConfigFiles( + "com.sun.faces.forceLoadConfiguration", false), DisableArtifactVersioning( + "com.sun.faces.disableVersionTracking", false, true, null), EnableHtmlTagLibraryValidator( + "com.sun.faces.enableHtmlTagLibValidator", false), EnableCoreTagLibraryValidator( + "com.sun.faces.enableCoreTagLibValidator", false), PreferXHTMLContentType( + "com.sun.faces.preferXHTML", false), PreferXHTMLContextTypeDeprecated( + "com.sun.faces.PreferXHTML", false, true, + PreferXHTMLContentType), CompressViewState( + "com.sun.faces.compressViewState", true), CompressViewStateDeprecated( + "com.sun.faces.COMPRESS_STATE", true, true, CompressViewState), CompressJavaScript( + "com.sun.faces.compressJavaScript", true), ExternalizeJavaScriptDeprecated( + "com.sun.faces.externalizeJavaScript", true, true, null), SendPoweredByHeader( + "com.sun.faces.sendPoweredByHeader", true), EnableJSStyleHiding( + "com.sun.faces.enableJSStyleHiding", false), EnableScriptInAttributeValue( + "com.sun.faces.enableScriptsInAttributeValues", true), WriteStateAtFormEnd( + "com.sun.faces.writeStateAtFormEnd", true), EnableLazyBeanValidation( + "com.sun.faces.enableLazyBeanValidation", true), EnableLoadBundle11Compatibility( + "com.sun.faces.enabledLoadBundle11Compatibility", false), EnableRestoreView11Compatibility( + "com.sun.faces.enableRestoreView11Compatibility", false), SerializeServerState( + "com.sun.faces.serializeServerState", false), EnableViewStateIdRendering( + "com.sun.faces.enableViewStateIdRendering", true), RegisterConverterPropertyEditors( + "com.sun.faces.registerConverterPropertyEditors", false), EnableGroovyScripting( + "com.sun.faces.enableGroovyScripting", false), DisableFaceletJSFViewHandler( + "javax.faces.DISABLE_FACELET_JSF_VIEWHANDLER", false), DisableDefaultBeanValidator( + BeanValidator.DISABLE_DEFAULT_BEAN_VALIDATOR_PARAM_NAME, false), DateTimeConverterUsesSystemTimezone( + "javax.faces.DATETIMECONVERTER_DEFAULT_TIMEZONE_IS_SYSTEM_TIMEZONE", + false), FaceletsSkipComments( + "javax.faces.FACELETS_SKIP_COMMENTS", false), FaceletsSkipCommentsDeprecated( + "facelets.SKIP_COMMENTS", false, true, FaceletsSkipComments), PartialStateSaving( + StateManager.PARTIAL_STATE_SAVING_PARAM_NAME, true), GenerateUniqueServerStateIds( + "com.sun.faces.generateUniqueServerStateIds", true), AutoCompleteOffOnViewState( + "com.sun.faces.autoCompleteOffOnViewState", true), EnableThreading( + "com.sun.faces.enableThreading", true), AllowTextChildren( + "com.sun.faces.allowTextChildren", false); + + private BooleanWebContextInitParameter alternate; + + private String qualifiedName; + private boolean defaultValue; + private boolean deprecated; + + // ---------------------------------------------------------- Public + // Methods + + public boolean getDefaultValue() + { + + return defaultValue; + + } + + public String getQualifiedName() + { + + return qualifiedName; + + } + + // ------------------------------------------------- Package Private + // Methods + + BooleanWebContextInitParameter(String qualifiedName, + boolean defaultValue) + { + + this(qualifiedName, defaultValue, false, null); + + } + + BooleanWebContextInitParameter(String qualifiedName, + boolean defaultValue, boolean deprecated, + BooleanWebContextInitParameter alternate) + { + + this.qualifiedName = qualifiedName; + this.defaultValue = defaultValue; + this.deprecated = deprecated; + this.alternate = alternate; + + } + + // --------------------------------------------------------- Private + // Methods + + private BooleanWebContextInitParameter getAlternate() + { + + return alternate; + + } + + private boolean isDeprecated() + { + + return deprecated; + + } + + } + + /** + * <p> + * An <code>enum</code> of all environment entries (specified in the + * web.xml) recognized by the implemenetation. + * </p> + */ + public enum WebEnvironmentEntry + { + + ClientStateSavingPassword("ClientStateSavingPassword"), ProjectStage( + javax.faces.application.ProjectStage.PROJECT_STAGE_JNDI_NAME); + + private static final String JNDI_PREFIX = "java:comp/env/"; + private String qualifiedName; + + // ---------------------------------------------------------- Public + // Methods + + public String getQualifiedName() + { + + return qualifiedName; + + } + + // ------------------------------------------------- Package Private + // Methods + + WebEnvironmentEntry(String qualifiedName) + { + + if (qualifiedName.startsWith(JNDI_PREFIX)) + { + this.qualifiedName = qualifiedName; + } + else + { + this.qualifiedName = JNDI_PREFIX + qualifiedName; + } + + } + + } + + /** + * <p> + * An <code>enum</code> of all possible values for the + * <code>disableUnicodeEscaping</code> configuration parameter. + * </p> + */ + public enum DisableUnicodeEscaping + { + True("true"), False("false"), Auto("auto"); + + private final String value; + + DisableUnicodeEscaping(String value) + { + this.value = value; + } + + public static DisableUnicodeEscaping getByValue(String value) + { + for (DisableUnicodeEscaping disableUnicodeEscaping : DisableUnicodeEscaping + .values()) + { + if (disableUnicodeEscaping.value.equals(value)) { return disableUnicodeEscaping; } + } + + return null; + } + } + +} // END WebConfiguration \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources) Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,31 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -${symbol_pound} A default java.util.logging configuration. -${symbol_pound} (All App Engine logging is through java.util.logging by default). -${symbol_pound} -${symbol_pound} To use this configuration, copy it into your application's WEB-INF -${symbol_pound} folder and add the following to your appengine-web.xml: -${symbol_pound} -${symbol_pound} <system-properties> -${symbol_pound} <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/> -${symbol_pound} </system-properties> -${symbol_pound} - -${symbol_pound} Set the default logging level for all loggers to WARNING -.level = WARNING - -${symbol_pound} Set the default logging level for ORM, specifically, to WARNING -DataNucleus.JDO.level=WARNING -DataNucleus.Persistence.level=WARNING -DataNucleus.Cache.level=WARNING -DataNucleus.MetaData.level=WARNING -DataNucleus.General.level=WARNING -DataNucleus.Utility.level=WARNING -DataNucleus.Transaction.level=WARNING -DataNucleus.Datastore.level=WARNING -DataNucleus.ClassLoading.level=WARNING -DataNucleus.Plugin.level=WARNING -DataNucleus.ValueGeneration.level=WARNING -DataNucleus.Enhancer.level=WARNING -DataNucleus.SchemaTool.level=WARNING Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/resources/logging.properties 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,31 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +${symbol_pound} A default java.util.logging configuration. +${symbol_pound} (All App Engine logging is through java.util.logging by default). +${symbol_pound} +${symbol_pound} To use this configuration, copy it into your application's WEB-INF +${symbol_pound} folder and add the following to your appengine-web.xml: +${symbol_pound} +${symbol_pound} <system-properties> +${symbol_pound} <property name="java.util.logging.config.file" value="WEB-INF/logging.properties"/> +${symbol_pound} </system-properties> +${symbol_pound} + +${symbol_pound} Set the default logging level for all loggers to WARNING +.level = WARNING + +${symbol_pound} Set the default logging level for ORM, specifically, to WARNING +DataNucleus.JDO.level=WARNING +DataNucleus.Persistence.level=WARNING +DataNucleus.Cache.level=WARNING +DataNucleus.MetaData.level=WARNING +DataNucleus.General.level=WARNING +DataNucleus.Utility.level=WARNING +DataNucleus.Transaction.level=WARNING +DataNucleus.Datastore.level=WARNING +DataNucleus.ClassLoading.level=WARNING +DataNucleus.Plugin.level=WARNING +DataNucleus.ValueGeneration.level=WARNING +DataNucleus.Enhancer.level=WARNING +DataNucleus.SchemaTool.level=WARNING Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF) Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<PROCESS model-entity="JSFProcess"/> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/.faces-config.xml.jsfdia 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<PROCESS model-entity="JSFProcess"/> Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,13 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0"?> -<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> - - <managed-bean> - <managed-bean-name>richBean</managed-bean-name> - <managed-bean-class>${package}.RichBean</managed-bean-class> - <managed-bean-scope>view</managed-bean-scope> - </managed-bean> -</faces-config> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,13 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0"?> +<faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> + + <managed-bean> + <managed-bean-name>richBean</managed-bean-name> + <managed-bean-class>${package}.RichBean</managed-bean-class> + <managed-bean-scope>view</managed-bean-scope> + </managed-bean> +</faces-config> Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,14 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<scanning xmlns="urn:jboss:scanning:1.0"> -<!-- - For JBoss AS 6 integration there is a conflict with guava, and - google-collections. JBAS-8361 ---> - <path name="WEB-INF/classes"></path> - - <path name="WEB-INF/lib/guava-r05.jar"> - <exclude name="com.google.common.collect" /> - </path> -</scanning> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/jboss-scanning.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,14 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<scanning xmlns="urn:jboss:scanning:1.0"> +<!-- + For JBoss AS 6 integration there is a conflict with guava, and + google-collections. JBAS-8361 +--> + <path name="WEB-INF/classes"></path> + + <path name="WEB-INF/lib/guava-r05.jar"> + <exclude name="com.google.common.collect" /> + </path> +</scanning> \ No newline at end of file Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,54 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0" encoding="UTF-8"?> -<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> - <display-name>RichFaces 4 GAE Application</display-name> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> - <context-param> - <param-name>javax.faces.SKIP_COMMENTS</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinning</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinningClasses</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.skin</param-name> - <param-value>blueSky</param-value> - </context-param> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> - <session-config> - <session-timeout>30</session-timeout> - </session-config> - <mime-mapping> - <extension>ecss</extension> - <mime-type>text/css</mime-type> - </mime-mapping> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - <login-config> - <auth-method>BASIC</auth-method> - </login-config> -</web-app> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,54 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"> + <display-name>RichFaces 4 GAE Application</display-name> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + <context-param> + <param-name>javax.faces.SKIP_COMMENTS</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinning</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>blueSky</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> + <session-config> + <session-timeout>30</session-timeout> + </session-config> + <mime-mapping> + <extension>ecss</extension> + <mime-type>text/css</mime-type> + </mime-mapping> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + <login-config> + <auth-method>BASIC</auth-method> + </login-config> +</web-app> Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,10 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> -<html> -<head></head> - <body> - <jsp:forward page="/index.jsf" /> - </body> -</html> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.jsp 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,10 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<!doctype html public "-//w3c//dtd html 4.0 transitional//en"> +<html> +<head></head> + <body> + <jsp:forward page="/index.jsf" /> + </body> +</html> \ No newline at end of file Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,27 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"> - -<body> -<ui:composition template="/templates/template.xhtml"> - - <ui:define name="title">RichFaces GAE Sample</ui:define> - - <ui:define name="body"> - <h:form prependId="false"> - <h:outputLabel value="Name:" for="nameInput" /> - <h:inputText id="nameInput" value="${symbol_pound}{richBean.name}"> - <a4j:ajax event="keyup" render="output" /> - </h:inputText> - <h:panelGroup id="output"> - <h:outputText value="Hello ${symbol_pound}{richBean.name}!" - rendered="${symbol_pound}{not empty richBean.name}" /> - </h:panelGroup> - </h:form> - </ui:define> -</ui:composition> -</body> -</html> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/index.xhtml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,27 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"> + +<body> +<ui:composition template="/templates/template.xhtml"> + + <ui:define name="title">RichFaces GAE Sample</ui:define> + + <ui:define name="body"> + <h:form prependId="false"> + <h:outputLabel value="Name:" for="nameInput" /> + <h:inputText id="nameInput" value="${symbol_pound}{richBean.name}"> + <a4j:ajax event="keyup" render="output" /> + </h:inputText> + <h:panelGroup id="output"> + <h:outputText value="Hello ${symbol_pound}{richBean.name}!" + rendered="${symbol_pound}{not empty richBean.name}" /> + </h:panelGroup> + </h:form> + </ui:define> +</ui:composition> +</body> +</html> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates) Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,16 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" - xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"> - -<h:head> - <title><ui:define name="title">Application Title</ui:define></title> - <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> -</h:head> - -<h:body> - <ui:insert name="body">Default content</ui:insert> -</h:body> -</html> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp/templates/template.xhtml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,16 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" + xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:a4j="http://richfaces.org/a4j"> + +<h:head> + <title><ui:define name="title">Application Title</ui:define></title> + <meta http-equiv="content-type" content="text/xhtml; charset=UTF-8" /> +</h:head> + +<h:body> + <ui:insert name="body">Default content</ui:insert> +</h:body> +</html> Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae) Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF) Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,12 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0" encoding="utf-8"?> -<appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> - <application>rf-${artifactId}</application> - <version>1</version> - <sessions-enabled>true</sessions-enabled> - <system-properties> - <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties" /> - </system-properties> -</appengine-web-app> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,12 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="utf-8"?> +<appengine-web-app xmlns="http://appengine.google.com/ns/1.0"> + <application>rf-${artifactId}</application> + <version>1</version> + <sessions-enabled>true</sessions-enabled> + <system-properties> + <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties" /> + </system-properties> +</appengine-web-app> \ No newline at end of file Deleted: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2010-10-26 17:10:27 UTC (rev 19674) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,92 +0,0 @@ -#set( $symbol_pound = '#' ) -#set( $symbol_dollar = '$' ) -#set( $symbol_escape = '\' ) -<?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" - id="richfaces-showcase" version="2.5"> - <display-name>RichFaces 4 GAE application</display-name> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - </welcome-file-list> - <context-param> - <param-name>javax.faces.FACELETS_LIBRARIES</param-name> - <param-value>/WEB-INF/app-tags.taglib.xml</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinning</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.enableControlSkinningClasses</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.skin</param-name> - <param-value>blueSky</param-value> - </context-param> - <context-param> - <param-name>javax.faces.PROJECT_STAGE</param-name> - <param-value>Development</param-value> - </context-param> - <context-param> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>server</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.staticResourceLocation</param-name> - <param-value>${symbol_pound}{facesContext.externalContext.requestContextPath}/static-resources/${symbol_pound}{resourceLocation}</param-value> - </context-param> - - <context-param> - <param-name>org.ajax4jsf.cache.CACHE_MANAGER_FACTORY_CLASS</param-name> - <param-value>org.ajax4jsf.cache.lru.LRUMapCacheFactory</param-value> - </context-param> - - <context-param> - <description> - Set this flag to true if you want the JavaServer Faces - Reference Implementation to validate the XML in your - faces-config.xml resources against the DTD. Default - value is false. - </description> - <param-name>com.sun.faces.validateXml</param-name> - <param-value>true</param-value> - </context-param> - <!-- ***** Accommodate Single-Threaded Requirement of Google AppEngine --> - <context-param> - <description> - When enabled, the runtime initialization and default ResourceHandler - implementation will use threads to perform their functions. Set this - value to false if threads aren't desired (as in the case of running - within the Google Application Engine). - - Note that when this option is disabled, the ResourceHandler will not - pick up new versions of resources when ProjectStage is development. - </description> - <param-name>com.sun.faces.enableThreading</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <param-name>com.sun.faces.expressionFactory</param-name> - <param-value>com.sun.el.ExpressionFactoryImpl</param-value> - </context-param> - <context-param> - <param-name>org.richfaces.executeAWTInitializer</param-name> - <param-value>false</param-value> - </context-param> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>/faces/*</url-pattern> - </servlet-mapping> -</web-app> \ No newline at end of file Copied: branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml (from rev 19674, trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml) =================================================================== --- branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml (rev 0) +++ branches/RF-7817/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,92 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +<?xml version="1.0" encoding="UTF-8"?> +<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" + id="richfaces-showcase" version="2.5"> + <display-name>RichFaces 4 GAE application</display-name> + <welcome-file-list> + <welcome-file>index.jsp</welcome-file> + </welcome-file-list> + <context-param> + <param-name>javax.faces.FACELETS_LIBRARIES</param-name> + <param-value>/WEB-INF/app-tags.taglib.xml</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinning</param-name> + <param-value>true</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.enableControlSkinningClasses</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.skin</param-name> + <param-value>blueSky</param-value> + </context-param> + <context-param> + <param-name>javax.faces.PROJECT_STAGE</param-name> + <param-value>Development</param-value> + </context-param> + <context-param> + <param-name>javax.faces.STATE_SAVING_METHOD</param-name> + <param-value>server</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.staticResourceLocation</param-name> + <param-value>${symbol_pound}{facesContext.externalContext.requestContextPath}/static-resources/${symbol_pound}{resourceLocation}</param-value> + </context-param> + + <context-param> + <param-name>org.ajax4jsf.cache.CACHE_MANAGER_FACTORY_CLASS</param-name> + <param-value>org.ajax4jsf.cache.lru.LRUMapCacheFactory</param-value> + </context-param> + + <context-param> + <description> + Set this flag to true if you want the JavaServer Faces + Reference Implementation to validate the XML in your + faces-config.xml resources against the DTD. Default + value is false. + </description> + <param-name>com.sun.faces.validateXml</param-name> + <param-value>true</param-value> + </context-param> + <!-- ***** Accommodate Single-Threaded Requirement of Google AppEngine --> + <context-param> + <description> + When enabled, the runtime initialization and default ResourceHandler + implementation will use threads to perform their functions. Set this + value to false if threads aren't desired (as in the case of running + within the Google Application Engine). + + Note that when this option is disabled, the ResourceHandler will not + pick up new versions of resources when ProjectStage is development. + </description> + <param-name>com.sun.faces.enableThreading</param-name> + <param-value>false</param-value> + </context-param> + <context-param> + <param-name>com.sun.faces.expressionFactory</param-name> + <param-value>com.sun.el.ExpressionFactoryImpl</param-value> + </context-param> + <context-param> + <param-name>org.richfaces.executeAWTInitializer</param-name> + <param-value>false</param-value> + </context-param> + <servlet> + <servlet-name>Faces Servlet</servlet-name> + <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>*.jsf</url-pattern> + </servlet-mapping> + <servlet-mapping> + <servlet-name>Faces Servlet</servlet-name> + <url-pattern>/faces/*</url-pattern> + </servlet-mapping> +</web-app> \ No newline at end of file Modified: branches/RF-7817/archetypes/richfaces-archetype-simpleapp/pom.xml =================================================================== --- branches/RF-7817/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-27 16:03:48 UTC (rev 19702) +++ branches/RF-7817/archetypes/richfaces-archetype-simpleapp/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -34,6 +34,20 @@ <extensions>true</extensions> </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> + <filtering>false</filtering> + </resource> + <resource> + <directory>src/main/resources/META-INF/maven</directory> + <filtering>true</filtering> + <targetPath>META-INF/maven</targetPath> + </resource> + </resources> </build> <profiles> @@ -76,7 +90,7 @@ </build> </profile> </profiles> - + <scm> <connection>scm:svn:http://anonsvn.jboss.org/repos/richfaces/trunk/arch... <developerConnection>scm:svn:https://svn.jboss.org/repos/richfaces/trun... Modified: branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml =================================================================== --- branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-27 16:03:48 UTC (rev 19702) +++ branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/META-INF/maven/archetype-metadata.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -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: branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml =================================================================== --- branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-27 16:03:48 UTC (rev 19702) +++ branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/pom.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -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,11 +30,14 @@ <properties> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> - <org.richfaces.bom.version>4.0.0-SNAPSHOT</org.richfaces.bom.version> + <!-- Setting this property using archetype-metadata.xml requiredPorperty + so that generated project uses correct version of richfaces. + --> + <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> @@ -49,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> @@ -105,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> @@ -115,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> Copied: branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/RichBean.java (from rev 19674, trunk/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/RichBean.java) =================================================================== --- branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/RichBean.java (rev 0) +++ branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/java/RichBean.java 2010-10-27 16:17:45 UTC (rev 19703) @@ -0,0 +1,25 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) +package ${package}; + +import java.io.Serializable; + +public class RichBean implements Serializable { + + private static final long serialVersionUID = -2403138958014741653L; + private String name; + + public RichBean() { + System.out.println("post construct: initialize"); + name = "John"; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} Modified: branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml =================================================================== --- branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-10-27 16:03:48 UTC (rev 19702) +++ branches/RF-7817/archetypes/richfaces-archetype-simpleapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/faces-config.xml 2010-10-27 16:17:45 UTC (rev 19703) @@ -1,3 +1,6 @@ +#set( $symbol_pound = '#' ) +#set( $symbol_dollar = '$' ) +#set( $symbol_escape = '\' ) <?xml version="1.0"?> <faces-config version="2.0" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xi="http://www.w3.org/2001/XInclude" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_2_0.xsd"> @@ -4,7 +7,7 @@ <managed-bean> <managed-bean-name>richBean</managed-bean-name> - <managed-bean-class>org.richfaces.RichBean</managed-bean-class> + <managed-bean-class>${package}.RichBean</managed-bean-class> <managed-bean-scope>view</managed-bean-scope> </managed-bean> </faces-config>