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/03/19 00:09:27 UTC
svn commit: r1083102 [9/10] - in
/myfaces/portlet-bridge/core/tags/3.0.0-alpha: ./ 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/po...
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp Fri Mar 18 23:09:20 2011
@@ -1,40 +1,40 @@
-<!--
- * 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.
- *
--->
-
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<h2>
- My name is Duke. What is yours?
-</h2>
-
-<%-- Do not use 'useBean' with the bridge, configure it into faces-config.xml instead --%>
-<%-- jsp:useBean id="UserNameBean" class="helloDuke.UserNameBean" scope="session" /> --%>
-
-
-<f:view>
- <h:form id="helloForm">
- <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
- <h:inputText id="username" value="#{userNameBean.userName}" />
- <h:commandButton id="submit" action="response" actionListener="#{dukeActionHandler.processAction}" value="Submit"
- type="submit" />
- </h:form>
+<!--
+ * 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.
+ *
+-->
+
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<h2>
+ My name is Duke. What is yours?
+</h2>
+
+<%-- Do not use 'useBean' with the bridge, configure it into faces-config.xml instead --%>
+<%-- jsp:useBean id="UserNameBean" class="helloDuke.UserNameBean" scope="session" /> --%>
+
+
+<f:view>
+ <h:form id="helloForm">
+ <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
+ <h:inputText id="username" value="#{userNameBean.userName}" />
+ <h:commandButton id="submit" action="response" actionListener="#{dukeActionHandler.processAction}" value="Submit"
+ type="submit" />
+ </h:form>
</f:view>
\ No newline at end of file
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/greeting.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html Fri Mar 18 23:09:20 2011
@@ -1,11 +1,43 @@
-
-
-<br>
-
-
-<P>Click <a href="faces/greeting.jsp">here</a>
-to say hello to Duke. </P>
-
-<br>
-<hr WIDTH="100%">
-
+
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//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.
+ *
+ */
+
+-->
+
+<html>
+<body>
+
+
+<br>
+
+
+<P>Click <a href="faces/greeting.jsp">here</a>
+to say hello to Duke. </P>
+
+<br>
+<hr WIDTH="100%">
+
+</body>
+</html>
+
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/index.html
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp Fri Mar 18 23:09:20 2011
@@ -1,34 +1,34 @@
-<!--
- * 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.
- *
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<f:view>
- <h:form id="responseform">
- <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
- <h2>
- Hi,
- <h:outputText id="userLabel" value="#{userNameBean.userName}" />
- </h2>
- <h:commandButton id="back" value="Back" action="greeting" />
- <p>
- </h:form>
+<!--
+ * 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.
+ *
+-->
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<f:view>
+ <h:form id="responseform">
+ <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
+ <h2>
+ Hi,
+ <h:outputText id="userLabel" value="#{userNameBean.userName}" />
+ </h2>
+ <h:commandButton id="back" value="Back" action="greeting" />
+ <p>
+ </h:form>
</f:view>
\ No newline at end of file
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/response.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp Fri Mar 18 23:09:20 2011
@@ -1,33 +1,33 @@
-<!--
- * 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.
- *
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<f:view>
- <h:form id="responseform">
- <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
- <h2>
- Your name is:
- <h:outputText id="userLabel" value="#{userNameBean.userName}" />
- </h2>
- <p>
- </h:form>
+<!--
+ * 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.
+ *
+-->
+
+<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
+<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
+
+<f:view>
+ <h:form id="responseform">
+ <h:graphicImage id="waveImg" url="/helloDuke/wave.med.gif" />
+ <h2>
+ Your name is:
+ <h:outputText id="userLabel" value="#{userNameBean.userName}" />
+ </h2>
+ <p>
+ </h:form>
</f:view>
\ No newline at end of file
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/helloDuke/yourName.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp Fri Mar 18 23:09:20 2011
@@ -1,109 +1,109 @@
-<!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/jsp/jstl/core" prefix="c" %>
-<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
-
-<html>
-<head>
- <title>Pluto Portal</title>
- <style type="text/css" title="currentStyle" media="screen">
- @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
- @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
- <c:forEach items="${org_apache_pluto_embedded_extraStyles}" var="style">
- @import "<c:out value="${pageContext.request.contextPath}"/><c:out value="${style}"/>";
- </c:forEach>
- </style>
- <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
- </script>
-</head>
-
-<body>
-
-<div id="portal">
-
- <!-- Header block: the Apache Pluto banner image and description -->
- <div id="header">
- <h1>Apache Pluto</h1>
-
- <p>An Apache Portals Project</p>
- </div>
-
- <!-- Logout link -->
- <c:if test="${pageContext.request.remoteUser != null}">
- <div id="logout">
- <a href="<c:url value='/Logout'/>">Logout</a>
- </div>
- </c:if>
-
-
- <!-- Content block: portlets are divided into two columns/groups -->
- <div id="content">
- <pluto:isMaximized var="isMax"/>
-
- <!-- Left column -->
- <c:choose>
- <c:when test="${isMax}">
- <c:forEach var="portlet" varStatus="status"
- items="${org_apache_pluto_embedded_portletIds}">
- <c:set var="portlet" value="${portlet}" scope="request"/>
- <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
- </c:forEach>
- </c:when>
-
- <c:otherwise>
- <div id="portlets-left-column">
- <c:forEach var="portlet" varStatus="status"
- items="${org_apache_pluto_embedded_portletIds}" step="2">
- <c:set var="portlet" value="${portlet}" scope="request"/>
- <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
- </c:forEach>
- </div>
-
- <!-- Right column -->
- <div id="portlets-right-column">
- <c:forEach var="portlet" varStatus="status"
- items="${org_apache_pluto_embedded_portletIds}" begin="1" step="2">
- <c:set var="portlet" value="${portlet}" scope="request"/>
- <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
- </c:forEach>
- </div>
-
- </c:otherwise>
- </c:choose>
-
- </div>
-
-
-
- <!-- Footer block: copyright -->
- <div id="footer">
- © 2003-2005 Apache Software Foundation
- </div>
-
-</div>
-
-</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/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<html>
+<head>
+ <title>Pluto Portal</title>
+ <style type="text/css" title="currentStyle" media="screen">
+ @import "<c:out value="${pageContext.request.contextPath}"/>/pluto.css";
+ @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
+ <c:forEach items="${org_apache_pluto_embedded_extraStyles}" var="style">
+ @import "<c:out value="${pageContext.request.contextPath}"/><c:out value="${style}"/>";
+ </c:forEach>
+ </style>
+ <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js">
+ </script>
+</head>
+
+<body>
+
+<div id="portal">
+
+ <!-- Header block: the Apache Pluto banner image and description -->
+ <div id="header">
+ <h1>Apache Pluto</h1>
+
+ <p>An Apache Portals Project</p>
+ </div>
+
+ <!-- Logout link -->
+ <c:if test="${pageContext.request.remoteUser != null}">
+ <div id="logout">
+ <a href="<c:url value='/Logout'/>">Logout</a>
+ </div>
+ </c:if>
+
+
+ <!-- Content block: portlets are divided into two columns/groups -->
+ <div id="content">
+ <pluto:isMaximized var="isMax"/>
+
+ <!-- Left column -->
+ <c:choose>
+ <c:when test="${isMax}">
+ <c:forEach var="portlet" varStatus="status"
+ items="${org_apache_pluto_embedded_portletIds}">
+ <c:set var="portlet" value="${portlet}" scope="request"/>
+ <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+ </c:forEach>
+ </c:when>
+
+ <c:otherwise>
+ <div id="portlets-left-column">
+ <c:forEach var="portlet" varStatus="status"
+ items="${org_apache_pluto_embedded_portletIds}" step="2">
+ <c:set var="portlet" value="${portlet}" scope="request"/>
+ <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+ </c:forEach>
+ </div>
+
+ <!-- Right column -->
+ <div id="portlets-right-column">
+ <c:forEach var="portlet" varStatus="status"
+ items="${org_apache_pluto_embedded_portletIds}" begin="1" step="2">
+ <c:set var="portlet" value="${portlet}" scope="request"/>
+ <jsp:include page="/WEB-INF/themes/portlet-skin.jsp"/>
+ </c:forEach>
+ </div>
+
+ </c:otherwise>
+ </c:choose>
+
+ </div>
+
+
+
+ <!-- Footer block: copyright -->
+ <div id="footer">
+ © 2003-2005 Apache Software Foundation
+ </div>
+
+</div>
+
+</body>
+
+</html>
+
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/helloDukeCoordination/src/main/webapp/jettypluto/index.jsp
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/pom.xml?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/pom.xml (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/pom.xml Fri Mar 18 23:09:20 2011
@@ -1,3 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<name>MyFaces Portlet Bridge Examples</name>
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/examples/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml Fri Mar 18 23:09:20 2011
@@ -1,4 +1,26 @@
<?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.
+ *
+
+-->
<project name="myfaces_shared_tasks">
<target name="refactor-java-sources">
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/build.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletApplicationFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletApplicationImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:888894-923981,929300
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletStateManagerImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/AggregatingViewDeclatationLanguage.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/AggregatingViewDeclatationLanguage.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java Fri Mar 18 23:09:20 2011
@@ -1,384 +1,384 @@
-/* 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.view;
-
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-
-import java.nio.ByteBuffer;
-
-import javax.faces.context.FacesContext;
-
-import javax.portlet.RenderResponse;
-
-import javax.portlet.filter.RenderResponseWrapper;
-
-import javax.servlet.http.HttpServletResponse;
-
-import javax.portlet.faces.BridgeWriteBehindResponse;
-
-
-public class BridgeViewHandlerRenderResponseWrapper
- extends RenderResponseWrapper
- implements BridgeWriteBehindResponse
-{
-
- private DirectByteArrayServletOutputStream mByteStream;
- private CharArrayWriter mCharWriter;
- private PrintWriter mPrintWriter;
- private int mStatus = HttpServletResponse.SC_OK;
- private boolean mHasWriteBehindMarkup = false;
-
- public BridgeViewHandlerRenderResponseWrapper()
- {
- super((RenderResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse());
- }
-
-
- public BridgeViewHandlerRenderResponseWrapper(RenderResponse wrapped)
- {
- super(wrapped);
- }
-
- public void flushBuffer()
- {
- if (isChars())
- {
- mPrintWriter.flush();
- }
- }
-
- public int getBufferSize()
- {
- if (isBytes())
- {
- return mByteStream.size();
- }
- else if (isChars())
- {
- return mCharWriter.size();
- }
- else
- return 0;
- }
-
-
- public void reset()
- {
- super.reset();
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
- public void resetBuffer()
- {
- super.resetBuffer();
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
-
- public OutputStream getPortletOutputStream()
- throws IOException
- {
- if (mPrintWriter != null)
- {
- throw new IllegalStateException();
- }
- if (mByteStream == null)
- {
- mByteStream = new DirectByteArrayServletOutputStream();
- }
- return mByteStream;
- }
-
- public PrintWriter getWriter()
- throws IOException
- {
- if (mByteStream != null)
- {
- throw new IllegalStateException();
- }
- if (mPrintWriter == null)
- {
- mCharWriter = new CharArrayWriter(4096);
- mPrintWriter = new PrintWriter(mCharWriter);
- }
-
- return mPrintWriter;
- }
-
- public int getStatus()
- {
- return mStatus;
- }
-
- public boolean isBytes()
- {
- return (mByteStream != null);
- }
-
- public boolean isChars()
- {
- return (mCharWriter != null);
- }
-
- public byte[] getBytes()
- {
- if (isBytes())
- {
- return mByteStream.toByteArray();
- }
- else
- {
- return null;
- }
- }
-
- public char[] getChars()
- {
- if (isChars())
- {
- mCharWriter.flush();
- return mCharWriter.toCharArray();
- }
- else
- {
- return null;
- }
- }
-
- public String toString()
- {
- if (isChars())
- {
- mCharWriter.flush();
- return mCharWriter.toString();
- }
- else if (isBytes())
- {
- return mByteStream.toString();
- }
- else
- return null;
- }
-
- public void clearWrappedResponse()
- throws IOException
- {
- resetBuffers();
- }
-
- /**
- * Flush the current buffered content to the wrapped
- * response (this could be a Servlet or Portlet response)
- * @throws IOException if content cannot be written
- */
- public void flushMarkupToWrappedResponse()
- throws IOException
- {
- RenderResponse response = getResponse();
-
- flushBuffer();
-
- if (isBytes())
- {
- response.getPortletOutputStream().write(getBytes());
- mByteStream.reset();
- }
- else if (isChars())
- {
- response.getWriter().write(getChars());
- mCharWriter.reset();
- }
-
- }
-
- /**
- * This is the Mojarra specific API used by its tags to flush the pre-view content
- * to the wrapped response. Works automatically in newer Mojarra -- one's that use
- * inspection to determine if the API is supported.
- * @throws IOException if content cannot be written
- */
- public void flushContentToWrappedResponse()
- throws IOException
- {
- mHasWriteBehindMarkup = true;
-
- flushMarkupToWrappedResponse();
-
- }
-
- /**
- * This is the MyFaces specific API used by its tags to flush the pre-view content
- * to the wrapped response. MyFaces doesn't yet use reflection so this will only work if you
- * subclass with a class that claims it implements the MyFaces interface.
- * @throws IOException if content cannot be written
- */
- public void flushToWrappedResponse()
- throws IOException
- {
- mHasWriteBehindMarkup = true;
-
- flushMarkupToWrappedResponse();
-
- }
-
- /**
- * Flush the current buffered content to the provided <code>Writer</code>
- * @param writer target <code>Writer</code>
- * @param encoding the encoding that should be used
- * @throws IOException if content cannot be written
- */
- public void flushToWriter(Writer writer, String encoding)
- throws IOException
- {
- flushBuffer();
-
- if (isBytes())
- {
- throw new IOException("Invalid flushToWriter as the code is writing bytes to an OutputStream.");
- }
- else if (isChars())
- {
- writer.write(getChars());
- mCharWriter.reset();
- }
- }
-
- /**
- * Clear the internal buffers.
- * @throws IOException if some odd error occurs
- */
- public void resetBuffers()
- throws IOException
- {
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
- /**
- * Called by the bridge to detect whether this response actively participated
- * in the Faces writeBehind support and hence has data that should be written
- * after the View is rendered. Typically, this method will return <code>true</code>
- * if the Faces write behind implementation specific flush api has been called
- * on this response, otherwise <code>false</code>
- *
- * @return an indication of whether the response actually particpated in the writeBehind mechanism.
- */
- public boolean hasFacesWriteBehindMarkup()
- {
- return mHasWriteBehindMarkup;
- }
-
-
- // ----------------------------------------------------------- Inner Classes
-
-
- private class DirectByteArrayServletOutputStream
- extends OutputStream
- {
- private DirectByteArrayOutputStream mByteArrayOutputStream;
-
- public DirectByteArrayServletOutputStream()
- {
- mByteArrayOutputStream = new DirectByteArrayOutputStream(4096);
- }
-
- public void write(int n)
- {
- mByteArrayOutputStream.write(n);
- }
-
- public byte[] toByteArray()
- {
- return mByteArrayOutputStream.toByteArray();
- }
-
- public int size()
- {
- return mByteArrayOutputStream.size();
- }
-
- public void reset()
- {
- mByteArrayOutputStream.reset();
- }
-
- }
-
-
- private class DirectByteArrayOutputStream
- extends ByteArrayOutputStream
- {
-
-
- // -------------------------------------------------------- Constructors
-
-
- public DirectByteArrayOutputStream(int initialCapacity)
- {
- super(initialCapacity);
- }
-
-
- // ------------------------------------------------------- PublicMethods
-
-
- /**
- * Return the buffer backing this ByteArrayOutputStream as a
- * ByteBuffer.
- * @return buf wrapped in a ByteBuffer
- */
- public ByteBuffer getByteBuffer()
- {
- return (ByteBuffer.wrap(buf, 0, count));
- }
-
- }
-
-
- // end of class BridgeRenderFilterResponseWrapper
-}
+/* 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.view;
+
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
+
+import java.nio.ByteBuffer;
+
+import javax.faces.context.FacesContext;
+
+import javax.portlet.RenderResponse;
+
+import javax.portlet.filter.RenderResponseWrapper;
+
+import javax.servlet.http.HttpServletResponse;
+
+import javax.portlet.faces.BridgeWriteBehindResponse;
+
+
+public class BridgeViewHandlerRenderResponseWrapper
+ extends RenderResponseWrapper
+ implements BridgeWriteBehindResponse
+{
+
+ private DirectByteArrayServletOutputStream mByteStream;
+ private CharArrayWriter mCharWriter;
+ private PrintWriter mPrintWriter;
+ private int mStatus = HttpServletResponse.SC_OK;
+ private boolean mHasWriteBehindMarkup = false;
+
+ public BridgeViewHandlerRenderResponseWrapper()
+ {
+ super((RenderResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse());
+ }
+
+
+ public BridgeViewHandlerRenderResponseWrapper(RenderResponse wrapped)
+ {
+ super(wrapped);
+ }
+
+ public void flushBuffer()
+ {
+ if (isChars())
+ {
+ mPrintWriter.flush();
+ }
+ }
+
+ public int getBufferSize()
+ {
+ if (isBytes())
+ {
+ return mByteStream.size();
+ }
+ else if (isChars())
+ {
+ return mCharWriter.size();
+ }
+ else
+ return 0;
+ }
+
+
+ public void reset()
+ {
+ super.reset();
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+ public void resetBuffer()
+ {
+ super.resetBuffer();
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+
+ public OutputStream getPortletOutputStream()
+ throws IOException
+ {
+ if (mPrintWriter != null)
+ {
+ throw new IllegalStateException();
+ }
+ if (mByteStream == null)
+ {
+ mByteStream = new DirectByteArrayServletOutputStream();
+ }
+ return mByteStream;
+ }
+
+ public PrintWriter getWriter()
+ throws IOException
+ {
+ if (mByteStream != null)
+ {
+ throw new IllegalStateException();
+ }
+ if (mPrintWriter == null)
+ {
+ mCharWriter = new CharArrayWriter(4096);
+ mPrintWriter = new PrintWriter(mCharWriter);
+ }
+
+ return mPrintWriter;
+ }
+
+ public int getStatus()
+ {
+ return mStatus;
+ }
+
+ public boolean isBytes()
+ {
+ return (mByteStream != null);
+ }
+
+ public boolean isChars()
+ {
+ return (mCharWriter != null);
+ }
+
+ public byte[] getBytes()
+ {
+ if (isBytes())
+ {
+ return mByteStream.toByteArray();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public char[] getChars()
+ {
+ if (isChars())
+ {
+ mCharWriter.flush();
+ return mCharWriter.toCharArray();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public String toString()
+ {
+ if (isChars())
+ {
+ mCharWriter.flush();
+ return mCharWriter.toString();
+ }
+ else if (isBytes())
+ {
+ return mByteStream.toString();
+ }
+ else
+ return null;
+ }
+
+ public void clearWrappedResponse()
+ throws IOException
+ {
+ resetBuffers();
+ }
+
+ /**
+ * Flush the current buffered content to the wrapped
+ * response (this could be a Servlet or Portlet response)
+ * @throws IOException if content cannot be written
+ */
+ public void flushMarkupToWrappedResponse()
+ throws IOException
+ {
+ RenderResponse response = getResponse();
+
+ flushBuffer();
+
+ if (isBytes())
+ {
+ response.getPortletOutputStream().write(getBytes());
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ response.getWriter().write(getChars());
+ mCharWriter.reset();
+ }
+
+ }
+
+ /**
+ * This is the Mojarra specific API used by its tags to flush the pre-view content
+ * to the wrapped response. Works automatically in newer Mojarra -- one's that use
+ * inspection to determine if the API is supported.
+ * @throws IOException if content cannot be written
+ */
+ public void flushContentToWrappedResponse()
+ throws IOException
+ {
+ mHasWriteBehindMarkup = true;
+
+ flushMarkupToWrappedResponse();
+
+ }
+
+ /**
+ * This is the MyFaces specific API used by its tags to flush the pre-view content
+ * to the wrapped response. MyFaces doesn't yet use reflection so this will only work if you
+ * subclass with a class that claims it implements the MyFaces interface.
+ * @throws IOException if content cannot be written
+ */
+ public void flushToWrappedResponse()
+ throws IOException
+ {
+ mHasWriteBehindMarkup = true;
+
+ flushMarkupToWrappedResponse();
+
+ }
+
+ /**
+ * Flush the current buffered content to the provided <code>Writer</code>
+ * @param writer target <code>Writer</code>
+ * @param encoding the encoding that should be used
+ * @throws IOException if content cannot be written
+ */
+ public void flushToWriter(Writer writer, String encoding)
+ throws IOException
+ {
+ flushBuffer();
+
+ if (isBytes())
+ {
+ throw new IOException("Invalid flushToWriter as the code is writing bytes to an OutputStream.");
+ }
+ else if (isChars())
+ {
+ writer.write(getChars());
+ mCharWriter.reset();
+ }
+ }
+
+ /**
+ * Clear the internal buffers.
+ * @throws IOException if some odd error occurs
+ */
+ public void resetBuffers()
+ throws IOException
+ {
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+ /**
+ * Called by the bridge to detect whether this response actively participated
+ * in the Faces writeBehind support and hence has data that should be written
+ * after the View is rendered. Typically, this method will return <code>true</code>
+ * if the Faces write behind implementation specific flush api has been called
+ * on this response, otherwise <code>false</code>
+ *
+ * @return an indication of whether the response actually particpated in the writeBehind mechanism.
+ */
+ public boolean hasFacesWriteBehindMarkup()
+ {
+ return mHasWriteBehindMarkup;
+ }
+
+
+ // ----------------------------------------------------------- Inner Classes
+
+
+ private class DirectByteArrayServletOutputStream
+ extends OutputStream
+ {
+ private DirectByteArrayOutputStream mByteArrayOutputStream;
+
+ public DirectByteArrayServletOutputStream()
+ {
+ mByteArrayOutputStream = new DirectByteArrayOutputStream(4096);
+ }
+
+ public void write(int n)
+ {
+ mByteArrayOutputStream.write(n);
+ }
+
+ public byte[] toByteArray()
+ {
+ return mByteArrayOutputStream.toByteArray();
+ }
+
+ public int size()
+ {
+ return mByteArrayOutputStream.size();
+ }
+
+ public void reset()
+ {
+ mByteArrayOutputStream.reset();
+ }
+
+ }
+
+
+ private class DirectByteArrayOutputStream
+ extends ByteArrayOutputStream
+ {
+
+
+ // -------------------------------------------------------- Constructors
+
+
+ public DirectByteArrayOutputStream(int initialCapacity)
+ {
+ super(initialCapacity);
+ }
+
+
+ // ------------------------------------------------------- PublicMethods
+
+
+ /**
+ * Return the buffer backing this ByteArrayOutputStream as a
+ * ByteBuffer.
+ * @return buf wrapped in a ByteBuffer
+ */
+ public ByteBuffer getByteBuffer()
+ {
+ return (ByteBuffer.wrap(buf, 0, count));
+ }
+
+ }
+
+
+ // end of class BridgeRenderFilterResponseWrapper
+}
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerRenderResponseWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java Fri Mar 18 23:09:20 2011
@@ -1,385 +1,385 @@
-/* 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.view;
-
-import java.io.ByteArrayOutputStream;
-import java.io.CharArrayWriter;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.io.Writer;
-
-import java.nio.ByteBuffer;
-
-import javax.faces.context.FacesContext;
-
-import javax.portlet.RenderResponse;
-import javax.portlet.ResourceResponse;
-
-import javax.portlet.filter.ResourceResponseWrapper;
-
-import javax.servlet.http.HttpServletResponse;
-
-import javax.portlet.faces.BridgeWriteBehindResponse;
-
-
-public class BridgeViewHandlerResourceResponseWrapper
- extends ResourceResponseWrapper
- implements BridgeWriteBehindResponse
-{
-
- private DirectByteArrayServletOutputStream mByteStream;
- private CharArrayWriter mCharWriter;
- private PrintWriter mPrintWriter;
- private int mStatus = HttpServletResponse.SC_OK;
- private boolean mHasWriteBehindMarkup = false;
-
- public BridgeViewHandlerResourceResponseWrapper()
- {
- super((ResourceResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse());
- }
-
-
- public BridgeViewHandlerResourceResponseWrapper(ResourceResponse wrapped)
- {
- super(wrapped);
- }
-
- public void flushBuffer()
- {
- if (isChars())
- {
- mPrintWriter.flush();
- }
- }
-
- public int getBufferSize()
- {
- if (isBytes())
- {
- return mByteStream.size();
- }
- else if (isChars())
- {
- return mCharWriter.size();
- }
- else
- return 0;
- }
-
-
- public void reset()
- {
- super.reset();
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
- public void resetBuffer()
- {
- super.resetBuffer();
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
-
- public OutputStream getPortletOutputStream()
- throws IOException
- {
- if (mPrintWriter != null)
- {
- throw new IllegalStateException();
- }
- if (mByteStream == null)
- {
- mByteStream = new DirectByteArrayServletOutputStream();
- }
- return mByteStream;
- }
-
- public PrintWriter getWriter()
- throws IOException
- {
- if (mByteStream != null)
- {
- throw new IllegalStateException();
- }
- if (mPrintWriter == null)
- {
- mCharWriter = new CharArrayWriter(4096);
- mPrintWriter = new PrintWriter(mCharWriter);
- }
-
- return mPrintWriter;
- }
-
- public int getStatus()
- {
- return mStatus;
- }
-
- public boolean isBytes()
- {
- return (mByteStream != null);
- }
-
- public boolean isChars()
- {
- return (mCharWriter != null);
- }
-
- public byte[] getBytes()
- {
- if (isBytes())
- {
- return mByteStream.toByteArray();
- }
- else
- {
- return null;
- }
- }
-
- public char[] getChars()
- {
- if (isChars())
- {
- mCharWriter.flush();
- return mCharWriter.toCharArray();
- }
- else
- {
- return null;
- }
- }
-
- public String toString()
- {
- if (isChars())
- {
- mCharWriter.flush();
- return mCharWriter.toString();
- }
- else if (isBytes())
- {
- return mByteStream.toString();
- }
- else
- return null;
- }
-
- public void clearWrappedResponse()
- throws IOException
- {
- resetBuffers();
- }
-
- /**
- * Flush the current buffered content to the wrapped
- * response (this could be a Servlet or Portlet response)
- * @throws IOException if content cannot be written
- */
- public void flushMarkupToWrappedResponse()
- throws IOException
- {
- ResourceResponse response = getResponse();
-
- flushBuffer();
-
- if (isBytes())
- {
- response.getPortletOutputStream().write(getBytes());
- mByteStream.reset();
- }
- else if (isChars())
- {
- response.getWriter().write(getChars());
- mCharWriter.reset();
- }
-
- }
-
- /**
- * This is the Mojarra specific API used by its tags to flush the pre-view content
- * to the wrapped response. Works automatically in newer Mojarra -- one's that use
- * inspection to determine if the API is supported.
- * @throws IOException if content cannot be written
- */
- public void flushContentToWrappedResponse()
- throws IOException
- {
- mHasWriteBehindMarkup = true;
-
- flushMarkupToWrappedResponse();
-
- }
-
- /**
- * This is the MyFaces specific API used by its tags to flush the pre-view content
- * to the wrapped response. MyFaces doesn't yet use reflection so this will only work if you
- * subclass with a class that claims it implements the MyFaces interface.
- * @throws IOException if content cannot be written
- */
- public void flushToWrappedResponse()
- throws IOException
- {
- mHasWriteBehindMarkup = true;
-
- flushMarkupToWrappedResponse();
-
- }
-
- /**
- * Flush the current buffered content to the provided <code>Writer</code>
- * @param writer target <code>Writer</code>
- * @param encoding the encoding that should be used
- * @throws IOException if content cannot be written
- */
- public void flushToWriter(Writer writer, String encoding)
- throws IOException
- {
- flushBuffer();
-
- if (isBytes())
- {
- throw new IOException("Invalid flushToWriter as the code is writing bytes to an OutputStream.");
- }
- else if (isChars())
- {
- writer.write(getChars());
- mCharWriter.reset();
- }
- }
-
- /**
- * Clear the internal buffers.
- * @throws IOException if some odd error occurs
- */
- public void resetBuffers()
- throws IOException
- {
- if (isBytes())
- {
- mByteStream.reset();
- }
- else if (isChars())
- {
- mPrintWriter.flush();
- mCharWriter.reset();
- }
- }
-
- /**
- * Called by the bridge to detect whether this response actively participated
- * in the Faces writeBehind support and hence has data that should be written
- * after the View is rendered. Typically, this method will return <code>true</code>
- * if the Faces write behind implementation specific flush api has been called
- * on this response, otherwise <code>false</code>
- *
- * @return an indication of whether the response actually particpated in the writeBehind mechanism.
- */
- public boolean hasFacesWriteBehindMarkup()
- {
- return mHasWriteBehindMarkup;
- }
-
-
- // ----------------------------------------------------------- Inner Classes
-
-
- private class DirectByteArrayServletOutputStream
- extends OutputStream
- {
- private DirectByteArrayOutputStream mByteArrayOutputStream;
-
- public DirectByteArrayServletOutputStream()
- {
- mByteArrayOutputStream = new DirectByteArrayOutputStream(4096);
- }
-
- public void write(int n)
- {
- mByteArrayOutputStream.write(n);
- }
-
- public byte[] toByteArray()
- {
- return mByteArrayOutputStream.toByteArray();
- }
-
- public int size()
- {
- return mByteArrayOutputStream.size();
- }
-
- public void reset()
- {
- mByteArrayOutputStream.reset();
- }
-
- }
-
-
- private class DirectByteArrayOutputStream
- extends ByteArrayOutputStream
- {
-
-
- // -------------------------------------------------------- Constructors
-
-
- public DirectByteArrayOutputStream(int initialCapacity)
- {
- super(initialCapacity);
- }
-
-
- // ------------------------------------------------------- PublicMethods
-
-
- /**
- * Return the buffer backing this ByteArrayOutputStream as a
- * ByteBuffer.
- * @return buf wrapped in a ByteBuffer
- */
- public ByteBuffer getByteBuffer()
- {
- return (ByteBuffer.wrap(buf, 0, count));
- }
-
- }
-
-
- // end of class BridgeRenderFilterResponseWrapper
-}
+/* 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.view;
+
+import java.io.ByteArrayOutputStream;
+import java.io.CharArrayWriter;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.io.Writer;
+
+import java.nio.ByteBuffer;
+
+import javax.faces.context.FacesContext;
+
+import javax.portlet.RenderResponse;
+import javax.portlet.ResourceResponse;
+
+import javax.portlet.filter.ResourceResponseWrapper;
+
+import javax.servlet.http.HttpServletResponse;
+
+import javax.portlet.faces.BridgeWriteBehindResponse;
+
+
+public class BridgeViewHandlerResourceResponseWrapper
+ extends ResourceResponseWrapper
+ implements BridgeWriteBehindResponse
+{
+
+ private DirectByteArrayServletOutputStream mByteStream;
+ private CharArrayWriter mCharWriter;
+ private PrintWriter mPrintWriter;
+ private int mStatus = HttpServletResponse.SC_OK;
+ private boolean mHasWriteBehindMarkup = false;
+
+ public BridgeViewHandlerResourceResponseWrapper()
+ {
+ super((ResourceResponse) FacesContext.getCurrentInstance().getExternalContext().getResponse());
+ }
+
+
+ public BridgeViewHandlerResourceResponseWrapper(ResourceResponse wrapped)
+ {
+ super(wrapped);
+ }
+
+ public void flushBuffer()
+ {
+ if (isChars())
+ {
+ mPrintWriter.flush();
+ }
+ }
+
+ public int getBufferSize()
+ {
+ if (isBytes())
+ {
+ return mByteStream.size();
+ }
+ else if (isChars())
+ {
+ return mCharWriter.size();
+ }
+ else
+ return 0;
+ }
+
+
+ public void reset()
+ {
+ super.reset();
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+ public void resetBuffer()
+ {
+ super.resetBuffer();
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+
+ public OutputStream getPortletOutputStream()
+ throws IOException
+ {
+ if (mPrintWriter != null)
+ {
+ throw new IllegalStateException();
+ }
+ if (mByteStream == null)
+ {
+ mByteStream = new DirectByteArrayServletOutputStream();
+ }
+ return mByteStream;
+ }
+
+ public PrintWriter getWriter()
+ throws IOException
+ {
+ if (mByteStream != null)
+ {
+ throw new IllegalStateException();
+ }
+ if (mPrintWriter == null)
+ {
+ mCharWriter = new CharArrayWriter(4096);
+ mPrintWriter = new PrintWriter(mCharWriter);
+ }
+
+ return mPrintWriter;
+ }
+
+ public int getStatus()
+ {
+ return mStatus;
+ }
+
+ public boolean isBytes()
+ {
+ return (mByteStream != null);
+ }
+
+ public boolean isChars()
+ {
+ return (mCharWriter != null);
+ }
+
+ public byte[] getBytes()
+ {
+ if (isBytes())
+ {
+ return mByteStream.toByteArray();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public char[] getChars()
+ {
+ if (isChars())
+ {
+ mCharWriter.flush();
+ return mCharWriter.toCharArray();
+ }
+ else
+ {
+ return null;
+ }
+ }
+
+ public String toString()
+ {
+ if (isChars())
+ {
+ mCharWriter.flush();
+ return mCharWriter.toString();
+ }
+ else if (isBytes())
+ {
+ return mByteStream.toString();
+ }
+ else
+ return null;
+ }
+
+ public void clearWrappedResponse()
+ throws IOException
+ {
+ resetBuffers();
+ }
+
+ /**
+ * Flush the current buffered content to the wrapped
+ * response (this could be a Servlet or Portlet response)
+ * @throws IOException if content cannot be written
+ */
+ public void flushMarkupToWrappedResponse()
+ throws IOException
+ {
+ ResourceResponse response = getResponse();
+
+ flushBuffer();
+
+ if (isBytes())
+ {
+ response.getPortletOutputStream().write(getBytes());
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ response.getWriter().write(getChars());
+ mCharWriter.reset();
+ }
+
+ }
+
+ /**
+ * This is the Mojarra specific API used by its tags to flush the pre-view content
+ * to the wrapped response. Works automatically in newer Mojarra -- one's that use
+ * inspection to determine if the API is supported.
+ * @throws IOException if content cannot be written
+ */
+ public void flushContentToWrappedResponse()
+ throws IOException
+ {
+ mHasWriteBehindMarkup = true;
+
+ flushMarkupToWrappedResponse();
+
+ }
+
+ /**
+ * This is the MyFaces specific API used by its tags to flush the pre-view content
+ * to the wrapped response. MyFaces doesn't yet use reflection so this will only work if you
+ * subclass with a class that claims it implements the MyFaces interface.
+ * @throws IOException if content cannot be written
+ */
+ public void flushToWrappedResponse()
+ throws IOException
+ {
+ mHasWriteBehindMarkup = true;
+
+ flushMarkupToWrappedResponse();
+
+ }
+
+ /**
+ * Flush the current buffered content to the provided <code>Writer</code>
+ * @param writer target <code>Writer</code>
+ * @param encoding the encoding that should be used
+ * @throws IOException if content cannot be written
+ */
+ public void flushToWriter(Writer writer, String encoding)
+ throws IOException
+ {
+ flushBuffer();
+
+ if (isBytes())
+ {
+ throw new IOException("Invalid flushToWriter as the code is writing bytes to an OutputStream.");
+ }
+ else if (isChars())
+ {
+ writer.write(getChars());
+ mCharWriter.reset();
+ }
+ }
+
+ /**
+ * Clear the internal buffers.
+ * @throws IOException if some odd error occurs
+ */
+ public void resetBuffers()
+ throws IOException
+ {
+ if (isBytes())
+ {
+ mByteStream.reset();
+ }
+ else if (isChars())
+ {
+ mPrintWriter.flush();
+ mCharWriter.reset();
+ }
+ }
+
+ /**
+ * Called by the bridge to detect whether this response actively participated
+ * in the Faces writeBehind support and hence has data that should be written
+ * after the View is rendered. Typically, this method will return <code>true</code>
+ * if the Faces write behind implementation specific flush api has been called
+ * on this response, otherwise <code>false</code>
+ *
+ * @return an indication of whether the response actually particpated in the writeBehind mechanism.
+ */
+ public boolean hasFacesWriteBehindMarkup()
+ {
+ return mHasWriteBehindMarkup;
+ }
+
+
+ // ----------------------------------------------------------- Inner Classes
+
+
+ private class DirectByteArrayServletOutputStream
+ extends OutputStream
+ {
+ private DirectByteArrayOutputStream mByteArrayOutputStream;
+
+ public DirectByteArrayServletOutputStream()
+ {
+ mByteArrayOutputStream = new DirectByteArrayOutputStream(4096);
+ }
+
+ public void write(int n)
+ {
+ mByteArrayOutputStream.write(n);
+ }
+
+ public byte[] toByteArray()
+ {
+ return mByteArrayOutputStream.toByteArray();
+ }
+
+ public int size()
+ {
+ return mByteArrayOutputStream.size();
+ }
+
+ public void reset()
+ {
+ mByteArrayOutputStream.reset();
+ }
+
+ }
+
+
+ private class DirectByteArrayOutputStream
+ extends ByteArrayOutputStream
+ {
+
+
+ // -------------------------------------------------------- Constructors
+
+
+ public DirectByteArrayOutputStream(int initialCapacity)
+ {
+ super(initialCapacity);
+ }
+
+
+ // ------------------------------------------------------- PublicMethods
+
+
+ /**
+ * Return the buffer backing this ByteArrayOutputStream as a
+ * ByteBuffer.
+ * @return buf wrapped in a ByteBuffer
+ */
+ public ByteBuffer getByteBuffer()
+ {
+ return (ByteBuffer.wrap(buf, 0, count));
+ }
+
+ }
+
+
+ // end of class BridgeRenderFilterResponseWrapper
+}
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/BridgeViewHandlerResourceResponseWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/PortletJspViewDeclarationLanguageImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/PortletJspViewDeclarationLanguageImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/PortletViewDeclarationLanguageFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/application/view/PortletViewDeclarationLanguageFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java Fri Mar 18 23:09:20 2011
@@ -1658,7 +1658,7 @@ public class BridgeImpl
if (preserved != null)
{
requestMap.put(FACES_CONTEXT_SCOPE, preserved);
- }
+ }
}
private HashMap<Object, Object> mPreservedFacesContextScopeAttrs(FacesContext context)
@@ -1701,7 +1701,7 @@ public class BridgeImpl
{
context.setViewRoot(viewRoot);
}
-
+
// restore FC scope without overwriting existing/new values
Map<Object, Object> attrs = (Map<Object, Object>) requestMap.remove(FACES_CONTEXT_SCOPE);
@@ -1717,9 +1717,9 @@ public class BridgeImpl
}
}
- // Delay removing from the bridge request scope until after we are sure that
- // render completes okay and the state is saved by Faces -- otherwise
- // we won't be able to reply/retry,
+ // Delay removing from the bridge request scope until after we are sure that
+ // render completes okay and the state is saved by Faces -- otherwise
+ // we won't be able to reply/retry,
// Messages get restored in a phase listener
@@ -1829,9 +1829,9 @@ public class BridgeImpl
if (attrs != null)
{
attrs.clear();
+ }
}
}
- }
private LRUMap createRequestScopeMap(PortletContext portletContext)
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/BridgeImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgePortletRequestWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:888894-923981,925027-929723
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/bridge/wrapper/BridgeRenderRequestWrapper.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExceptionHanderFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExceptionHanderFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java Fri Mar 18 23:09:20 2011
@@ -522,7 +522,7 @@ public class PortletExternalContextImpl
if (!encodeScopeInRenderUrl)
{
actionURL.setParameter(RENDERURL_NO_SCOPE, "1");
- }
+ }
}
// Add parameters so they don't get lost
@@ -2424,12 +2424,12 @@ public class PortletExternalContextImpl
if (suffix.startsWith("."))
{
url = url.substring(0, i) + suffix;
- }
- else
- {
- // shouldn't happen
+ }
+ else
+ {
+ // shouldn't happen
url = url.substring(0, i) + "." + suffix;
- }
+ }
// now verify if this exists
String testPath = url.startsWith("/") ? url : "/"+url;
try
@@ -2437,7 +2437,7 @@ public class PortletExternalContextImpl
if (mPortletContext.getResource(testPath) != null)
{
break;
- }
+ }
} catch (MalformedURLException m)
{
// TODO: didn't expect to get here
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:888894-923981,925027-1033781
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletExternalContextImpl.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletFacesContextFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletFacesContextFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletPartialViewContextFactoryImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletPartialViewContextFactoryImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletPartialViewContextImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/context/PortletPartialViewContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/el/PortletELContextImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/el/PortletELResolver.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/preference/PreferenceImpl.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/preference/PreferenceValuesList.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/FacesVersionUtil.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/HTTPUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java?rev=1083102&r1=1083101&r2=1083102&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java (original)
+++ myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java Fri Mar 18 23:09:20 2011
@@ -152,7 +152,7 @@ public final class QueryString implement
if (mFragment != null)
{
mQueryString += mFragment;
- }
+ }
}
else
{
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:888894-923981,946789-982807
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/QueryString.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/TextUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/URLUtils.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:888894-923981,987340
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/FacesConfigurationProcessor.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/config/WebConfigurationProcessor.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/EnumerationIterator.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletAbstractMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletApplicationMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletInitParameterMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestHeaderMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestHeaderValuesMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestHeaders.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterMap.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Mar 18 23:09:20 2011
@@ -1,2 +1,2 @@
/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:888894-923981,925027-997838
-/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069
+/myfaces/portlet-bridge/core/trunk_3.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletRequestParameterValuesMap.java:1068501,1068512,1068521,1078973,1078986,1079843-1083069,1083072,1083088-1083093
Propchange: myfaces/portlet-bridge/core/tags/3.0.0-alpha/impl/src/main/java/org/apache/myfaces/portlet/faces/util/map/PortletSessionMap.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL