[richfaces-svn-commits] JBoss Rich Faces SVN: r18520 - in root/sandbox/examples/richfaces-showcase-gae: src/main/java/org/richfaces and 1 other directories.

[richfaces-svn-commits at lists.jboss.org]

Author: nbelaevski
Date: 2010-08-09 13:48:08 -0400 (Mon, 09 Aug 2010)
New Revision: 18520

Removed:
   root/sandbox/examples/richfaces-showcase-gae/src/main/java/org/richfaces/resource/
Modified:
   root/sandbox/examples/richfaces-showcase-gae/pom.xml
   root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml
   root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml
Log:
GAE showcase switched to core implementation of external static resources

Modified: root/sandbox/examples/richfaces-showcase-gae/pom.xml
===================================================================
--- root/sandbox/examples/richfaces-showcase-gae/pom.xml	2010-08-09 17:47:05 UTC (rev 18519)
+++ root/sandbox/examples/richfaces-showcase-gae/pom.xml	2010-08-09 17:48:08 UTC (rev 18520)
@@ -215,7 +215,7 @@
                         </resource>
                         <resource>
                             <directory>${project.build.directory}/generated-resources</directory>
-                            <targetPath>resources</targetPath>
+                            <targetPath>static-resources</targetPath>
                         </resource>
                     </webResources>
                 </configuration>
@@ -244,17 +244,23 @@
                                 <skin>wine</skin>
                             </skins>
                             <includedContentTypes>
+                                <include>application/javascript</include>
+                                <include>text/css</include>
                                 <include>image/.+</include>
                             </includedContentTypes>
                             <fileNameMappings>
                                 <property>
-                                    <name>^org\.richfaces\.renderkit\.html\.(images\.)?</name>
-                                    <value>org.richfaces/images/</value>
+                                    <name>^\Qorg.richfaces.renderkit.html\E</name>
+                                    <value>org.richfaces/images</value>
                                 </property>
                                 <property>
-                                    <name>^org\.richfaces\.demo\.images\.</name>
-                                    <value>org.richfaces.demo/images/</value>
+                                    <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>

Modified: root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml	2010-08-09 17:47:05 UTC (rev 18519)
+++ root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/faces-config.xml	2010-08-09 17:48:08 UTC (rev 18520)
@@ -20,7 +20,4 @@
 		<managed-bean-class>org.richfaces.demo.outputPanel.OutputPanelBean</managed-bean-class>
 		<managed-bean-scope>request</managed-bean-scope>
 	</managed-bean>
-    <application>
-        <resource-handler>org.richfaces.resource.DictionaryResourceHandlerImpl</resource-handler>
-    </application>
 </faces-config>
\ No newline at end of file

Modified: root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml
===================================================================
--- root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml	2010-08-09 17:47:05 UTC (rev 18519)
+++ root/sandbox/examples/richfaces-showcase-gae/src/main/webapp/WEB-INF/web.xml	2010-08-09 17:48:08 UTC (rev 18520)
@@ -27,7 +27,13 @@
         <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
         <param-value>.xhtml</param-value>
     </context-param>
+    
     <context-param>
+        <param-name>org.richfaces.staticResourceLocation</param-name>
+        <param-value>#{facesContext.externalContext.requestContextPath}/static-resources/#{resourceLocation}</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