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 2010/07/01 00:39:46 UTC
svn commit: r959467 [6/6] - in /myfaces/portlet-bridge/core/trunk_2.0.x: ./
examples/ examples/assembly/src/main/resources/META-INF/
examples/carstore/src/main/java/carstore/
examples/carstore/src/main/java/carstore/bundles/
examples/carstore/src/main/...
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/java/helloDuke/UserNameBean.java Wed Jun 30 22:39:41 2010
@@ -1,26 +1,21 @@
/*
- * The contents of this file are subject to the terms
- * of the Common Development and Distribution License
- * (the License). You may not use this file except in
- * compliance with the License.
- *
- * You can obtain a copy of the License at
- * https://javaserverfaces.dev.java.net/CDDL.html or
- * legal/CDDLv1.0.txt.
- * See the License for the specific language governing
- * permission and limitations under the License.
- *
- * When distributing Covered Code, include this CDDL
- * Header Notice in each file and include the License file
- * at legal/CDDLv1.0.txt.
- * If applicable, add the following below the CDDL Header,
- * with the fields enclosed by brackets [] replaced by
- * your own identifying information:
- * "Portions Copyrighted [year] [name of copyright owner]"
- *
- * [Name of File] [ver.__] [Date]
- *
- * Copyright 2005 Sun Microsystems Inc. All Rights Reserved
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
*/
package helloDuke;
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/resources/META-INF/NOTICE?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/resources/META-INF/NOTICE (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/resources/META-INF/NOTICE Wed Jun 30 22:39:41 2010
@@ -1,4 +1,4 @@
-Apache MyFaces Portlet Bridge
+Apache MyFaces Portlet 2.0 Bridge for JavaServer Faces 1.2
Copyright [2007, 2008, 2009, 2010] The Apache Software Foundation
This is an implementation of a public review specification
@@ -10,7 +10,7 @@ The code is not compatible with any spec
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_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/faces-config.xml Wed Jun 30 22:39:41 2010
@@ -1,28 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
- 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.
+ *
-->
<!-- =========== FULL CONFIGURATION FILE ================================== -->
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/jetty-pluto-web-default.xml Wed Jun 30 22:39:41 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_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/portlet.xml Wed Jun 30 22:39:41 2010
@@ -1,5 +1,24 @@
<?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.
+-->
+
<portlet-app xmlns="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/web.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/WEB-INF/web.xml Wed Jun 30 22:39:41 2010
@@ -1,28 +1,23 @@
<?xml version='1.0' encoding='UTF-8'?>
<!--
- 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.
+ *
-->
<web-app version="2.5"
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/error.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/error.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/error.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/error.jsp Wed Jun 30 22:39:41 2010
@@ -1,62 +1,21 @@
-<%--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
---%>
-
<!--
- 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.
+ *
-->
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/greeting.jsp Wed Jun 30 22:39:41 2010
@@ -1,62 +1,21 @@
-<%--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
---%>
-
<!--
- 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.
+ *
-->
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/response.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/response.jsp?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/response.jsp (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/helloDuke/response.jsp Wed Jun 30 22:39:41 2010
@@ -1,62 +1,21 @@
-<%--
- DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
-
- Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
-
- The contents of this file are subject to the terms of either the GNU
- General Public License Version 2 only ("GPL") or the Common Development
- and Distribution License("CDDL") (collectively, the "License"). You
- may not use this file except in compliance with the License. You can obtain
- a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- or glassfish/bootstrap/legal/LICENSE.txt. See the License for the specific
- language governing permissions and limitations under the License.
-
- When distributing the software, include this License Header Notice in each
- file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- Sun designates this particular file as subject to the "Classpath" exception
- as provided by Sun in the GPL Version 2 section of the License file that
- accompanied this code. If applicable, add the following below the License
- Header, with the fields enclosed by brackets [] replaced by your own
- identifying information: "Portions Copyrighted [year]
- [name of copyright owner]"
-
- Contributor(s):
-
- If you wish your version of this file to be governed by only the CDDL or
- only the GPL Version 2, indicate your decision by adding "[Contributor]
- elects to include this software in this distribution under the [CDDL or GPL
- Version 2] license." If you don't indicate a single choice of license, a
- recipient has the option to distribute your version of this file under
- either the CDDL, the GPL Version 2 or to extend the choice of license to
- its licensees as provided above. However, if you add GPL Version 2 code
- and therefore, elected the GPL Version 2 license, then the option applies
- only if the new code is made subject to such option by the copyright
- holder.
---%>
-
<!--
- 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.
+ *
-->
<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
Added: myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/index.jsp
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/index.jsp?rev=959467&view=auto
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/index.jsp (added)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/helloDuke/src/main/webapp/jettypluto/index.jsp Wed Jun 30 22:39:41 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">
+ © 2003-2005 Apache Software Foundation
+ </div>
+
+</div>
+
+</body>
+
+</html>
+
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/examples/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/examples/pom.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/examples/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/examples/pom.xml Wed Jun 30 22:39:41 2010
@@ -32,6 +32,7 @@
<module>guessNumberMojarraWrapper</module>
<module>guessNumberMyFacesFilter</module>
<module>helloDuke</module>
+ <module>helloDukeCoordination</module>
</modules>
<profiles>
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/impl/src/main/java/org/apache/myfaces/portlet/faces/application/PortletViewHandlerImpl.java Wed Jun 30 22:39:41 2010
@@ -250,6 +250,9 @@ public class PortletViewHandlerImpl exte
super.renderView(context, viewToRender);
return;
}
+
+ ExternalContext extContext = context.getExternalContext();
+ MimeResponse mimeResponse = (MimeResponse) extContext.getResponse();
// If first time -- Get the renderPolicy from the context init parameter
if (mRenderPolicy == null)
@@ -281,7 +284,13 @@ public class PortletViewHandlerImpl exte
catch (Throwable t)
{
// catch all throws and swallow -- falling through to our own
- // render
+
+ // render -- Note because delegate may have set the Response object and
+ // not cleaned it up on the exception -- reset to ensure a good object
+ if (!mimeResponse.equals(extContext.getResponse()))
+ {
+ extContext.setResponse(mimeResponse);
+ }
}
}
@@ -292,9 +301,6 @@ public class PortletViewHandlerImpl exte
return;
}
- ExternalContext extContext = context.getExternalContext();
- MimeResponse mimeResponse = (MimeResponse) extContext.getResponse();
-
try
{
extContext.getRequestMap().remove("javax.servlet.include.servlet_path");
Modified: myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml?rev=959467&r1=959466&r2=959467&view=diff
==============================================================================
--- myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml (original)
+++ myfaces/portlet-bridge/core/trunk_2.0.x/pom.xml Wed Jun 30 22:39:41 2010
@@ -75,21 +75,22 @@
</site>
</distributionManagement>
- <!-- This is needed for JSF 1.2 -->
- <repositories>
- <repository>
- <id>maven1-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/1</url>
- <releases>
- <enabled>true</enabled>
- </releases>
- <snapshots>
- <enabled>false</enabled>
- </snapshots>
- </repository>
- </repositories>
-
+ <!-- This is needed for JSF 1.2 -->
+ <repositories>
+ <repository>
+ <id>maven1-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ </repository>
+ </repositories>
+
<modules>
<module>api</module>
<module>impl</module>