You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/03/18 22:57:38 UTC

svn commit: r1083088 [3/9] - in /myfaces/portlet-bridge/core/trunk_3.0.x: ./ api/ api/src/main/java/javax/portlet/faces/ api/src/main/java/javax/portlet/faces/annotation/ api/src/main/java/javax/portlet/faces/component/ api/src/main/java/javax/portlet/...

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Fri Mar 18 21:57:31 2011
@@ -1,240 +1,240 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-
-<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
-<web-app 
-   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" 
-   metadata-complete="true"
-   version="2.5"> 
-
-  <context-param>
-    <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
-    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
-  </context-param>
-  
-  <!-- Listeners -->
-  <listener>
-    <listener-class>
-      com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener
-    </listener-class>
-  </listener>
-  
-  <listener>
-    <listener-class>
-      com.bekk.boss.pluto.embedded.util.PortalStartupListener
-    </listener-class>
-  </listener>
-
-  <!-- Filters and Mappings -->
-  <filter>
-    <filter-name>plutoResourceFilter</filter-name>
-    <filter-class>com.bekk.boss.pluto.embedded.util.PlutResourcesFilter</filter-class>
-  </filter>
-
-  <filter>
-    <filter-name>plutoPortalDriver</filter-name>
-    <filter-class>com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter</filter-class>
-  </filter>
-	
-  <filter-mapping>
-    <filter-name>plutoResourceFilter</filter-name>
-    <url-pattern>*.css</url-pattern>
-    <url-pattern>*.gif</url-pattern>
-    <url-pattern>*.png</url-pattern>
-    <url-pattern>*.js</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/jettypluto/index.jsp</url-pattern>
-    <url-pattern>/jettypluto/index.jsp/*</url-pattern>
-  </filter-mapping>
-
-  <!-- Servlets and Mappings -->
-
-  <!--
-    The default servlet.                                                  
-    This servlet, normally mapped to /, provides the handling for static  
-    content, OPTIONS and TRACE methods for the context.                   
-    The following initParameters are supported:                           
-                                                                          
-      acceptRanges     If true, range requests and responses are          
-                       supported                                          
-                                                                          
-      dirAllowed       If true, directory listings are returned if no     
-                       welcome file is found. Else 403 Forbidden.         
-                                                                          
-      redirectWelcome  If true, redirect welcome file requests            
-                       else use request dispatcher forwards               
-                                                                          
-      gzip             If set to true, then static content will be served  
-                       as gzip content encoded if a matching resource is  
-                       found ending with ".gz"                            
-                                                                          
-      resoureBase      Can be set to replace the context resource base    
-                                                                          
-      relativeResourceBase                                                
-                       Set with a pathname relative to the base of the    
-                       servlet context root. Useful for only serving      
-                       static content from only specific subdirectories.  
-                                                                          
-      useFileMappedBuffer                                                 
-                       If set to true (the default), a  memory mapped     
-                       file buffer will be used to serve static content   
-                       when using an NIO connector. Setting this value    
-                       to false means that a direct buffer will be used   
-                       instead. If you are having trouble with Windows    
-                       file locking, set this to false.                   
-                                                                          
-     cacheControl      If set, all static content will have this value    
-                       set as the cache-control header.                   
-                                                                          
-     maxCacheSize      Maximum size of the static resource cache          
-                                                                          
-     maxCachedFileSize Maximum size of any single file in the cache       
-                                                                          
-     maxCachedFiles    Maximum number of files in the cache               
-  -->
-
-  <servlet>
-    <servlet-name>default</servlet-name>
-    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
-    <init-param>
-      <param-name>acceptRanges</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>dirAllowed</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>redirectWelcome</param-name>
-      <param-value>false</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCacheSize</param-name>
-      <param-value>4000000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFileSize</param-name>
-      <param-value>254000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>maxCachedFiles</param-name>
-      <param-value>1000</param-value>
-    </init-param>
-    <init-param>
-      <param-name>gzip</param-name>
-      <param-value>true</param-value>
-    </init-param>
-    <init-param>
-      <param-name>useFileMappedBuffer</param-name>
-      <param-value>true</param-value>
-    </init-param>  
-    <load-on-startup>0</load-on-startup>
-  </servlet> 
-
-  <servlet id="jsp">
-    <servlet-name>jsp</servlet-name>
-    <servlet-class>com.bekk.boss.pluto.embedded.util.PortletJspServlet</servlet-class>
-    <init-param>
-        <param-name>logVerbosityLevel</param-name>
-        <param-value>DEBUG</param-value>
-    </init-param>
-    <init-param>
-        <param-name>fork</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <init-param>
-        <param-name>xpoweredBy</param-name>
-        <param-value>false</param-value>
-    </init-param>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping> 
-    <servlet-name>jsp</servlet-name> 
-    <url-pattern>*.jsp</url-pattern> 
-    <url-pattern>*.jspf</url-pattern>
-    <url-pattern>*.jspx</url-pattern>
-    <url-pattern>*.xsp</url-pattern>
-    <url-pattern>*.JSP</url-pattern> 
-    <url-pattern>*.JSPF</url-pattern>
-    <url-pattern>*.JSPX</url-pattern>
-    <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-
-  <!-- Other settings -->
-  <session-config>
-    <session-timeout>60</session-timeout>
-  </session-config>
-
-	
-  <locale-encoding-mapping-list>
-    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
-    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
-    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
-  </locale-encoding-mapping-list>
-</web-app>
-
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+	   
+-->
+
+<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
+<web-app 
+   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" 
+   metadata-complete="true"
+   version="2.5"> 
+
+  <context-param>
+    <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
+    <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
+  </context-param>
+  
+  <!-- Listeners -->
+  <listener>
+    <listener-class>
+      com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener
+    </listener-class>
+  </listener>
+  
+  <listener>
+    <listener-class>
+      com.bekk.boss.pluto.embedded.util.PortalStartupListener
+    </listener-class>
+  </listener>
+
+  <!-- Filters and Mappings -->
+  <filter>
+    <filter-name>plutoResourceFilter</filter-name>
+    <filter-class>com.bekk.boss.pluto.embedded.util.PlutResourcesFilter</filter-class>
+  </filter>
+
+  <filter>
+    <filter-name>plutoPortalDriver</filter-name>
+    <filter-class>com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter</filter-class>
+  </filter>
+	
+  <filter-mapping>
+    <filter-name>plutoResourceFilter</filter-name>
+    <url-pattern>*.css</url-pattern>
+    <url-pattern>*.gif</url-pattern>
+    <url-pattern>*.png</url-pattern>
+    <url-pattern>*.js</url-pattern>
+  </filter-mapping>
+
+  <filter-mapping>
+    <filter-name>plutoPortalDriver</filter-name>
+    <url-pattern>/jettypluto/index.jsp</url-pattern>
+    <url-pattern>/jettypluto/index.jsp/*</url-pattern>
+  </filter-mapping>
+
+  <!-- Servlets and Mappings -->
+
+  <!--
+    The default servlet.                                                  
+    This servlet, normally mapped to /, provides the handling for static  
+    content, OPTIONS and TRACE methods for the context.                   
+    The following initParameters are supported:                           
+                                                                          
+      acceptRanges     If true, range requests and responses are          
+                       supported                                          
+                                                                          
+      dirAllowed       If true, directory listings are returned if no     
+                       welcome file is found. Else 403 Forbidden.         
+                                                                          
+      redirectWelcome  If true, redirect welcome file requests            
+                       else use request dispatcher forwards               
+                                                                          
+      gzip             If set to true, then static content will be served  
+                       as gzip content encoded if a matching resource is  
+                       found ending with ".gz"                            
+                                                                          
+      resoureBase      Can be set to replace the context resource base    
+                                                                          
+      relativeResourceBase                                                
+                       Set with a pathname relative to the base of the    
+                       servlet context root. Useful for only serving      
+                       static content from only specific subdirectories.  
+                                                                          
+      useFileMappedBuffer                                                 
+                       If set to true (the default), a  memory mapped     
+                       file buffer will be used to serve static content   
+                       when using an NIO connector. Setting this value    
+                       to false means that a direct buffer will be used   
+                       instead. If you are having trouble with Windows    
+                       file locking, set this to false.                   
+                                                                          
+     cacheControl      If set, all static content will have this value    
+                       set as the cache-control header.                   
+                                                                          
+     maxCacheSize      Maximum size of the static resource cache          
+                                                                          
+     maxCachedFileSize Maximum size of any single file in the cache       
+                                                                          
+     maxCachedFiles    Maximum number of files in the cache               
+  -->
+
+  <servlet>
+    <servlet-name>default</servlet-name>
+    <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
+    <init-param>
+      <param-name>acceptRanges</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>dirAllowed</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>redirectWelcome</param-name>
+      <param-value>false</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCacheSize</param-name>
+      <param-value>4000000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFileSize</param-name>
+      <param-value>254000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>maxCachedFiles</param-name>
+      <param-value>1000</param-value>
+    </init-param>
+    <init-param>
+      <param-name>gzip</param-name>
+      <param-value>true</param-value>
+    </init-param>
+    <init-param>
+      <param-name>useFileMappedBuffer</param-name>
+      <param-value>true</param-value>
+    </init-param>  
+    <load-on-startup>0</load-on-startup>
+  </servlet> 
+
+  <servlet id="jsp">
+    <servlet-name>jsp</servlet-name>
+    <servlet-class>com.bekk.boss.pluto.embedded.util.PortletJspServlet</servlet-class>
+    <init-param>
+        <param-name>logVerbosityLevel</param-name>
+        <param-value>DEBUG</param-value>
+    </init-param>
+    <init-param>
+        <param-name>fork</param-name>
+        <param-value>false</param-value>
+    </init-param>
+    <init-param>
+        <param-name>xpoweredBy</param-name>
+        <param-value>false</param-value>
+    </init-param>
+    <load-on-startup>0</load-on-startup>
+  </servlet>
+
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping> 
+    <servlet-name>jsp</servlet-name> 
+    <url-pattern>*.jsp</url-pattern> 
+    <url-pattern>*.jspf</url-pattern>
+    <url-pattern>*.jspx</url-pattern>
+    <url-pattern>*.xsp</url-pattern>
+    <url-pattern>*.JSP</url-pattern> 
+    <url-pattern>*.JSPF</url-pattern>
+    <url-pattern>*.JSPX</url-pattern>
+    <url-pattern>*.XSP</url-pattern>
+  </servlet-mapping>
+
+  <!-- Other settings -->
+  <session-config>
+    <session-timeout>60</session-timeout>
+  </session-config>
+
+	
+  <locale-encoding-mapping-list>
+    <locale-encoding-mapping><locale>ar</locale><encoding>ISO-8859-6</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>be</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>bg</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ca</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>cs</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>da</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>de</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>el</locale><encoding>ISO-8859-7</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>en</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>es</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>et</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>fi</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>fr</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>hr</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>hu</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>is</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>it</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>iw</locale><encoding>ISO-8859-8</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ja</locale><encoding>Shift_JIS</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ko</locale><encoding>EUC-KR</encoding></locale-encoding-mapping>     
+    <locale-encoding-mapping><locale>lt</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>lv</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>mk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>nl</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>no</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>pl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>pt</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ro</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>ru</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sh</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sk</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sl</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sq</locale><encoding>ISO-8859-2</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sr</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>sv</locale><encoding>ISO-8859-1</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>tr</locale><encoding>ISO-8859-9</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>uk</locale><encoding>ISO-8859-5</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>zh</locale><encoding>GB2312</encoding></locale-encoding-mapping>
+    <locale-encoding-mapping><locale>zh_TW</locale><encoding>Big5</encoding></locale-encoding-mapping>   
+  </locale-encoding-mapping-list>
+</web-app>
+

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml Fri Mar 18 21:57:31 2011
@@ -1,51 +1,51 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific xml:language governing permissions and limitations
-    under the License.	   
--->
-<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"             
-                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"             
-                   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd
-                                       http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
-                   id="BridgeCarDemo" version="2.0">
-
-  <portlet>
-    <description>MyFaces Portlet Bridge CarDemo Portlet</description>
-    <portlet-name>portlet-bridge-carstore</portlet-name>
-    <display-name>MyFaces Portlet Bridge CarDemo</display-name>
-    <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
-
-    <init-param>
-      <name>javax.portlet.faces.defaultViewId.view</name>
-      <value>/chooseLocale.jsp</value>
-    </init-param>
-
-
-    <supports>
-      <mime-type>text/html</mime-type>
-      <portlet-mode>view</portlet-mode>
-    </supports>
-
-    <supported-locale>en</supported-locale>
-
-    <portlet-info>
-      <title>MyFaces Portlet Bridge Demo</title>
-      <short-title>Bridge Demo</short-title>
-    </portlet-info>
-  </portlet>
-  
-</portlet-app>
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific xml:language governing permissions and limitations
+    under the License.	   
+-->
+<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"             
+                   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"             
+                   xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd
+                                       http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
+                   id="BridgeCarDemo" version="2.0">
+
+  <portlet>
+    <description>MyFaces Portlet Bridge CarDemo Portlet</description>
+    <portlet-name>portlet-bridge-carstore</portlet-name>
+    <display-name>MyFaces Portlet Bridge CarDemo</display-name>
+    <portlet-class>javax.portlet.faces.GenericFacesPortlet</portlet-class>
+
+    <init-param>
+      <name>javax.portlet.faces.defaultViewId.view</name>
+      <value>/chooseLocale.jsp</value>
+    </init-param>
+
+
+    <supports>
+      <mime-type>text/html</mime-type>
+      <portlet-mode>view</portlet-mode>
+    </supports>
+
+    <supported-locale>en</supported-locale>
+
+    <portlet-info>
+      <title>MyFaces Portlet Bridge Demo</title>
+      <short-title>Bridge Demo</short-title>
+    </portlet-info>
+  </portlet>
+  
+</portlet-app>

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/portlet.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/WEB-INF/web.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/bottomMatter.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp Fri Mar 18 21:57:31 2011
@@ -1,98 +1,98 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<!--
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<%@ page contentType="text/html"
-         isELIgnored="false" %>
-
-<html>
-
-<head>
-    <meta http-equiv="Content-Type" content="text/html;CHARSET=iso-8859-1">
-    <title>CarStore</title>
-    <link rel="stylesheet" type="text/css"
-          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
-</head>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-
-<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
-
-<body bgcolor="white">
-
-<f:view>
-
-    <h:form>
-
-
-        <!-- non-option details -->
-
-        <h:panelGrid columns="1"
-                     summary="#{bundle.carDetails}"
-                     title="#{bundle.carDetails}">
-
-            <h:graphicImage url="/images/cardemo.jpg"/>
-
-            <h:graphicImage
-                  binding="#{carstore.currentModel.components.image}"/>
-
-            <h:outputText styleClass="subtitlebig"
-                          binding="#{carstore.currentModel.components.title}"/>
-
-            <h:outputText
-                  binding="#{carstore.currentModel.components.description}"/>
-
-            <h:panelGrid columns="2">
-
-                <h:outputText styleClass="subtitle"
-                              value="#{bundle.basePriceLabel}"/>
-
-                <h:outputText
-                      binding="#{carstore.currentModel.components.basePrice}"/>
-
-                <h:outputText styleClass="subtitle"
-                              value="#{bundle.yourPriceLabel}"/>
-
-                <h:outputText value="#{carstore.currentModel.currentPrice}"/>
-
-            </h:panelGrid>
-
-            <h:commandButton action="#{carstore.buyCurrentCar}"
-                             value="#{bundle.buy}"/>
-
-        </h:panelGrid>
-
-        <jsp:include page="optionsPanel.jsp"/>
-
-        <h:commandButton value="#{bundle.recalculate}"
-                         action="#{carstore.currentModel.updatePricing}"/>
-
-        <h:commandButton action="#{carstore.buyCurrentCar}"
-                         value="#{bundle.buy}"/>
-
-    </h:form>
-
-    <jsp:include page="bottomMatter.jsp"/>
-
-</f:view>
-</body>
-
-</html>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
+
+<!--
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+
+<html>
+
+<head>
+    <meta http-equiv="Content-Type" content="text/html;CHARSET=iso-8859-1">
+    <title>CarStore</title>
+    <link rel="stylesheet" type="text/css"
+          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
+</head>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
+<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
+
+<body bgcolor="white">
+
+<f:view>
+
+    <h:form>
+
+
+        <!-- non-option details -->
+
+        <h:panelGrid columns="1"
+                     summary="#{bundle.carDetails}"
+                     title="#{bundle.carDetails}">
+
+            <h:graphicImage url="/images/cardemo.jpg"/>
+
+            <h:graphicImage
+                  binding="#{carstore.currentModel.components.image}"/>
+
+            <h:outputText styleClass="subtitlebig"
+                          binding="#{carstore.currentModel.components.title}"/>
+
+            <h:outputText
+                  binding="#{carstore.currentModel.components.description}"/>
+
+            <h:panelGrid columns="2">
+
+                <h:outputText styleClass="subtitle"
+                              value="#{bundle.basePriceLabel}"/>
+
+                <h:outputText
+                      binding="#{carstore.currentModel.components.basePrice}"/>
+
+                <h:outputText styleClass="subtitle"
+                              value="#{bundle.yourPriceLabel}"/>
+
+                <h:outputText value="#{carstore.currentModel.currentPrice}"/>
+
+            </h:panelGrid>
+
+            <h:commandButton action="#{carstore.buyCurrentCar}"
+                             value="#{bundle.buy}"/>
+
+        </h:panelGrid>
+
+        <jsp:include page="optionsPanel.jsp"/>
+
+        <h:commandButton value="#{bundle.recalculate}"
+                         action="#{carstore.currentModel.updatePricing}"/>
+
+        <h:commandButton action="#{carstore.buyCurrentCar}"
+                         value="#{bundle.buy}"/>
+
+    </h:form>
+
+    <jsp:include page="bottomMatter.jsp"/>
+
+</f:view>
+</body>
+
+</html>

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/carDetail.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp Fri Mar 18 21:57:31 2011
@@ -1,168 +1,168 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<%@ page contentType="text/html"
-         isELIgnored="false" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-<%@ taglib uri="http://java.sun.com/blueprints/ui" prefix="d" %>
-
-
-<html>
-<head>
-    <title>CarStore</title>
-
-    <link rel="stylesheet" type="text/css"
-          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>"> 
-</head>
-
-
-<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
-
-<f:view>
-<h:form>
-
-    <h:panelGrid columns="1"
-                 footerClass="form-footer"
-                 headerClass="form-header"
-                 styleClass="main-background"
-                 columnClasses="single-column"
-                 summary="#{bundle.chooseLocale}"
-                 title="#{bundle.chooseLocale}">
-
-        <h:graphicImage url="/images/cardemo.jpg"/>
-
-        <h:outputText styleClass="maintitle"
-                      value="#{bundle.chooseLocale}"/>
-
-        <h:graphicImage id="mapImage" url="/images/world.jpg"
-                        alt="#{bundle.chooseLocale}"
-                        usemap="#worldMap"/>
-
-        <d:map id="worldMap" current="NAmericas" immediate="true"
-               action="storeFront"
-               actionListener="#{carstore.chooseLocaleFromMap}">
-            <d:area id="NAmerica" value="#{NA}"
-                    onmouseover="/images/world_namer.jpg"
-                    onmouseout="/images/world.jpg"
-                    targetImage="mapImage"/>
-            <d:area id="SAmerica" value="#{SA}"
-                    onmouseover="/images/world_samer.jpg"
-                    onmouseout="/images/world.jpg"
-                    targetImage="mapImage"/>
-            <d:area id="Germany" value="#{gerA}"
-                    onmouseover="/images/world_germany.jpg"
-                    onmouseout="/images/world.jpg"
-                    targetImage="mapImage"/>
-            <d:area id="France" value="#{fraA}"
-                    onmouseover="/images/world_france.jpg"
-                    onmouseout="/images/world.jpg"
-                    targetImage="mapImage"/>
-        </d:map>
-
-    </h:panelGrid>
-
-</h:form>
-
-
-<h:form>
-
-    <!-- For non graphical browsers -->
-
-    <p>Example of <code>commandLink</code></p>
-
-    <h:panelGrid id="links" columns="4"
-                 summary="#{bundle.chooseLocale}"
-                 title="#{bundle.chooseLocale}">
-
-        <h:commandLink id="NAmerica" action="storeFront"
-                       actionListener="#{carstore.chooseLocaleFromLink}">
-
-            <h:outputText value="#{bundle.english}"/>
-
-        </h:commandLink>
-
-        <h:commandLink id="Germany" action="storeFront"
-                       actionListener="#{carstore.chooseLocaleFromLink}">
-
-            <h:outputText value="#{bundle.german}"/>
-
-        </h:commandLink>
-
-        <h:commandLink id="France" action="storeFront"
-                       actionListener="#{carstore.chooseLocaleFromLink}">
-
-            <h:outputText value="#{bundle.french}"/>
-
-        </h:commandLink>
-
-        <h:commandLink id="SAmerica" action="storeFront"
-                       actionListener="#{carstore.chooseLocaleFromLink}">
-
-            <h:outputText value="#{bundle.spanish}"/>
-
-        </h:commandLink>
-
-    </h:panelGrid>
-
-</h:form>
-
-<h:form>
-
-    <p>Example of <code>commandButton</code></p>
-
-    <h:panelGrid id="buttons" columns="4"
-                 summary="#{bundle.chooseLocale}"
-                 title="#{bundle.chooseLocale}">
-
-        <h:commandButton id="NAmerica" action="storeFront"
-                         value="#{bundle.english}"
-                         actionListener="#{carstore.chooseLocaleFromLink}">
-
-        </h:commandButton>
-
-        <h:commandButton id="Germany" action="storeFront"
-                         value="#{bundle.german}"
-                         actionListener="#{carstore.chooseLocaleFromLink}">
-
-        </h:commandButton>
-
-        <h:commandButton id="France" action="storeFront"
-                         value="#{bundle.french}"
-                         actionListener="#{carstore.chooseLocaleFromLink}">
-
-        </h:commandButton>
-
-        <h:commandButton id="SAmerica" action="storeFront"
-                         value="#{bundle.spanish}"
-                         actionListener="#{carstore.chooseLocaleFromLink}">
-
-        </h:commandButton>
-
-    </h:panelGrid>
-
-
-</h:form>
-
-<jsp:include page="bottomMatter.jsp"/>
-
-</f:view>
-
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+<%@ taglib uri="http://java.sun.com/blueprints/ui" prefix="d" %>
+
+
+<html>
+<head>
+    <title>CarStore</title>
+
+    <link rel="stylesheet" type="text/css"
+          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>"> 
+</head>
+
+
+<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
+
+<f:view>
+<h:form>
+
+    <h:panelGrid columns="1"
+                 footerClass="form-footer"
+                 headerClass="form-header"
+                 styleClass="main-background"
+                 columnClasses="single-column"
+                 summary="#{bundle.chooseLocale}"
+                 title="#{bundle.chooseLocale}">
+
+        <h:graphicImage url="/images/cardemo.jpg"/>
+
+        <h:outputText styleClass="maintitle"
+                      value="#{bundle.chooseLocale}"/>
+
+        <h:graphicImage id="mapImage" url="/images/world.jpg"
+                        alt="#{bundle.chooseLocale}"
+                        usemap="#worldMap"/>
+
+        <d:map id="worldMap" current="NAmericas" immediate="true"
+               action="storeFront"
+               actionListener="#{carstore.chooseLocaleFromMap}">
+            <d:area id="NAmerica" value="#{NA}"
+                    onmouseover="/images/world_namer.jpg"
+                    onmouseout="/images/world.jpg"
+                    targetImage="mapImage"/>
+            <d:area id="SAmerica" value="#{SA}"
+                    onmouseover="/images/world_samer.jpg"
+                    onmouseout="/images/world.jpg"
+                    targetImage="mapImage"/>
+            <d:area id="Germany" value="#{gerA}"
+                    onmouseover="/images/world_germany.jpg"
+                    onmouseout="/images/world.jpg"
+                    targetImage="mapImage"/>
+            <d:area id="France" value="#{fraA}"
+                    onmouseover="/images/world_france.jpg"
+                    onmouseout="/images/world.jpg"
+                    targetImage="mapImage"/>
+        </d:map>
+
+    </h:panelGrid>
+
+</h:form>
+
+
+<h:form>
+
+    <!-- For non graphical browsers -->
+
+    <p>Example of <code>commandLink</code></p>
+
+    <h:panelGrid id="links" columns="4"
+                 summary="#{bundle.chooseLocale}"
+                 title="#{bundle.chooseLocale}">
+
+        <h:commandLink id="NAmerica" action="storeFront"
+                       actionListener="#{carstore.chooseLocaleFromLink}">
+
+            <h:outputText value="#{bundle.english}"/>
+
+        </h:commandLink>
+
+        <h:commandLink id="Germany" action="storeFront"
+                       actionListener="#{carstore.chooseLocaleFromLink}">
+
+            <h:outputText value="#{bundle.german}"/>
+
+        </h:commandLink>
+
+        <h:commandLink id="France" action="storeFront"
+                       actionListener="#{carstore.chooseLocaleFromLink}">
+
+            <h:outputText value="#{bundle.french}"/>
+
+        </h:commandLink>
+
+        <h:commandLink id="SAmerica" action="storeFront"
+                       actionListener="#{carstore.chooseLocaleFromLink}">
+
+            <h:outputText value="#{bundle.spanish}"/>
+
+        </h:commandLink>
+
+    </h:panelGrid>
+
+</h:form>
+
+<h:form>
+
+    <p>Example of <code>commandButton</code></p>
+
+    <h:panelGrid id="buttons" columns="4"
+                 summary="#{bundle.chooseLocale}"
+                 title="#{bundle.chooseLocale}">
+
+        <h:commandButton id="NAmerica" action="storeFront"
+                         value="#{bundle.english}"
+                         actionListener="#{carstore.chooseLocaleFromLink}">
+
+        </h:commandButton>
+
+        <h:commandButton id="Germany" action="storeFront"
+                         value="#{bundle.german}"
+                         actionListener="#{carstore.chooseLocaleFromLink}">
+
+        </h:commandButton>
+
+        <h:commandButton id="France" action="storeFront"
+                         value="#{bundle.french}"
+                         actionListener="#{carstore.chooseLocaleFromLink}">
+
+        </h:commandButton>
+
+        <h:commandButton id="SAmerica" action="storeFront"
+                         value="#{bundle.spanish}"
+                         actionListener="#{carstore.chooseLocaleFromLink}">
+
+        </h:commandButton>
+
+    </h:panelGrid>
+
+
+</h:form>
+
+<jsp:include page="bottomMatter.jsp"/>
+
+</f:view>
+
+</html>

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/chooseLocale.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp Fri Mar 18 21:57:31 2011
@@ -1,144 +1,144 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<%@ page contentType="text/html"
-         isELIgnored="false" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-
-<html>
-
-<head>
-    <title>Welcome to CarStore</title>
-    <link rel="stylesheet" type="text/css"
-          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
-</head>
-
-<body bgcolor="white">
-
-<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
-<f:view>
-    <h:form>
-
-        <h:panelGrid id="mainPanel" columns="1" footerClass="subtitle"
-                     styleClass="medium" columnClasses="medium">
-
-            <h:graphicImage url="/images/cardemo.jpg"/>
-            <h:outputText binding="#{carstore.currentModel.components.title}"/>
-
-            <h:panelGrid columns="2" footerClass="subtitle"
-                         headerClass="subtitlebig" styleClass="medium"
-                         columnClasses="subtitle,medium">
-
-                <f:facet name="header">
-                    <h:outputText value="#{bundle.buyTitle}"/>
-                </f:facet>
-
-                <h:outputText value="#{bundle.Engine}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.engine}"/>
-
-                <h:outputText value="#{bundle.Brakes}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.brake}"/>
-
-                <h:outputText value="#{bundle.Suspension}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.suspension}"/>
-
-                <h:outputText value="#{bundle.Speakers}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.speaker}"/>
-
-                <h:outputText value="#{bundle.Audio}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.audio}"/>
-
-                <h:outputText value="#{bundle.Transmission}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.transmission}"/>
-
-                <h:outputText value="#{bundle.sunroofLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.sunroof}"/>
-
-                <h:outputText value="#{bundle.cruiseLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.cruisecontrol}"/>
-
-                <h:outputText value="#{bundle.keylessLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.keylessentry}"/>
-
-                <h:outputText value="#{bundle.securityLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.securitySystem}"/>
-
-                <h:outputText value="#{bundle.skiRackLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.skiRack}"/>
-
-                <h:outputText value="#{bundle.towPkgLabel}"/>
-
-                <h:outputText
-                      value="#{carstore.currentModel.attributes.towPackage}"/>
-
-                <h:outputText value="#{bundle.gpsLabel}"/>
-
-                <h:outputText value="#{carstore.currentModel.attributes.gps}"/>
-
-                <f:facet name="footer">
-                    <h:panelGroup>
-                        <h:outputText value="#{bundle.yourPriceLabel}"/>
-                        &nbsp;
-                        <h:outputText
-                              value="#{carstore.currentModel.currentPrice}"/>
-                    </h:panelGroup>
-                </f:facet>
-
-            </h:panelGrid>
-
-            <h:panelGroup>
-                <h:commandButton value="#{bundle.buy}" action="customerInfo"
-                                 title="#{bundle.buy}"/>
-                <h:commandButton value="#{bundle.back}" action="carDetail"
-                                 title="#{bundle.back}"/>
-            </h:panelGroup>
-
-        </h:panelGrid>
-    </h:form>
-    <jsp:include page="bottomMatter.jsp"/>
-</f:view>
-
-</body>
-</html>
-
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
+<html>
+
+<head>
+    <title>Welcome to CarStore</title>
+    <link rel="stylesheet" type="text/css"
+          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
+</head>
+
+<body bgcolor="white">
+
+<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
+<f:view>
+    <h:form>
+
+        <h:panelGrid id="mainPanel" columns="1" footerClass="subtitle"
+                     styleClass="medium" columnClasses="medium">
+
+            <h:graphicImage url="/images/cardemo.jpg"/>
+            <h:outputText binding="#{carstore.currentModel.components.title}"/>
+
+            <h:panelGrid columns="2" footerClass="subtitle"
+                         headerClass="subtitlebig" styleClass="medium"
+                         columnClasses="subtitle,medium">
+
+                <f:facet name="header">
+                    <h:outputText value="#{bundle.buyTitle}"/>
+                </f:facet>
+
+                <h:outputText value="#{bundle.Engine}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.engine}"/>
+
+                <h:outputText value="#{bundle.Brakes}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.brake}"/>
+
+                <h:outputText value="#{bundle.Suspension}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.suspension}"/>
+
+                <h:outputText value="#{bundle.Speakers}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.speaker}"/>
+
+                <h:outputText value="#{bundle.Audio}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.audio}"/>
+
+                <h:outputText value="#{bundle.Transmission}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.transmission}"/>
+
+                <h:outputText value="#{bundle.sunroofLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.sunroof}"/>
+
+                <h:outputText value="#{bundle.cruiseLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.cruisecontrol}"/>
+
+                <h:outputText value="#{bundle.keylessLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.keylessentry}"/>
+
+                <h:outputText value="#{bundle.securityLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.securitySystem}"/>
+
+                <h:outputText value="#{bundle.skiRackLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.skiRack}"/>
+
+                <h:outputText value="#{bundle.towPkgLabel}"/>
+
+                <h:outputText
+                      value="#{carstore.currentModel.attributes.towPackage}"/>
+
+                <h:outputText value="#{bundle.gpsLabel}"/>
+
+                <h:outputText value="#{carstore.currentModel.attributes.gps}"/>
+
+                <f:facet name="footer">
+                    <h:panelGroup>
+                        <h:outputText value="#{bundle.yourPriceLabel}"/>
+                        &nbsp;
+                        <h:outputText
+                              value="#{carstore.currentModel.currentPrice}"/>
+                    </h:panelGroup>
+                </f:facet>
+
+            </h:panelGrid>
+
+            <h:panelGroup>
+                <h:commandButton value="#{bundle.buy}" action="customerInfo"
+                                 title="#{bundle.buy}"/>
+                <h:commandButton value="#{bundle.back}" action="carDetail"
+                                 title="#{bundle.back}"/>
+            </h:panelGroup>
+
+        </h:panelGrid>
+    </h:form>
+    <jsp:include page="bottomMatter.jsp"/>
+</f:view>
+
+</body>
+</html>
+

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/confirmChoices.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp Fri Mar 18 21:57:31 2011
@@ -1,205 +1,205 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<%@ page contentType="text/html"
-         isELIgnored="false" %>
-
-<html>
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-    <title>Customer Details</title>
-    <link rel="stylesheet" type="text/css"
-          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
-
-    <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-    <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-    <%@ taglib uri="https://javaserverfaces.dev.java.net/demo/carstore"
-               prefix="cs" %>
-</head>
-
-<body>
-
-<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
-
-<f:view>
-<h:form>
-
-<h:panelGrid id="mainPanel" columns="1" footerClass="subtitle"
-             headerClass="subtitlebig" styleClass="medium"
-             columnClasses="medium">
-
-<h:graphicImage url="/images/cardemo.jpg"/>
-
-<h:outputText value="#{bundle.customerTitle}"/>
-
-<h:panelGrid id="subPanel" columns="3" footerClass="medium"
-             headerClass="subtitlebig" styleClass="medium"
-             columnClasses="medium">
-
-<h:outputText value="#{bundle.titleLabel}"/>
-<h:selectOneMenu id="title" value="#{customer.currentTitle}">
-    <f:selectItems value="#{customer.titleOptions}"/>
-</h:selectOneMenu>
-<h:outputText value=""/>
-
-<h:outputText value="#{bundle.firstLabel}"/>
-<h:inputText id="firstName" value="#{customer.firstName}" required="true">
-    <f:valueChangeListener type="carstore.FirstNameChanged"/>
-</h:inputText>
-<h:message styleClass="validationMessage" for="firstName"/>
-
-<h:outputText value="#{bundle.middleLabel}"/>
-<h:inputText id="middleInitial" size="1" maxlength="1"
-             value="#{customer.middleInitial}">
-</h:inputText>
-<h:message styleClass="validationMessage" for="middleInitial"/>
-
-<h:outputText value="#{bundle.lastLabel}"/>
-<h:inputText value="#{customer.lastName}"/>
-<h:outputText value=""/>
-
-<h:outputText value="#{bundle.mailingLabel}"/>
-<h:inputText value="#{customer.mailingAddress}"/>
-<h:outputText value=""/>
-
-<h:outputText value="#{bundle.cityLabel}"/>
-<h:inputText value="#{customer.city}"/>
-<h:outputText value=""/>
-
-<h:outputText value="#{bundle.stateLabel}"/>
-<h:selectOneMenu value="#{customer.state}">
-
-    <f:selectItem itemValue="AL" itemLabel="AL"/>
-    <f:selectItem itemValue="AK" itemLabel="AK"/>
-    <f:selectItem itemValue="AZ" itemLabel="AZ"/>
-    <f:selectItem itemValue="AR" itemLabel="AR"/>
-    <f:selectItem itemValue="CA" itemLabel="CA"/>
-    <f:selectItem itemValue="CO" itemLabel="CO"/>
-    <f:selectItem itemValue="CT" itemLabel="CT"/>
-    <f:selectItem itemValue="DE" itemLabel="DE"/>
-    <f:selectItem itemValue="FL" itemLabel="FL"/>
-    <f:selectItem itemValue="GA" itemLabel="GA"/>
-
-    <f:selectItem itemValue="HI" itemLabel="HI"/>
-    <f:selectItem itemValue="ID" itemLabel="ID"/>
-    <f:selectItem itemValue="IL" itemLabel="IL"/>
-    <f:selectItem itemValue="IN" itemLabel="IN"/>
-    <f:selectItem itemValue="IA" itemLabel="IA"/>
-    <f:selectItem itemValue="KS" itemLabel="KS"/>
-    <f:selectItem itemValue="KY" itemLabel="KY"/>
-    <f:selectItem itemValue="LA" itemLabel="LA"/>
-    <f:selectItem itemValue="ME" itemLabel="ME"/>
-    <f:selectItem itemValue="MD" itemLabel="MD"/>
-
-    <f:selectItem itemValue="MA" itemLabel="MA"/>
-    <f:selectItem itemValue="MI" itemLabel="MI"/>
-    <f:selectItem itemValue="MN" itemLabel="MN"/>
-    <f:selectItem itemValue="MO" itemLabel="MO"/>
-    <f:selectItem itemValue="MT" itemLabel="MT"/>
-    <f:selectItem itemValue="NE" itemLabel="NE"/>
-    <f:selectItem itemValue="NV" itemLabel="NV"/>
-    <f:selectItem itemValue="NH" itemLabel="NH"/>
-    <f:selectItem itemValue="NJ" itemLabel="NJ"/>
-    <f:selectItem itemValue="NM" itemLabel="NM"/>
-
-    <f:selectItem itemValue="MY" itemLabel="MY"/>
-    <f:selectItem itemValue="NC" itemLabel="NC"/>
-    <f:selectItem itemValue="ND" itemLabel="ND"/>
-    <f:selectItem itemValue="OH" itemLabel="OH"/>
-    <f:selectItem itemValue="OK" itemLabel="OK"/>
-    <f:selectItem itemValue="OR" itemLabel="OR"/>
-    <f:selectItem itemValue="PA" itemLabel="PA"/>
-    <f:selectItem itemValue="RI" itemLabel="RI"/>
-    <f:selectItem itemValue="SC" itemLabel="SC"/>
-    <f:selectItem itemValue="SD" itemLabel="SD"/>
-
-    <f:selectItem itemValue="TN" itemLabel="TN"/>
-    <f:selectItem itemValue="TX" itemLabel="TX"/>
-    <f:selectItem itemValue="UT" itemLabel="UT"/>
-    <f:selectItem itemValue="VT" itemLabel="VT"/>
-    <f:selectItem itemValue="VA" itemLabel="VA"/>
-    <f:selectItem itemValue="WA" itemLabel="WA"/>
-    <f:selectItem itemValue="WV" itemLabel="WV"/>
-    <f:selectItem itemValue="WI" itemLabel="WI"/>
-    <f:selectItem itemValue="WY" itemLabel="WY"/>
-</h:selectOneMenu>
-<h:outputText value=""/>
-
-<h:outputText value="#{bundle.zipLabel}"/>
-<h:inputText id="zip"
-             value="#{customer.zip}"
-             size="10" required="true">
-    <cs:format_validator formatPatterns="99999|99999-9999|### ###"/>
-</h:inputText>
-<h:message styleClass="validationMessage" for="zip"/>
-
-<h:outputText value="#{bundle.ccNumberLabel}"/>
-<h:inputText id="ccno" size="16"
-             converter="creditCardConverter" required="true">
-    <cs:format_validator
-          formatPatterns="9999999999999999|9999 9999 9999 9999|9999-9999-9999-9999"/>
-</h:inputText>
-<h:message styleClass="validationMessage" for="ccno"/>
-
-<h:outputText value="#{bundle.monthLabel}"/>
-<h:panelGrid id="monthYearPanel" columns="2" footerClass="medium"
-             headerClass="medium" styleClass="medium" columnClasses="medium">
-    <h:selectOneMenu value="#{customer.month}">
-        <f:selectItem itemValue="01" itemLabel="01"/>
-        <f:selectItem itemValue="02" itemLabel="02"/>
-        <f:selectItem itemValue="03" itemLabel="03"/>
-        <f:selectItem itemValue="04" itemLabel="04"/>
-        <f:selectItem itemValue="05" itemLabel="05"/>
-        <f:selectItem itemValue="06" itemLabel="06"/>
-        <f:selectItem itemValue="07" itemLabel="07"/>
-        <f:selectItem itemValue="08" itemLabel="08"/>
-        <f:selectItem itemValue="09" itemLabel="09"/>
-        <f:selectItem itemValue="10" itemLabel="10"/>
-        <f:selectItem itemValue="11" itemLabel="11"/>
-        <f:selectItem itemValue="12" itemLabel="12"/>
-    </h:selectOneMenu>
-
-    <h:selectOneMenu value="#{customer.year}">
-        <f:selectItem itemValue="2002" itemLabel="2002"/>
-        <f:selectItem itemValue="2003" itemLabel="2003"/>
-        <f:selectItem itemValue="2004" itemLabel="2004"/>
-        <f:selectItem itemValue="2005" itemLabel="2005"/>
-        <f:selectItem itemValue="2006" itemLabel="2006"/>
-        <f:selectItem itemValue="2007" itemLabel="2007"/>
-        <f:selectItem itemValue="2008" itemLabel="2008"/>
-    </h:selectOneMenu>
-</h:panelGrid>
-<h:outputText value=""/>
-
-</h:panelGrid>
-
-<h:commandButton value="#{bundle.finishButton}" action="finish"/>
-
-<h:graphicImage id="duke" url="/images/duke.gif"/>
-
-<h:outputText value="#{bundle.buyLabel}"/>
-
-</h:panelGrid>
-
-</h:form>
-</f:view>
-</body>
-</html>
-
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+
+<html>
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Customer Details</title>
+    <link rel="stylesheet" type="text/css"
+          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
+
+    <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+    <%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+    <%@ taglib uri="https://javaserverfaces.dev.java.net/demo/carstore"
+               prefix="cs" %>
+</head>
+
+<body>
+
+<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
+
+<f:view>
+<h:form>
+
+<h:panelGrid id="mainPanel" columns="1" footerClass="subtitle"
+             headerClass="subtitlebig" styleClass="medium"
+             columnClasses="medium">
+
+<h:graphicImage url="/images/cardemo.jpg"/>
+
+<h:outputText value="#{bundle.customerTitle}"/>
+
+<h:panelGrid id="subPanel" columns="3" footerClass="medium"
+             headerClass="subtitlebig" styleClass="medium"
+             columnClasses="medium">
+
+<h:outputText value="#{bundle.titleLabel}"/>
+<h:selectOneMenu id="title" value="#{customer.currentTitle}">
+    <f:selectItems value="#{customer.titleOptions}"/>
+</h:selectOneMenu>
+<h:outputText value=""/>
+
+<h:outputText value="#{bundle.firstLabel}"/>
+<h:inputText id="firstName" value="#{customer.firstName}" required="true">
+    <f:valueChangeListener type="carstore.FirstNameChanged"/>
+</h:inputText>
+<h:message styleClass="validationMessage" for="firstName"/>
+
+<h:outputText value="#{bundle.middleLabel}"/>
+<h:inputText id="middleInitial" size="1" maxlength="1"
+             value="#{customer.middleInitial}">
+</h:inputText>
+<h:message styleClass="validationMessage" for="middleInitial"/>
+
+<h:outputText value="#{bundle.lastLabel}"/>
+<h:inputText value="#{customer.lastName}"/>
+<h:outputText value=""/>
+
+<h:outputText value="#{bundle.mailingLabel}"/>
+<h:inputText value="#{customer.mailingAddress}"/>
+<h:outputText value=""/>
+
+<h:outputText value="#{bundle.cityLabel}"/>
+<h:inputText value="#{customer.city}"/>
+<h:outputText value=""/>
+
+<h:outputText value="#{bundle.stateLabel}"/>
+<h:selectOneMenu value="#{customer.state}">
+
+    <f:selectItem itemValue="AL" itemLabel="AL"/>
+    <f:selectItem itemValue="AK" itemLabel="AK"/>
+    <f:selectItem itemValue="AZ" itemLabel="AZ"/>
+    <f:selectItem itemValue="AR" itemLabel="AR"/>
+    <f:selectItem itemValue="CA" itemLabel="CA"/>
+    <f:selectItem itemValue="CO" itemLabel="CO"/>
+    <f:selectItem itemValue="CT" itemLabel="CT"/>
+    <f:selectItem itemValue="DE" itemLabel="DE"/>
+    <f:selectItem itemValue="FL" itemLabel="FL"/>
+    <f:selectItem itemValue="GA" itemLabel="GA"/>
+
+    <f:selectItem itemValue="HI" itemLabel="HI"/>
+    <f:selectItem itemValue="ID" itemLabel="ID"/>
+    <f:selectItem itemValue="IL" itemLabel="IL"/>
+    <f:selectItem itemValue="IN" itemLabel="IN"/>
+    <f:selectItem itemValue="IA" itemLabel="IA"/>
+    <f:selectItem itemValue="KS" itemLabel="KS"/>
+    <f:selectItem itemValue="KY" itemLabel="KY"/>
+    <f:selectItem itemValue="LA" itemLabel="LA"/>
+    <f:selectItem itemValue="ME" itemLabel="ME"/>
+    <f:selectItem itemValue="MD" itemLabel="MD"/>
+
+    <f:selectItem itemValue="MA" itemLabel="MA"/>
+    <f:selectItem itemValue="MI" itemLabel="MI"/>
+    <f:selectItem itemValue="MN" itemLabel="MN"/>
+    <f:selectItem itemValue="MO" itemLabel="MO"/>
+    <f:selectItem itemValue="MT" itemLabel="MT"/>
+    <f:selectItem itemValue="NE" itemLabel="NE"/>
+    <f:selectItem itemValue="NV" itemLabel="NV"/>
+    <f:selectItem itemValue="NH" itemLabel="NH"/>
+    <f:selectItem itemValue="NJ" itemLabel="NJ"/>
+    <f:selectItem itemValue="NM" itemLabel="NM"/>
+
+    <f:selectItem itemValue="MY" itemLabel="MY"/>
+    <f:selectItem itemValue="NC" itemLabel="NC"/>
+    <f:selectItem itemValue="ND" itemLabel="ND"/>
+    <f:selectItem itemValue="OH" itemLabel="OH"/>
+    <f:selectItem itemValue="OK" itemLabel="OK"/>
+    <f:selectItem itemValue="OR" itemLabel="OR"/>
+    <f:selectItem itemValue="PA" itemLabel="PA"/>
+    <f:selectItem itemValue="RI" itemLabel="RI"/>
+    <f:selectItem itemValue="SC" itemLabel="SC"/>
+    <f:selectItem itemValue="SD" itemLabel="SD"/>
+
+    <f:selectItem itemValue="TN" itemLabel="TN"/>
+    <f:selectItem itemValue="TX" itemLabel="TX"/>
+    <f:selectItem itemValue="UT" itemLabel="UT"/>
+    <f:selectItem itemValue="VT" itemLabel="VT"/>
+    <f:selectItem itemValue="VA" itemLabel="VA"/>
+    <f:selectItem itemValue="WA" itemLabel="WA"/>
+    <f:selectItem itemValue="WV" itemLabel="WV"/>
+    <f:selectItem itemValue="WI" itemLabel="WI"/>
+    <f:selectItem itemValue="WY" itemLabel="WY"/>
+</h:selectOneMenu>
+<h:outputText value=""/>
+
+<h:outputText value="#{bundle.zipLabel}"/>
+<h:inputText id="zip"
+             value="#{customer.zip}"
+             size="10" required="true">
+    <cs:format_validator formatPatterns="99999|99999-9999|### ###"/>
+</h:inputText>
+<h:message styleClass="validationMessage" for="zip"/>
+
+<h:outputText value="#{bundle.ccNumberLabel}"/>
+<h:inputText id="ccno" size="16"
+             converter="creditCardConverter" required="true">
+    <cs:format_validator
+          formatPatterns="9999999999999999|9999 9999 9999 9999|9999-9999-9999-9999"/>
+</h:inputText>
+<h:message styleClass="validationMessage" for="ccno"/>
+
+<h:outputText value="#{bundle.monthLabel}"/>
+<h:panelGrid id="monthYearPanel" columns="2" footerClass="medium"
+             headerClass="medium" styleClass="medium" columnClasses="medium">
+    <h:selectOneMenu value="#{customer.month}">
+        <f:selectItem itemValue="01" itemLabel="01"/>
+        <f:selectItem itemValue="02" itemLabel="02"/>
+        <f:selectItem itemValue="03" itemLabel="03"/>
+        <f:selectItem itemValue="04" itemLabel="04"/>
+        <f:selectItem itemValue="05" itemLabel="05"/>
+        <f:selectItem itemValue="06" itemLabel="06"/>
+        <f:selectItem itemValue="07" itemLabel="07"/>
+        <f:selectItem itemValue="08" itemLabel="08"/>
+        <f:selectItem itemValue="09" itemLabel="09"/>
+        <f:selectItem itemValue="10" itemLabel="10"/>
+        <f:selectItem itemValue="11" itemLabel="11"/>
+        <f:selectItem itemValue="12" itemLabel="12"/>
+    </h:selectOneMenu>
+
+    <h:selectOneMenu value="#{customer.year}">
+        <f:selectItem itemValue="2002" itemLabel="2002"/>
+        <f:selectItem itemValue="2003" itemLabel="2003"/>
+        <f:selectItem itemValue="2004" itemLabel="2004"/>
+        <f:selectItem itemValue="2005" itemLabel="2005"/>
+        <f:selectItem itemValue="2006" itemLabel="2006"/>
+        <f:selectItem itemValue="2007" itemLabel="2007"/>
+        <f:selectItem itemValue="2008" itemLabel="2008"/>
+    </h:selectOneMenu>
+</h:panelGrid>
+<h:outputText value=""/>
+
+</h:panelGrid>
+
+<h:commandButton value="#{bundle.finishButton}" action="finish"/>
+
+<h:graphicImage id="duke" url="/images/duke.gif"/>
+
+<h:outputText value="#{bundle.buyLabel}"/>
+
+</h:panelGrid>
+
+</h:form>
+</f:view>
+</body>
+</html>
+

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/customerInfo.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp?rev=1083088&r1=1083087&r2=1083088&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp Fri Mar 18 21:57:31 2011
@@ -1,55 +1,55 @@
-<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
-<!--
-/* Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-
-<%@ page contentType="text/html"
-         isELIgnored="false" %>
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
-
-<html>
-
-<head>
-    <title>Welcome to CarStore</title>
-    <link rel="stylesheet" type="text/css"
-          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
-</head>
-
-<body bgcolor="white">
-<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
-<f:view>
-    <h:form>
-        <h:graphicImage url="/images/cardemo.jpg"/>
-
-        <h:panelGrid id="thanksPanel" columns="1" footerClass="subtitle"
-                     headerClass="subtitlebig" styleClass="medium"
-                     columnClasses="subtitle,medium">
-            <f:facet name="header">
-                <h:outputFormat title="thanks" value="#{bundle.thanksLabel}">
-                    <f:param value="#{sessionScope.firstName}"/>
-                </h:outputFormat>
-            </f:facet>
-        </h:panelGrid>
-
-    </h:form>
-    <jsp:include page="bottomMatter.jsp"/>
-</f:view>
-</body>
-</html>
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<!--
+/* Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+-->
+
+<%@ page contentType="text/html"
+         isELIgnored="false" %>
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f" %>
+
+<html>
+
+<head>
+    <title>Welcome to CarStore</title>
+    <link rel="stylesheet" type="text/css"
+          href="<%=response.encodeURL(request.getContextPath() + "stylesheet.css")%>">
+</head>
+
+<body bgcolor="white">
+<f:loadBundle basename="carstore.bundles.Resources" var="bundle"/>
+<f:view>
+    <h:form>
+        <h:graphicImage url="/images/cardemo.jpg"/>
+
+        <h:panelGrid id="thanksPanel" columns="1" footerClass="subtitle"
+                     headerClass="subtitlebig" styleClass="medium"
+                     columnClasses="subtitle,medium">
+            <f:facet name="header">
+                <h:outputFormat title="thanks" value="#{bundle.thanksLabel}">
+                    <f:param value="#{sessionScope.firstName}"/>
+                </h:outputFormat>
+            </f:facet>
+        </h:panelGrid>
+
+    </h:form>
+    <jsp:include page="bottomMatter.jsp"/>
+</f:view>
+</body>
+</html>

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/finish.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/150x126_Jalopy.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/150x126_Luxury.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/150x126_Roadster.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/150x126_SUV.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/200x168_Jalopy.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/200x168_Luxury.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/200x168_Roadster.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/200x168_SUV.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/cardemo.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/world.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/world_france.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg

Propchange: myfaces/portlet-bridge/core/trunk_3.0.x/examples/carstore/src/main/webapp/images/world_germany.jpg
------------------------------------------------------------------------------
--- svn:mime-type (original)
+++ svn:mime-type Fri Mar 18 21:57:31 2011
@@ -1 +1 @@
-application/octet-stream
+image/jpeg