Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMojarraFilter/src/main/webapp/response.jspx URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMojarraFilter/src/main/webapp/response.jspx?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMojarraFilter/src/main/webapp/response.jspx (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMojarraFilter/src/main/webapp/response.jspx Thu Jun 17 20:53:41 2010 @@ -0,0 +1,56 @@ + + + + + + + + Guess The Number + + + + + +

+ +

+ +

+ + + + +

+ Valid XHTML 1.0! +

+ + + +
\ No newline at end of file Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/MessageFactory.java URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/MessageFactory.java?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/MessageFactory.java (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/MessageFactory.java Thu Jun 17 20:53:41 2010 @@ -1,30 +1,21 @@ /* - * $Id: MessageFactory.java,v 1.6 2005/12/14 22:27:25 rlubke Exp $ - */ - -/* -* The contents of this file are subject to the terms -* of the Common Development and Distribution License -* (the License). You may not use this file except in -* compliance with the License. -* -* You can obtain a copy of the License at -* https://javaserverfaces.dev.java.net/CDDL.html or -* legal/CDDLv1.0.txt. -* See the License for the specific language governing -* permission and limitations under the License. -* -* When distributing Covered Code, include this CDDL -* Header Notice in each file and include the License file -* at legal/CDDLv1.0.txt. -* If applicable, add the following below the CDDL Header, -* with the fields enclosed by brackets [] replaced by -* your own identifying information: -* "Portions Copyrighted [year] [name of copyright owner]" -* -* [Name of File] [ver.__] [Date] -* -* Copyright 2005 Sun Microsystems Inc. All Rights Reserved + * 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. + * */ package guessNumber; Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/UserNumberBean.java URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/UserNumberBean.java?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/UserNumberBean.java (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/guessNumber/UserNumberBean.java Thu Jun 17 20:53:41 2010 @@ -1,26 +1,21 @@ /* - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * https://javaserverfaces.dev.java.net/CDDL.html or - * legal/CDDLv1.0.txt. - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at legal/CDDLv1.0.txt. - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * [Name of File] [ver.__] [Date] - * - * Copyright 2005 Sun Microsystems Inc. All Rights Reserved + * 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. + * */ package guessNumber; Modified: myfaces/portlet-bridge/core/tags/1.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/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/java/org/apache/myfaces/portlet/faces/application/BridgeMyFacesRenderFilter.java Thu Jun 17 20:53:41 2010 @@ -1,3 +1,22 @@ +/* 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. + */ + + package org.apache.myfaces.portlet.faces.application; import org.apache.myfaces.application.jsp.ViewResponseWrapper; Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/resources/META-INF/NOTICE Thu Jun 17 20:53:41 2010 @@ -4,7 +4,7 @@ Copyright [2007, 2008, 2009, 2010] The A This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Portions of this software are Copyright (c) 2007, Oracle +Portions of this software are Copyright (c) 2005-2007, Oracle Corporation, and are licensed to the Apache Software Foundation under the "Software Grant and Corporate Contribution License Agreement" Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/faces-config.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/faces-config.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/faces-config.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 17 20:53:41 2010 @@ -1,39 +1,23 @@ The decision rule used by the NavigationHandler to determine which view must be displayed after the - current view, greeting.jsp is processed. + current view, greeting.jspx is processed. - /greeting.jsp + /greeting.jspx - Indicates to the NavigationHandler that the response.jsp + Indicates to the NavigationHandler that the response.jspx view must be displayed if the Action referenced by a - UICommand component on the greeting.jsp view returns + UICommand component on the greeting.jspx view returns the outcome "success". success - /response.jsp + /response.jspx @@ -73,18 +57,18 @@ The decision rules used by the NavigationHandler to determine which view must be displayed after the - current view, response.jsp is processed. + current view, response.jspx is processed. - /response.jsp + /response.jspx - Indicates to the NavigationHandler that the greeting.jsp + Indicates to the NavigationHandler that the greeting.jspx view must be displayed if the Action referenced by a - UICommand component on the response.jsp view returns + UICommand component on the response.jspx view returns the outcome "success". success - /greeting.jsp + /greeting.jspx Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Thu Jun 17 20:53:41 2010 @@ -1,25 +1,25 @@ - - - + + + org.mortbay.jetty.webapp.NoTLDJarPattern 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 - - + + com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener - + - com.bekk.boss.pluto.embedded.util.PortalStartupListener + + com.bekk.boss.pluto.embedded.util.PortalStartupListener - - + + plutoResourceFilter com.bekk.boss.pluto.embedded.util.PlutResourcesFilter - + plutoPortalDriver com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter @@ -57,21 +58,21 @@ plutoResourceFilter - *.css + *.css *.gif *.png *.js - + plutoPortalDriver - /pluto/index.jsp - /pluto/index.jsp/* - - + /jettypluto/index.jsp + /jettypluto/index.jsp/* + + - - - + default org.mortbay.jetty.servlet.DefaultServlet @@ -151,7 +152,7 @@ true 0 - + jsp @@ -171,11 +172,11 @@ 0 - - default - / + + default + / - + jsp *.jsp @@ -186,13 +187,13 @@ *.JSPF *.JSPX *.XSP - - + + 60 - + index.jsp Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/portlet.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/portlet.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/portlet.xml Thu Jun 17 20:53:41 2010 @@ -31,7 +31,7 @@ javax.portlet.faces.defaultViewId.view - /greeting.jsp + /greeting.jspx Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/WEB-INF/web.xml Thu Jun 17 20:53:41 2010 @@ -1,44 +1,29 @@ - - + - + JavaServer Faces Guess Number Sample Application @@ -51,6 +36,11 @@ client + + javax.portlet.faces.RENDER_POLICY + NEVER_DELEGATE + + mojarraRenderBehindPortletFilter org.apache.myfaces.portlet.faces.application.BridgeMyFacesRenderFilter @@ -58,16 +48,15 @@ mojarraRenderBehindPortletFilter - *.jsp + *.jspx INCLUDE - - - *.jsp - true - - + + mojarraRenderBehindPortletFilter + *.jsp + INCLUDE + Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jspx URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jspx?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jspx (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/greeting.jspx Thu Jun 17 20:53:41 2010 @@ -0,0 +1,66 @@ + + + + + + + + Hello + + + + +

Hi. My name is Duke. I'm thinking of a number from + + to + + . Can you guess + it? +

+ + + + +

+ + + + + +

+ Valid XHTML 1.0! +

+ + + +
\ No newline at end of file Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/index.jspx URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/index.jspx?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/index.jspx (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/index.jspx Thu Jun 17 20:53:41 2010 @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + \ No newline at end of file Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/index.jsp URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/index.jsp?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/index.jsp (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/jettypluto/index.jsp Thu Jun 17 20:53:41 2010 @@ -0,0 +1,109 @@ + + + +<%@ page contentType="text/html" + isELIgnored="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %> + + + + Pluto Portal + + + + + + +
+ + + + + + +
+ Logout +
+
+ + + +
+ + + + + + + + + + + + +
+ + + + +
+ + +
+ + + + +
+ +
+
+ +
+ + + + + + +
+ + + + + Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/response.jspx URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/response.jspx?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/response.jspx (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/guessNumberMyFacesFilter/src/main/webapp/response.jspx Thu Jun 17 20:53:41 2010 @@ -0,0 +1,56 @@ + + + + + + + + Guess The Number + + + + + +

+ +

+ +

+ + + + +

+ Valid XHTML 1.0! +

+ + + +
\ No newline at end of file Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java Thu Jun 17 20:53:41 2010 @@ -1,26 +1,21 @@ /* - * The contents of this file are subject to the terms - * of the Common Development and Distribution License - * (the License). You may not use this file except in - * compliance with the License. - * - * You can obtain a copy of the License at - * https://javaserverfaces.dev.java.net/CDDL.html or - * legal/CDDLv1.0.txt. - * See the License for the specific language governing - * permission and limitations under the License. - * - * When distributing Covered Code, include this CDDL - * Header Notice in each file and include the License file - * at legal/CDDLv1.0.txt. - * If applicable, add the following below the CDDL Header, - * with the fields enclosed by brackets [] replaced by - * your own identifying information: - * "Portions Copyrighted [year] [name of copyright owner]" - * - * [Name of File] [ver.__] [Date] - * - * Copyright 2005 Sun Microsystems Inc. All Rights Reserved + * 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. + * */ package helloDuke; Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/resources/META-INF/NOTICE URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/resources/META-INF/NOTICE?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/resources/META-INF/NOTICE (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/resources/META-INF/NOTICE Thu Jun 17 20:53:41 2010 @@ -4,7 +4,7 @@ Copyright [2007, 2008, 2009, 2010] The A This product includes software developed at The Apache Software Foundation (http://www.apache.org/). -Portions of this software are Copyright (c) 2007, Oracle +Portions of this software are Copyright (c) 2005-2007, Oracle Corporation, and are licensed to the Apache Software Foundation under the "Software Grant and Corporate Contribution License Agreement" Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 17 20:53:41 2010 @@ -1,28 +1,23 @@ Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Thu Jun 17 20:53:41 2010 @@ -1,25 +1,25 @@ - - - + + + org.mortbay.jetty.webapp.NoTLDJarPattern 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 - - + + com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener - + - com.bekk.boss.pluto.embedded.util.PortalStartupListener + + com.bekk.boss.pluto.embedded.util.PortalStartupListener - - + + plutoResourceFilter com.bekk.boss.pluto.embedded.util.PlutResourcesFilter - + plutoPortalDriver com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter @@ -57,21 +58,21 @@ plutoResourceFilter - *.css + *.css *.gif *.png *.js - + plutoPortalDriver - /pluto/index.jsp - /pluto/index.jsp/* - - + /jettypluto/index.jsp + /jettypluto/index.jsp/* + + - - - + default org.mortbay.jetty.servlet.DefaultServlet @@ -151,7 +152,7 @@ true
0 - + jsp @@ -171,11 +172,11 @@ 0 - - default - / + + default + / - + jsp *.jsp @@ -186,13 +187,13 @@ *.JSPF *.JSPX *.XSP - - + + 60 - + index.jsp Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml Thu Jun 17 20:53:41 2010 @@ -1,5 +1,24 @@ + + - Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp Thu Jun 17 20:53:41 2010 @@ -1,62 +1,21 @@ -<%-- - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the GNU - General Public License Version 2 only ("GPL") or the Common Development - and Distribution License("CDDL") (collectively, the "License"). You - may not use this file except in compliance with the License. You can obtain - a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - language governing permissions and limitations under the License. - - When distributing the software, include this License Header Notice in each - file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - Sun designates this particular file as subject to the "Classpath" exception - as provided by Sun in the GPL Version 2 section of the License file that - accompanied this code. If applicable, add the following below the License - Header, with the fields enclosed by brackets [] replaced by your own - identifying information: "Portions Copyrighted [year] - [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the CDDL or - only the GPL Version 2, indicate your decision by adding "[Contributor] - elects to include this software in this distribution under the [CDDL or GPL - Version 2] license." If you don't indicate a single choice of license, a - recipient has the option to distribute your version of this file under - either the CDDL, the GPL Version 2 or to extend the choice of license to - its licensees as provided above. However, if you add GPL Version 2 code - and therefore, elected the GPL Version 2 license, then the option applies - only if the new code is made subject to such option by the copyright - holder. ---%> - Modified: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/response.jsp URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/response.jsp?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/response.jsp (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/helloDuke/response.jsp Thu Jun 17 20:53:41 2010 @@ -1,62 +1,21 @@ -<%-- - DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. - - Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved. - - The contents of this file are subject to the terms of either the GNU - General Public License Version 2 only ("GPL") or the Common Development - and Distribution License("CDDL") (collectively, the "License"). You - may not use this file except in compliance with the License. You can obtain - a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html - or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific - language governing permissions and limitations under the License. - - When distributing the software, include this License Header Notice in each - file and include the License file at glassfish/bootstrap/legal/LICENSE.txt. - Sun designates this particular file as subject to the "Classpath" exception - as provided by Sun in the GPL Version 2 section of the License file that - accompanied this code. If applicable, add the following below the License - Header, with the fields enclosed by brackets [] replaced by your own - identifying information: "Portions Copyrighted [year] - [name of copyright owner]" - - Contributor(s): - - If you wish your version of this file to be governed by only the CDDL or - only the GPL Version 2, indicate your decision by adding "[Contributor] - elects to include this software in this distribution under the [CDDL or GPL - Version 2] license." If you don't indicate a single choice of license, a - recipient has the option to distribute your version of this file under - either the CDDL, the GPL Version 2 or to extend the choice of license to - its licensees as provided above. However, if you add GPL Version 2 code - and therefore, elected the GPL Version 2 license, then the option applies - only if the new code is made subject to such option by the copyright - holder. ---%> - <%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%> Added: myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/jettypluto/index.jsp URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/jettypluto/index.jsp?rev=955739&view=auto ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/jettypluto/index.jsp (added) +++ myfaces/portlet-bridge/core/tags/1.0.0/examples/helloDuke/src/main/webapp/jettypluto/index.jsp Thu Jun 17 20:53:41 2010 @@ -0,0 +1,109 @@ + + + +<%@ page contentType="text/html" + isELIgnored="false" %> + +<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> +<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %> + + + + Pluto Portal + + + + + + +
+ + + + + + +
+ Logout +
+
+ + + +
+ + + + + + + + + + + + +
+ + + + +
+ + +
+ + + + +
+ +
+
+ +
+ + + + + + +
+ + + + + Modified: myfaces/portlet-bridge/core/tags/1.0.0/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/1.0.0/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java?rev=955739&r1=955738&r2=955739&view=diff ============================================================================== --- myfaces/portlet-bridge/core/tags/1.0.0/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java (original) +++ myfaces/portlet-bridge/core/tags/1.0.0/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java Thu Jun 17 20:53:41 2010 @@ -245,6 +245,9 @@ public class PortletViewHandlerImpl exte super.renderView(context, viewToRender); return; } + + ExternalContext extContext = context.getExternalContext(); + RenderResponse renderResponse = (RenderResponse) extContext.getResponse(); // If first time -- Get the renderPolicy from the context init parameter if (mRenderPolicy == null) @@ -276,7 +279,13 @@ public class PortletViewHandlerImpl exte catch (Throwable t) { // catch all throws and swallow -- falling through to our own - // render + // render -- Note because delegate may have set the Response object and + // not cleaned it up on the exception -- reset to ensure a good object + if (!renderResponse.equals(extContext.getResponse())) + { + extContext.setResponse(renderResponse); + } + } } @@ -287,9 +296,6 @@ public class PortletViewHandlerImpl exte return; } - ExternalContext extContext = context.getExternalContext(); - RenderResponse renderResponse = (RenderResponse) extContext.getResponse(); - try {