Author: nbelaevski Date: 2011-02-17 13:32:04 -0500 (Thu, 17 Feb 2011) New Revision: 21740 Removed: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/java-gae-jsf-ri/ Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml trunk/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/web.xml Log: https://issues.jboss.org/browse/RF-10452 Modified: trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml =================================================================== --- trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2011-02-17 17:44:39 UTC (rev 21739) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/pom.xml 2011-02-17 18:32:04 UTC (rev 21740) @@ -36,24 +36,6 @@ <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> @@ -105,6 +87,10 @@ <skin>ruby</skin> <skin>wine</skin> </skins> + <excludedFiles> + <exclude>^\Qorg.richfaces.renderkit.html.images.\E.*</exclude> + <exclude>^\Qorg.richfaces.renderkit.html.iconimages.\E.*</exclude> + </excludedFiles> <includedContentTypes> <include>application/javascript</include> <include>text/css</include> @@ -208,12 +194,12 @@ </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-api</artifactId> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-impl</artifactId> + <groupId>org.apache.myfaces.core</groupId> + <artifactId>myfaces-impl</artifactId> </dependency> <dependency> <groupId>javax.servlet</groupId> Modified: trunk/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 2011-02-17 17:44:39 UTC (rev 21739) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/appengine-web.xml 2011-02-17 18:32:04 UTC (rev 21740) @@ -9,4 +9,8 @@ <system-properties> <property name="java.util.logging.config.file" value="WEB-INF/classes/logging.properties" /> </system-properties> + + <resource-files> + <exclude path="/static-resources/**" /> + </resource-files> </appengine-web-app> \ No newline at end of file Modified: trunk/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 2011-02-17 17:44:39 UTC (rev 21739) +++ trunk/archetypes/rf-gae-sample/src/main/resources/archetype-resources/src/main/webapp-gae/WEB-INF/web.xml 2011-02-17 18:32:04 UTC (rev 21740) @@ -35,6 +35,18 @@ <param-value>client</param-value> </context-param> <context-param> + <param-name>org.apache.myfaces.SECRET</param-name> + <param-value>UmljaEZhY2VzVGVtcEtleQ==</param-value> + </context-param> + <context-param> + <param-name>org.apache.myfaces.MAC_SECRET</param-name> + <param-value>UmljaEZhY2VzVGVtcEtleQ==</param-value> + </context-param> + <context-param> + <param-name>org.apache.myfaces.algorithm</param-name> + <param-value>Blowfish</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> @@ -44,32 +56,17 @@ <param-value>org.ajax4jsf.cache.lru.LRUMapCacheFactory</param-value> </context-param> + <!-- + We need to set annotation lifecycyle provider manually as org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider. + Other providers use some classes that are restricted on Google App Engine. + --> <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> + <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name> + <param-value>org.apache.myfaces.config.annotation.NoInjectionAnnotationLifecycleProvider</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-name>org.apache.myfaces.EXPRESSION_FACTORY</param-name> <param-value>com.sun.el.ExpressionFactoryImpl</param-value> </context-param> <context-param>