myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfreed...@apache.org
Subject svn commit: r955744 [5/7] - in /myfaces/portlet-bridge/core/trunk/examples: carstore/src/main/java/carstore/ carstore/src/main/java/carstore/bundles/ carstore/src/main/java/org/apache/myfaces/portlet/faces/examples/renderkit/ carstore/src/main/resource...
Date Thu, 17 Jun 2010 21:00:52 GMT
Added: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/jettypluto/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/jettypluto/index.jsp?rev=955744&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/jettypluto/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/jettypluto/index.jsp Thu Jun 17 21:00:48 2010
@@ -0,0 +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">
+        &copy; 2003-2005 Apache Software Foundation
+    </div>
+
+</div>
+
+</body>
+
+</html>
+

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/optionsPanel.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/optionsPanel.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/optionsPanel.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/optionsPanel.jsp Thu Jun 17 21:00:48 2010
@@ -1,26 +1,20 @@
 <!--
-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.
 -->
 <%@ page contentType="text/html"
          isELIgnored="false" %>

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/storeFront.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/storeFront.jsp?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/storeFront.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/storeFront.jsp Thu Jun 17 21:00:48 2010
@@ -1,26 +1,20 @@
 <!--
-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.
 -->
 
 <%@ page contentType="text/html"

Modified: myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/stylesheet.css
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/stylesheet.css?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/stylesheet.css (original)
+++ myfaces/portlet-bridge/core/trunk/examples/carstore/src/main/webapp/stylesheet.css Thu Jun 17 21:00:48 2010
@@ -1,156 +1,150 @@
-/*
- * 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
- */
-
-body {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-td {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-th {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-.bodystyle {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-.small {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 9px;
-}
-
-.medium {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-}
-
-.maintitle {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 14px;
-    color: #330066;
-}
-
-.subtitle {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    color: #93B629;
-}
-
-.subtitlebig {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 16px;
-    color: #93B629;
-    padding-top: 10;
-    padding-bottom: 10;
-}
-
-.big {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 16px;
-}
-
-.xbig {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 24px;
-}
-
-.expanded {
-    font-family: Arial, Helvetica, sans-serif;
-    font-size: 12px;
-    line-height: 24px;
-    letter-spacing: 2px;
-}
-
-.justified {
-    font-family: Arial, Helvetica, sans-serif;
-    text-align: justify;
-}
-
-.footer {
-    font-family: "Times New Roman", Times, serif;
-    font-size: 9px;
-    color: #999999;
-}
-
-.box1 {
-    padding: 3px;
-    border-width: medium;
-    border-style: solid;
-    border-color: #CCCCCC #666666 #666666 #CCCCCC;
-}
-
-.box2 {
-    font-style: italic;
-    word-spacing: 2pt;
-    padding: 3px;
-    border: 1px solid;
-}
-
-.align-left {
-    text-align: left;
-}
-
-.panel-background {
-    background-color: #7171A5;
-    border: 5px outset #71A5A5;
-    border-collapse: collapse;
-    font-family: sans-serif;
-    font-size: 14pt;
-    padding: 10px;
-}
-
-.package-selected {
-    background-color: #93B629;
-}
-
-.package-unselected {
-    background-color: #C0C0C0;
-}
-
-.option-unselected {
-    background-color: #FFFFFF;
-}
-
-.top-table {
-    padding: 0;
-    border: 0;
-    width: 660px;
-}
-
-.storeFrontCar {
-    padding: 0;    
-    border: 0;
-}
-
-.validationMessage {
-    color: red;
-}
+/* 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.
+ *
+ */
+
+body {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+td {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+th {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+.bodystyle {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+.small {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 9px;
+}
+
+.medium {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+}
+
+.maintitle {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 14px;
+    color: #330066;
+}
+
+.subtitle {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    color: #93B629;
+}
+
+.subtitlebig {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 16px;
+    color: #93B629;
+    padding-top: 10;
+    padding-bottom: 10;
+}
+
+.big {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 16px;
+}
+
+.xbig {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 24px;
+}
+
+.expanded {
+    font-family: Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    line-height: 24px;
+    letter-spacing: 2px;
+}
+
+.justified {
+    font-family: Arial, Helvetica, sans-serif;
+    text-align: justify;
+}
+
+.footer {
+    font-family: "Times New Roman", Times, serif;
+    font-size: 9px;
+    color: #999999;
+}
+
+.box1 {
+    padding: 3px;
+    border-width: medium;
+    border-style: solid;
+    border-color: #CCCCCC #666666 #666666 #CCCCCC;
+}
+
+.box2 {
+    font-style: italic;
+    word-spacing: 2pt;
+    padding: 3px;
+    border: 1px solid;
+}
+
+.align-left {
+    text-align: left;
+}
+
+.panel-background {
+    background-color: #7171A5;
+    border: 5px outset #71A5A5;
+    border-collapse: collapse;
+    font-family: sans-serif;
+    font-size: 14pt;
+    padding: 10px;
+}
+
+.package-selected {
+    background-color: #93B629;
+}
+
+.package-unselected {
+    background-color: #C0C0C0;
+}
+
+.option-unselected {
+    background-color: #FFFFFF;
+}
+
+.top-table {
+    padding: 0;
+    border: 0;
+    width: 660px;
+}
+
+.storeFrontCar {
+    padding: 0;    
+    border: 0;
+}
+
+.validationMessage {
+    color: red;
+}

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/NumberBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/NumberBean.java?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/NumberBean.java (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/NumberBean.java Thu Jun 17 21:00:48 2010
@@ -1,16 +1,21 @@
-/**
- * Licensed 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.
- */
+ /* 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 guess;
 

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/java/guess/facelets/PortletFaceletViewHandler.java Thu Jun 17 21:00:48 2010
@@ -1,16 +1,21 @@
-/**
- * Licensed 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.
- */
+ /* 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 guess.facelets;
 

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/resources/META-INF/NOTICE?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/resources/META-INF/NOTICE Thu Jun 17 21:00:48 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, <http://www.oracle.com/> and are licensed to 
 the Apache Software Foundation under the "Software Grant 
 and Corporate Contribution License Agreement"

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 17 21:00:48 2010
@@ -1,18 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <!--
- Licensed 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.
-
- $Id: faces-config.xml,v 1.4 2008/07/13 19:01:52 rlubke Exp $
+ * 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.
+ *
 -->
 <!DOCTYPE faces-config PUBLIC
   "-//Sun Microsystems, Inc.//DTD JavaServer Faces Config 1.0//EN"

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Thu Jun 17 21:00:48 2010
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-
-<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+	   
+-->
+
+<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
 <web-app 
    xmlns="http://java.sun.com/xml/ns/javaee" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -31,25 +31,26 @@
     <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
     <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
   </context-param>
-  
-  <!-- Listeners -->
+  
+  <!-- Listeners -->
   <listener>
     <listener-class>
       com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener
     </listener-class>
   </listener>
-  
+  
   <listener>
-    <listener-class>
      com.bekk.boss.pluto.embedded.util.PortalStartupListener
+    <listener-class>
+      com.bekk.boss.pluto.embedded.util.PortalStartupListener
     </listener-class>
   </listener>
-
-  <!-- Filters and Mappings -->
+
+  <!-- Filters and Mappings -->
   <filter>
     <filter-name>plutoResourceFilter</filter-name>
     <filter-class>com.bekk.boss.pluto.embedded.util.PlutResourcesFilter</filter-class>
   </filter>
-
+
   <filter>
     <filter-name>plutoPortalDriver</filter-name>
     <filter-class>com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter</filter-class>
@@ -57,21 +58,21 @@
 	
   <filter-mapping>
     <filter-name>plutoResourceFilter</filter-name>
-    <url-pattern>*.css</url-pattern>
+    <url-pattern>*.css</url-pattern>
     <url-pattern>*.gif</url-pattern>
     <url-pattern>*.png</url-pattern>
     <url-pattern>*.js</url-pattern>
   </filter-mapping>
-
+
   <filter-mapping>
     <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/pluto/index.jsp</url-pattern>
-    <url-pattern>/pluto/index.jsp/*</url-pattern>
-  </filter-mapping>
-
+    <url-pattern>/jettypluto/index.jsp</url-pattern>
+    <url-pattern>/jettypluto/index.jsp/*</url-pattern>
+  </filter-mapping>
+
   <!-- Servlets and Mappings -->
-
-  <!--
+
+  <!--
     The default servlet.                                                  
     This servlet, normally mapped to /, provides the handling for static  
     content, OPTIONS and TRACE methods for the context.                   
@@ -114,7 +115,7 @@
                                                                           
      maxCachedFiles    Maximum number of files in the cache               
   -->
-
+
   <servlet>
     <servlet-name>default</servlet-name>
     <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
@@ -151,7 +152,7 @@
       <param-value>true</param-value>
     </init-param>  
     <load-on-startup>0</load-on-startup>
-  </servlet> 
+  </servlet> 
 
   <servlet id="jsp">
     <servlet-name>jsp</servlet-name>
@@ -171,11 +172,11 @@
     <load-on-startup>0</load-on-startup>
   </servlet>
 
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/</url-pattern>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
-
+
   <servlet-mapping> 
     <servlet-name>jsp</servlet-name> 
     <url-pattern>*.jsp</url-pattern> 
@@ -186,13 +187,13 @@
     <url-pattern>*.JSPF</url-pattern>
     <url-pattern>*.JSPX</url-pattern>
     <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-
+  </servlet-mapping>
+
   <!-- Other settings -->
   <session-config>
     <session-timeout>60</session-timeout>
   </session-config>
-
+
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/web.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/WEB-INF/web.xml Thu Jun 17 21:00:48 2010
@@ -1,25 +1,29 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<!--
- Licensed 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.
 
- $Id: web.xml,v 1.5 2008/07/13 19:01:52 rlubke Exp $
+<!--
+ * 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.
+ *
 -->
-<!DOCTYPE web-app PUBLIC
-  "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-  "http://java.sun.com/dtd/web-app_2_3.dtd">
-
 
-<web-app>
+<web-app version="2.5"
+         xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" >
 
     <display-name>Facelets Tutorial</display-name>
     <description>Number Guess Game</description>

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/guess.xhtml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/guess.xhtml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/guess.xhtml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/guess.xhtml Thu Jun 17 21:00:48 2010
@@ -1,51 +1,57 @@
-<!--
- Licensed 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.
-
- $Id: guess.xhtml,v 1.2 2008/07/13 19:01:42 rlubke Exp $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html">
-<body>
-
-This text above will not be displayed.
-
-<ui:composition template="/template.xhtml">
-
-This text will not be displayed.
-
-  <ui:define name="title">
-    I'm thinking of a number from #{NumberBean.min} to #{NumberBean.max}.  Can you guess it?
-  </ui:define>
-
-This text will also not be displayed.
-
-  <ui:define name="body">
-    <h:form id="helloForm">
-      <h:inputText type="text" id="userNo" value="#{NumberBean.guess}" validator="#{NumberBean.validate}"/>
-      <br/>
-      <h:commandButton type="submit" id="submit" action="success" value="Submit" />
-      <br/>
-      <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" id="errors1" for="userNo"/>
-    </h:form>
-  </ui:define>
-
-This text will not be displayed.
-  
-</ui:composition>
-
-This text below will also not be displayed.
-
-</body>
+<!--
+ 
+ * 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.
+ *
+ 
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html">
+<body>
+
+This text above will not be displayed.
+
+<ui:composition template="/template.xhtml">
+
+This text will not be displayed.
+
+  <ui:define name="title">
+    I'm thinking of a number from #{NumberBean.min} to #{NumberBean.max}.  Can you guess it?
+  </ui:define>
+
+This text will also not be displayed.
+
+  <ui:define name="body">
+    <h:form id="helloForm">
+      <h:inputText type="text" id="userNo" value="#{NumberBean.guess}" validator="#{NumberBean.validate}"/>
+      <br/>
+      <h:commandButton type="submit" id="submit" action="success" value="Submit" />
+      <br/>
+      <h:message showSummary="true" showDetail="false" style="color: red; font-weight: bold;" id="errors1" for="userNo"/>
+    </h:form>
+  </ui:define>
+
+This text will not be displayed.
+  
+</ui:composition>
+
+This text below will also not be displayed.
+
+</body>
 </html>
\ No newline at end of file

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/index.html?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/index.html (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/index.html Thu Jun 17 21:00:48 2010
@@ -1,26 +1,30 @@
-<!--
- Licensed 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.
-
- $Id: index.html,v 1.3 2008/07/13 19:01:42 rlubke Exp $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<meta http-equiv="refresh" content="0; url=./guess.jsf" />
-<title>Untitled Document</title>
-</head>
-
-<body>
-</body>
-</html>
+<!--
+ * 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.
+ *
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<meta http-equiv="refresh" content="0; url=./guess.jsf" />
+<title>Untitled Document</title>
+</head>
+
+<body>
+</body>
+</html>

Added: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/jettypluto/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/jettypluto/index.jsp?rev=955744&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/jettypluto/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/jettypluto/index.jsp Thu Jun 17 21:00:48 2010
@@ -0,0 +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">
+        &copy; 2003-2005 Apache Software Foundation
+    </div>
+
+</div>
+
+</body>
+
+</html>
+

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/response.xhtml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/response.xhtml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/response.xhtml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/response.xhtml Thu Jun 17 21:00:48 2010
@@ -1,37 +1,41 @@
-<!--
- Licensed 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.
-
- $Id: response.xhtml,v 1.3 2008/07/13 19:01:42 rlubke Exp $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets"
-      xmlns:h="http://java.sun.com/jsf/html">
-<body>
-
-<ui:composition template="/template.xhtml">
-
-  <ui:define name="title">
-    #{NumberBean.message}
-  </ui:define>
-  
-  <ui:define name="body">
-    <form jsfc="h:form">
-    <input jsfc="h:commandButton" type="submit" id="back" value="Back" action="success"/>
-    </form>
-  </ui:define>
-  
-</ui:composition>
-
-</body>
+<!--
+ * 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.
+ *
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets"
+      xmlns:h="http://java.sun.com/jsf/html">
+<body>
+
+<ui:composition template="/template.xhtml">
+
+  <ui:define name="title">
+    #{NumberBean.message}
+  </ui:define>
+  
+  <ui:define name="body">
+    <form jsfc="h:form">
+    <input jsfc="h:commandButton" type="submit" id="back" value="Back" action="success"/>
+    </form>
+  </ui:define>
+  
+</ui:composition>
+
+</body>
 </html>
\ No newline at end of file

Modified: myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/template.xhtml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/template.xhtml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/template.xhtml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/facelets-guess/src/main/webapp/template.xhtml Thu Jun 17 21:00:48 2010
@@ -1,39 +1,43 @@
-<!--
- Licensed 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.
-
- $Id: template.xhtml,v 1.2 2008/07/13 19:01:42 rlubke Exp $
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:ui="http://java.sun.com/jsf/facelets">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
-<title>Facelets: Number Guess Tutorial</title>
-<style type="text/css">
-body {
-  font-family: Verdana, Arial, Helvetica, sans-serif;
-  font-size: small;
-}
-</style>
-</head>
-
-<body>
-<h1>
-  <ui:insert name="title">Default Title</ui:insert>
-</h1>
-<p>
-  <ui:insert name="body">Default Body</ui:insert>
-</p>
-</body>
-
+<!--
+ * 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.
+ *
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:ui="http://java.sun.com/jsf/facelets">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
+<title>Facelets: Number Guess Tutorial</title>
+<style type="text/css">
+body {
+  font-family: Verdana, Arial, Helvetica, sans-serif;
+  font-size: small;
+}
+</style>
+</head>
+
+<body>
+<h1>
+  <ui:insert name="title">Default Title</ui:insert>
+</h1>
+<p>
+  <ui:insert name="body">Default Body</ui:insert>
+</p>
+</body>
+
 </html>
\ No newline at end of file

Modified: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/MessageFactory.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/MessageFactory.java?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/MessageFactory.java (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/MessageFactory.java Thu Jun 17 21:00:48 2010
@@ -1,31 +1,26 @@
-/*
- * $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
-*/
+ /*
+  * $Id: MessageFactory.java,v 1.6 2005/12/14 22:27:25 rlubke Exp $
+  */
+
+  /*
+   * 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/trunk/examples/guessNumber/src/main/java/guessNumber/UserNumberBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/UserNumberBean.java?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/UserNumberBean.java (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/java/guessNumber/UserNumberBean.java Thu Jun 17 21:00:48 2010
@@ -1,27 +1,22 @@
-/*
- * 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/trunk/examples/guessNumber/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/resources/META-INF/NOTICE?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/resources/META-INF/NOTICE Thu Jun 17 21:00:48 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, <http://www.oracle.com/> and are licensed to 
 the Apache Software Foundation under the "Software Grant 
 and Corporate Contribution License Agreement"

Modified: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/faces-config.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/faces-config.xml Thu Jun 17 21:00:48 2010
@@ -1,132 +1,116 @@
-<?xml version='1.0' encoding='UTF-8'?>
-
-<!--
- 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.
--->
-
-<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
-    version="1.2">
-
-  <application>
-    <locale-config>
-      <default-locale>en</default-locale>
-      <supported-locale>de</supported-locale>
-      <supported-locale>fr</supported-locale>
-      <supported-locale>es</supported-locale>
-    </locale-config>
-  </application>
-  
-  <navigation-rule>
-    <description>
-        The decision rule used by the NavigationHandler to
-        determine which view must be displayed after the
-        current view, greeting.jsp is processed.
-    </description>
-    <from-view-id>/greeting.jsp</from-view-id>
-    <navigation-case>
-        <description>
-            Indicates to the NavigationHandler that the response.jsp
-            view must be displayed if the Action referenced by a 
-            UICommand component on the greeting.jsp view returns 
-            the outcome "success".
-        </description>
-      <from-outcome>success</from-outcome>
-      <to-view-id>/response.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-  <navigation-rule>
-   <description>
-        The decision rules used by the NavigationHandler to
-        determine which view must be displayed after the
-        current view, response.jsp is processed.
-    </description>
-    <from-view-id>/response.jsp</from-view-id>
-    <navigation-case>
-        <description>
-            Indicates to the NavigationHandler that the greeting.jsp
-            view must be displayed if the Action referenced by a 
-            UICommand component on the response.jsp view returns 
-            the outcome "success".
-        </description>
-        <from-outcome>success</from-outcome>
-      <to-view-id>/greeting.jsp</to-view-id>
-    </navigation-case>
-  </navigation-rule>
-
-  <managed-bean>
-    <description>
-      The "backing file" bean that backs up the guessNumber webapp
-    </description>
-    <managed-bean-name>UserNumberBean</managed-bean-name>
-    <managed-bean-class>guessNumber.UserNumberBean</managed-bean-class>
-    <managed-bean-scope>session</managed-bean-scope>
-    <managed-property>
-      <property-name>minimum</property-name>
-      <property-class>int</property-class>
-      <value>1</value>
-    </managed-property>
-    <managed-property>
-      <property-name>maximum</property-name>
-      <property-class>int</property-class>
-      <value>10</value>
-    </managed-property>
-
-  </managed-bean>
-  
-  <managed-bean>
-    <description>
-      The "backing file" bean that backs up the guessNumber webapp
-    </description>
-    <managed-bean-name>requestBean</managed-bean-name>
-    <managed-bean-class>guessNumber.UserNumberBean</managed-bean-class>
-    <managed-bean-scope>request</managed-bean-scope>
-    <managed-property>
-      <property-name>minimum</property-name>
-      <property-class>int</property-class>
-      <value>12</value>
-    </managed-property>
-    <managed-property>
-      <property-name>maximum</property-name>
-      <property-class>int</property-class>
-      <value>22</value>
-    </managed-property>    
-
-  </managed-bean>
-
-
-</faces-config>
+<?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.
+ *
+-->
+
+<faces-config xmlns="http://java.sun.com/xml/ns/javaee"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"
+    version="1.2">
+
+  <application>
+    <locale-config>
+      <default-locale>en</default-locale>
+      <supported-locale>de</supported-locale>
+      <supported-locale>fr</supported-locale>
+      <supported-locale>es</supported-locale>
+    </locale-config>
+  </application>
+  
+  <navigation-rule>
+    <description>
+        The decision rule used by the NavigationHandler to
+        determine which view must be displayed after the
+        current view, greeting.jsp is processed.
+    </description>
+    <from-view-id>/greeting.jspx</from-view-id>
+    <navigation-case>
+        <description>
+            Indicates to the NavigationHandler that the response.jsp
+            view must be displayed if the Action referenced by a 
+            UICommand component on the greeting.jsp view returns 
+            the outcome "success".
+        </description>
+      <from-outcome>success</from-outcome>
+      <to-view-id>/response.jspx</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+
+  <navigation-rule>
+   <description>
+        The decision rules used by the NavigationHandler to
+        determine which view must be displayed after the
+        current view, response.jsp is processed.
+    </description>
+    <from-view-id>/response.jspx</from-view-id>
+    <navigation-case>
+        <description>
+            Indicates to the NavigationHandler that the greeting.jsp
+            view must be displayed if the Action referenced by a 
+            UICommand component on the response.jsp view returns 
+            the outcome "success".
+        </description>
+        <from-outcome>success</from-outcome>
+      <to-view-id>/greeting.jspx</to-view-id>
+    </navigation-case>
+  </navigation-rule>
+
+  <managed-bean>
+    <description>
+      The "backing file" bean that backs up the guessNumber webapp
+    </description>
+    <managed-bean-name>UserNumberBean</managed-bean-name>
+    <managed-bean-class>guessNumber.UserNumberBean</managed-bean-class>
+    <managed-bean-scope>session</managed-bean-scope>
+    <managed-property>
+      <property-name>minimum</property-name>
+      <property-class>int</property-class>
+      <value>1</value>
+    </managed-property>
+    <managed-property>
+      <property-name>maximum</property-name>
+      <property-class>int</property-class>
+      <value>10</value>
+    </managed-property>
+
+  </managed-bean>
+  
+  <managed-bean>
+    <description>
+      The "backing file" bean that backs up the guessNumber webapp
+    </description>
+    <managed-bean-name>requestBean</managed-bean-name>
+    <managed-bean-class>guessNumber.UserNumberBean</managed-bean-class>
+    <managed-bean-scope>request</managed-bean-scope>
+    <managed-property>
+      <property-name>minimum</property-name>
+      <property-class>int</property-class>
+      <value>12</value>
+    </managed-property>
+    <managed-property>
+      <property-name>maximum</property-name>
+      <property-class>int</property-class>
+      <value>22</value>
+    </managed-property>    
+
+  </managed-bean>
+
+
+</faces-config>

Modified: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Thu Jun 17 21:00:48 2010
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
-	   
--->
-
-<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+	   
+-->
+
+<!-- This web.xml file is used in order to configure pluto to run with jetty in order to test the appropriate web applications -->
 <web-app 
    xmlns="http://java.sun.com/xml/ns/javaee" 
    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
@@ -31,25 +31,26 @@
     <param-name>org.mortbay.jetty.webapp.NoTLDJarPattern</param-name>
     <param-value>start.jar|ant-.*\.jar|dojo-.*\.jar|jetty-.*\.jar|jsp-api-.*\.jar|junit-.*\.jar|servlet-api-.*\.jar|dnsns\.jar|rt\.jar|jsse\.jar|tools\.jar|sunpkcs11\.jar|sunjce_provider\.jar|xerces.*\.jar</param-value>
   </context-param>
-  
-  <!-- Listeners -->
+  
+  <!-- Listeners -->
   <listener>
     <listener-class>
       com.bekk.boss.pluto.embedded.jetty.util.OverrideContextLoaderListener
     </listener-class>
   </listener>
-  
+  
   <listener>
-    <listener-class>
      com.bekk.boss.pluto.embedded.util.PortalStartupListener
+    <listener-class>
+      com.bekk.boss.pluto.embedded.util.PortalStartupListener
     </listener-class>
   </listener>
-
-  <!-- Filters and Mappings -->
+
+  <!-- Filters and Mappings -->
   <filter>
     <filter-name>plutoResourceFilter</filter-name>
     <filter-class>com.bekk.boss.pluto.embedded.util.PlutResourcesFilter</filter-class>
   </filter>
-
+
   <filter>
     <filter-name>plutoPortalDriver</filter-name>
     <filter-class>com.bekk.boss.pluto.embedded.util.PlutoPortalDriverFilter</filter-class>
@@ -57,21 +58,21 @@
 	
   <filter-mapping>
     <filter-name>plutoResourceFilter</filter-name>
-    <url-pattern>*.css</url-pattern>
+    <url-pattern>*.css</url-pattern>
     <url-pattern>*.gif</url-pattern>
     <url-pattern>*.png</url-pattern>
     <url-pattern>*.js</url-pattern>
   </filter-mapping>
-
+
   <filter-mapping>
     <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/pluto/index.jsp</url-pattern>
-    <url-pattern>/pluto/index.jsp/*</url-pattern>
-  </filter-mapping>
-
+    <url-pattern>/jettypluto/index.jsp</url-pattern>
+    <url-pattern>/jettypluto/index.jsp/*</url-pattern>
+  </filter-mapping>
+
   <!-- Servlets and Mappings -->
-
-  <!--
+
+  <!--
     The default servlet.                                                  
     This servlet, normally mapped to /, provides the handling for static  
     content, OPTIONS and TRACE methods for the context.                   
@@ -114,7 +115,7 @@
                                                                           
      maxCachedFiles    Maximum number of files in the cache               
   -->
-
+
   <servlet>
     <servlet-name>default</servlet-name>
     <servlet-class>org.mortbay.jetty.servlet.DefaultServlet</servlet-class>
@@ -151,7 +152,7 @@
       <param-value>true</param-value>
     </init-param>  
     <load-on-startup>0</load-on-startup>
-  </servlet> 
+  </servlet> 
 
   <servlet id="jsp">
     <servlet-name>jsp</servlet-name>
@@ -171,11 +172,11 @@
     <load-on-startup>0</load-on-startup>
   </servlet>
 
-  <servlet-mapping>
-    <servlet-name>default</servlet-name>
-    <url-pattern>/</url-pattern>
+  <servlet-mapping>
+    <servlet-name>default</servlet-name>
+    <url-pattern>/</url-pattern>
   </servlet-mapping>
-
+
   <servlet-mapping> 
     <servlet-name>jsp</servlet-name> 
     <url-pattern>*.jsp</url-pattern> 
@@ -186,13 +187,13 @@
     <url-pattern>*.JSPF</url-pattern>
     <url-pattern>*.JSPX</url-pattern>
     <url-pattern>*.XSP</url-pattern>
-  </servlet-mapping>
-
+  </servlet-mapping>
+
   <!-- Other settings -->
   <session-config>
     <session-timeout>60</session-timeout>
   </session-config>
-
+
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>

Modified: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/portlet.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/portlet.xml Thu Jun 17 21:00:48 2010
@@ -31,7 +31,7 @@
 
     <init-param>
       <name>javax.portlet.faces.defaultViewId.view</name>
-      <value>/greeting.jsp</value>
+      <value>/greeting.jspx</value>
     </init-param>
 
     <init-param>

Modified: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/web.xml?rev=955744&r1=955743&r2=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/WEB-INF/web.xml Thu Jun 17 21:00:48 2010
@@ -1,44 +1,30 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-                         "http://java.sun.com/dtd/web-app_2_3.dtd">
+<?xml version='1.0' encoding='UTF-8'?>
 
 <!--
- 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.
+ * 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.
+ *
 -->
 
-<web-app>
+
+<web-app version="2.5"
+         xmlns="http://java.sun.com/xml/ns/javaee"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
 
     <display-name>JavaServer Faces Guess Number Sample Application
     </display-name>
@@ -51,12 +37,11 @@
         <param-value>client</param-value>
     </context-param>
 
-    <jsp-config>
-        <jsp-property-group>
-            <url-pattern>*.jsp</url-pattern>
-            <is-xml>true</is-xml>
-        </jsp-property-group>
-    </jsp-config>
+  <context-param>
+    <param-name>javax.portlet.faces.RENDER_POLICY</param-name>
+    <param-value>NEVER_DELEGATE</param-value>
+  </context-param>
+
 
     <!-- Faces Servlet -->
     <servlet>

Copied: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jspx (from r952852, myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jsp)
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jspx?p2=myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jspx&p1=myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jsp&r1=952852&r2=955744&rev=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/greeting.jspx Thu Jun 17 21:00:48 2010
@@ -1,37 +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.
+ * 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.
+ *
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
 
@@ -40,13 +24,17 @@
       xmlns:f="http://java.sun.com/jsf/core"
       xmlns:h="http://java.sun.com/jsf/html"
       xml:lang="en" lang="en">
+   
 <jsp:output doctype-root-element="html"
             doctype-public="-//W3C//DTD XHTML 1.0 Transitional//EN"
             doctype-system="http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"/>
+            
 <jsp:directive.page contentType="application/xhtml+xml; charset=UTF-8"/>
+
 <head>
     <title>Hello</title>
 </head>
+
 <body bgcolor="white">
 <f:view>   
     <h:form id="helloForm">

Copied: myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jspx (from r952852, myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jsp)
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jspx?p2=myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jspx&p1=myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jsp&r1=952852&r2=955744&rev=955744&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jsp (original)
+++ myfaces/portlet-bridge/core/trunk/examples/guessNumber/src/main/webapp/index.jspx Thu Jun 17 21:00:48 2010
@@ -1,38 +1,23 @@
 <!--
- 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.
+   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.
+  
 -->
+
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page" version="1.2">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -50,14 +35,14 @@
 
 This page allows the user to go to the context-path and get redirected
 to the front page of the app.  For example,
-http://localhost:8080/jsf-carstore/.  Note that we use "*.jsf" as the
-page mapping.  Doing so allows us to just name our pages as "*.jsp",
-refer to them as "*.jsf" and know that they will be properly picked up
+http://localhost:8080/jsf-carstore/.  Note that we use " .jsf" as the
+page mapping.  Doing so allows us to just name our pages as " .jsp",
+refer to them as " .jsf" and know that they will be properly picked up
 by the container.
 
 -->
 
-<jsp:forward page="guess/greeting.jsp"/>
+<jsp:forward page="greeting.jspx"/>
 </body>
 </html>
 </jsp:root>
\ No newline at end of file



Mime
View raw message