You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by mf...@apache.org on 2011/01/05 23:16:31 UTC
svn commit: r1055664 - in /myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples: ./ facelets-guess/src/main/webapp/WEB-INF/ guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/ guessNumberMyFacesFil...

Author: mfreedman
Date: Wed Jan  5 22:16:31 2011
New Revision: 1055664

URL: http://svn.apache.org/viewvc?rev=1055664&view=rev
Log:
Fixed facelets example so it now runs (note:  I had to manually remove some tld files from the myfaces jar because they resulted in parse errors when faces started up.

Fixed MyFacesrenderFilter example -- though still doesn't run because of MyFaces core bug -- need to verify whether this bug still exists in the Myfaces core trunk.

Modified:
    myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml
    myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java
    myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml
    myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/pom.xml

Modified: myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml?rev=1055664&r1=1055663&r2=1055664&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml Wed Jan  5 22:16:31 2011
@@ -18,15 +18,13 @@
  * under the License.
  *
 -->
-<!DOCTYPE faces-config PUBLIC
-  "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"
-  "http://java.sun.com/dtd/web-facesconfig_1_0.dtd">
 
-<faces-config>
-			
-  <!-- from project setup -->
-
-  
+<faces-config 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-facesconfig_2_0.xsd"
+              version="2.0">
+	
+ 
   <!-- our NumberBean we created before -->
   <managed-bean>
     <managed-bean-name>NumberBean</managed-bean-name>

Modified: myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java?rev=1055664&r1=1055663&r2=1055664&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java (original)
+++ myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java Wed Jan  5 22:16:31 2011
@@ -19,7 +19,7 @@
 
 package org.apache.myfaces.portlet.faces.application;
 
-import org.apache.myfaces.application.jsp.ViewResponseWrapper;
+import org.apache.myfaces.application.jsp.ServletViewResponseWrapper;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;
@@ -131,7 +131,7 @@ public class BridgeMyFacesRenderFilter
    * text that exists after the &lt;f:view&gt; tag.</p>
    */
   public class BridgeRenderFilterResponseWrapper
-    extends ViewResponseWrapper
+    extends ServletViewResponseWrapper
   {
 
     private DirectByteArrayServletOutputStream mByteStream;

Modified: myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml?rev=1055664&r1=1055663&r2=1055664&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml Wed Jan  5 22:16:31 2011
@@ -41,6 +41,10 @@
     <param-value>NEVER_DELEGATE</param-value>
   </context-param>
 
+<listener>
+  <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class>
+</listener>
+
     <filter>
         <filter-name>mojarraRenderBehindPortletFilter</filter-name>
         <filter-class>org.apache.myfaces.portlet.faces.application.BridgeMyFacesRenderFilter</filter-class>

Modified: myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/pom.xml?rev=1055664&r1=1055663&r2=1055664&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/pom.xml (original)
+++ myfaces/portlet-bridge/core/branches/sobryan_portlet-bridge-3.0.0/examples/pom.xml Wed Jan  5 22:16:31 2011
@@ -26,12 +26,10 @@
   <modules>
     <module>blank</module>
     <module>carstore</module>
-<!--    <module>facelets-guess</module> -->
+    <module>facelets-guess</module>
     <module>guessNumber</module>
-<!--    <module>guessNumberMojarra_v04_to_v07_Wrapper</module> -->
     <module>guessNumberMojarraFilter</module>
-<!--    <module>guessNumberMojarraFilterandWrapper</module> -->
-<!--    <module>guessNumberMyFacesFilter</module> -->
+    <module>guessNumberMyFacesFilter</module>
     <module>helloDuke</module>
     <module>helloDukeCoordination</module>
   </modules>