From pluto-scmelliottmatthew@example.net Wed Nov 01 22:10:04 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 95129 invoked from network); 1 Nov 2006 22:10:03 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 1 Nov 2006 22:10:03 -0000 Received: (qmail 80481 invoked by uid 500); 1 Nov 2006 22:10:15 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 80456 invoked by uid 500); 1 Nov 2006 22:10:15 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 80445 invoked by uid 99); 1 Nov 2006 22:10:14 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 14:10:14 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 14:10:03 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id ECD3E1A9846; Wed, 1 Nov 2006 14:09:38 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470118 - /portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Date: Wed, 01 Nov 2006 22:09:38 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Wed Nov 1 14:09:38 2006 New Revision: 470118 URL: http://svn.apache.org/viewvc?view=rev&rev=470118 Log: Removed throwing of UnsupportedOperationException() in release() in PLUTO-262 patch submitted by Christian Raschka. Thank you for keeping us honest! Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java?view=diff&rev=470118&r1=470117&r2=470118 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/PortletRequestImpl.java Wed Nov 1 14:09:38 2006 @@ -567,8 +567,7 @@ * TODO: Implement this properly. Not required now */ public void release() { - // TODO: - throw new UnsupportedOperationException("This method needs to be implemented."); + // FIXME: This needs to be implemented } From pluto-scmelliottmatthew@example.net Thu Nov 02 14:08:48 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 81929 invoked from network); 2 Nov 2006 14:08:47 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Nov 2006 14:08:47 -0000 Received: (qmail 45486 invoked by uid 500); 2 Nov 2006 14:08:58 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 45464 invoked by uid 500); 2 Nov 2006 14:08:58 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 45453 invoked by uid 99); 2 Nov 2006 14:08:58 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:08:58 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:08:46 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id DAB0E1A9846; Thu, 2 Nov 2006 06:08:21 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470365 - /portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Date: Thu, 02 Nov 2006 14:08:21 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Thu Nov 2 06:08:20 2006 New Revision: 470365 URL: http://svn.apache.org/viewvc?view=rev&rev=470365 Log: Applied patch submitted through PLUTO-264. Also replaced file at http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd with this one. Thank you, Christian. Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd?view=diff&rev=470365&r1=470364&r2=470365 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Thu Nov 2 06:08:20 2006 @@ -1,89 +1,104 @@ <?xml version="1.0"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - 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. + Copyright 2005-2006 The Apache Software Foundation + + 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. --> -<xs:schema - xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" - elementFormDefault="qualified"> - -<xs:element name="pluto-portal-driver"> - <xs:complexType> - <xs:sequence> - <xs:element name="portal-name" type="xs:string" default="pluto-portal-driver"/> - <xs:element name="portal-version" type="xs:string"/> - <xs:element name="container-name" type="xs:string"/> - - <xs:element name="supports"> - <xs:complexType> - <xs:sequence> - <xs:element name="portlet-mode" type="xs:string"/> - <xs:element name="window-state" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="portlet-app"> - <xs:complexType> - - <xs:sequence> - <xs:element name="context-path" type="xs:string"> - <xs:simpleType> - <xs:restriction> - <xs:pattern value="/[a-zA-Z0-9_ /]*"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - - <xs:element name="portlets"> - <xs:complexType> - <xs:sequence> - <xs:element name="portlet"> - <xs:complexType><xs:attribute name="name" type="xs:string"/></xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="render-config"> - <xs:complexType> - <xs:attribute name="default" type="xs:string"/> - <xs:sequence> - <xs:element name="page"> - <xs:complexType> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="uri" type="xs:string"/> - <xs:sequence> - <xs:element name="portlet"> - <xs:complexType> - <xs:attribute name="context" type="xs:string"/> - <xs:attribute name="name" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> -</xs:element> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" + elementFormDefault="qualified"> + + <xs:element name="pluto-portal-driver"> + <xs:complexType> + <xs:sequence> + <xs:element name="portal-name" type="xs:string" + default="pluto-portal-driver" /> + <xs:element name="portal-version" type="xs:string" /> + <xs:element name="container-name" type="xs:string" /> + + <xs:element name="supports"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet-mode" + type="xs:string" minOccurs="1" maxOccurs="unbounded" /> + <xs:element name="window-state" + type="xs:string" minOccurs="1" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="portlet-app" minOccurs="1" + maxOccurs="unbounded"> + <xs:complexType> + + <xs:sequence> + <xs:element name="context-path"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="/[a-zA-Z0-9_ /]*" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + + <xs:element name="portlets"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet" + minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute + name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="render-config"> + <xs:complexType> + + <xs:sequence> + <xs:element name="page" minOccurs="1" + maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet" + minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute + name="context" type="xs:string" /> + <xs:attribute + name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="name" + type="xs:string" /> + <xs:attribute name="uri" + type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="default" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> From pluto-scmelliottmatthew@example.net Thu Nov 02 14:12:50 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 84687 invoked from network); 2 Nov 2006 14:12:49 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Nov 2006 14:12:49 -0000 Received: (qmail 53302 invoked by uid 500); 2 Nov 2006 14:13:01 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 53277 invoked by uid 500); 2 Nov 2006 14:13:00 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 53266 invoked by uid 99); 2 Nov 2006 14:13:00 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:13:00 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:12:48 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 992C41A9846; Thu, 2 Nov 2006 06:12:24 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470367 - /portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Date: Thu, 02 Nov 2006 14:12:24 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Thu Nov 2 06:12:23 2006 New Revision: 470367 URL: http://svn.apache.org/viewvc?view=rev&rev=470367 Log: Applied patch submitted through PLUTO-264. Also replaced file at http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd with this one. Thank you, Christian. Modified: portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Modified: portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd URL: http://svn.apache.org/viewvc/portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd?view=diff&rev=470367&r1=470366&r2=470367 ============================================================================== --- portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd (original) +++ portals/pluto/trunk/pluto-portal-driver/src/main/resources/pluto-portal-driver-config.xsd Thu Nov 2 06:12:23 2006 @@ -1,89 +1,104 @@ <?xml version="1.0"?> <!-- - Copyright 2005-2006 The Apache Software Foundation - - 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. + Copyright 2005-2006 The Apache Software Foundation + + 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. --> -<xs:schema - xmlns:xs="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" - elementFormDefault="qualified"> - -<xs:element name="pluto-portal-driver"> - <xs:complexType> - <xs:sequence> - <xs:element name="portal-name" type="xs:string" default="pluto-portal-driver"/> - <xs:element name="portal-version" type="xs:string"/> - <xs:element name="container-name" type="xs:string"/> - - <xs:element name="supports"> - <xs:complexType> - <xs:sequence> - <xs:element name="portlet-mode" type="xs:string"/> - <xs:element name="window-state" type="xs:string"/> - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="portlet-app"> - <xs:complexType> - - <xs:sequence> - <xs:element name="context-path" type="xs:string"> - <xs:simpleType> - <xs:restriction> - <xs:pattern value="/[a-zA-Z0-9_ /]*"/> - </xs:restriction> - </xs:simpleType> - </xs:element> - - <xs:element name="portlets"> - <xs:complexType> - <xs:sequence> - <xs:element name="portlet"> - <xs:complexType><xs:attribute name="name" type="xs:string"/></xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - - </xs:sequence> - </xs:complexType> - </xs:element> - - <xs:element name="render-config"> - <xs:complexType> - <xs:attribute name="default" type="xs:string"/> - <xs:sequence> - <xs:element name="page"> - <xs:complexType> - <xs:attribute name="name" type="xs:string"/> - <xs:attribute name="uri" type="xs:string"/> - <xs:sequence> - <xs:element name="portlet"> - <xs:complexType> - <xs:attribute name="context" type="xs:string"/> - <xs:attribute name="name" type="xs:string"/> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - </xs:sequence> - </xs:complexType> -</xs:element> +<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" + targetNamespace="http://portals.apache.org/pluto/xsd/pluto-portal-driver-config.xsd" + elementFormDefault="qualified"> + + <xs:element name="pluto-portal-driver"> + <xs:complexType> + <xs:sequence> + <xs:element name="portal-name" type="xs:string" + default="pluto-portal-driver" /> + <xs:element name="portal-version" type="xs:string" /> + <xs:element name="container-name" type="xs:string" /> + + <xs:element name="supports"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet-mode" + type="xs:string" minOccurs="1" maxOccurs="unbounded" /> + <xs:element name="window-state" + type="xs:string" minOccurs="1" maxOccurs="unbounded" /> + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="portlet-app" minOccurs="1" + maxOccurs="unbounded"> + <xs:complexType> + + <xs:sequence> + <xs:element name="context-path"> + <xs:simpleType> + <xs:restriction base="xs:string"> + <xs:pattern + value="/[a-zA-Z0-9_ /]*" /> + </xs:restriction> + </xs:simpleType> + </xs:element> + + <xs:element name="portlets"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet" + minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute + name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> + + </xs:sequence> + </xs:complexType> + </xs:element> + + <xs:element name="render-config"> + <xs:complexType> + + <xs:sequence> + <xs:element name="page" minOccurs="1" + maxOccurs="unbounded"> + <xs:complexType> + <xs:sequence> + <xs:element name="portlet" + minOccurs="1" maxOccurs="unbounded"> + <xs:complexType> + <xs:attribute + name="context" type="xs:string" /> + <xs:attribute + name="name" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="name" + type="xs:string" /> + <xs:attribute name="uri" + type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + <xs:attribute name="default" type="xs:string" /> + </xs:complexType> + </xs:element> + </xs:sequence> + </xs:complexType> + </xs:element> </xs:schema> From pluto-scmelliottmatthew@example.net Thu Nov 02 14:21:35 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 93683 invoked from network); 2 Nov 2006 14:21:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 2 Nov 2006 14:21:34 -0000 Received: (qmail 69188 invoked by uid 500); 2 Nov 2006 14:21:45 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 69144 invoked by uid 500); 2 Nov 2006 14:21:45 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 69133 invoked by uid 99); 2 Nov 2006 14:21:45 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:21:45 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Nov 2006 06:21:13 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 119C51A9846; Thu, 2 Nov 2006 06:20:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470370 - /portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Date: Thu, 02 Nov 2006 14:20:34 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Thu Nov 2 06:20:34 2006 New Revision: 470370 URL: http://svn.apache.org/viewvc?view=rev&rev=470370 Log: Applied patch in PLUTO-265. Thank you, Torsten, for your contribution. Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java?view=diff&rev=470370&r1=470369&r2=470370 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java Thu Nov 2 06:20:34 2006 @@ -137,7 +137,7 @@ LOG.debug("Action request processed.\n\n"); } } - if (resourceWindowConfig != null) { + else if (resourceWindowConfig != null) { PortletWindowImpl portletWindow = new PortletWindowImpl( resourceWindowConfig, portalURL); if (LOG.isDebugEnabled()) { From pluto-scmelliottmatthew@example.net Fri Nov 03 20:26:55 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 41182 invoked from network); 3 Nov 2006 20:26:52 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Nov 2006 20:26:52 -0000 Received: (qmail 93907 invoked by uid 500); 3 Nov 2006 20:27:04 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 93885 invoked by uid 500); 3 Nov 2006 20:27:03 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 93869 invoked by uid 99); 3 Nov 2006 20:27:03 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:27:03 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:26:51 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id E3C901A9846; Fri, 3 Nov 2006 12:26:25 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470977 - in /portals/pluto/branches/1.1-286-COMPATIBILITY: pluto-descriptor-api/ pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/ pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/ Date: Fri, 03 Nov 2006 20:26:25 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Fri Nov 3 12:26:24 2006 New Revision: 470977 URL: http://svn.apache.org/viewvc?view=rev&rev=470977 Log: Applied patch in PLUTO-266 to implement new object model for Castor. Thanks Christian. Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/RenderDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharedRenderParamDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharingParamDD.java Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/pom.xml portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/pom.xml URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/pom.xml?view=diff&rev=470977&r1=470976&r2=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/pom.xml (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/pom.xml Fri Nov 3 12:26:24 2006 @@ -1,51 +1,62 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.apache.pluto</groupId> - <artifactId>pluto</artifactId> - <version>1.1.0-286-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <artifactId>pluto-descriptor-api</artifactId> - <packaging>jar</packaging> - <name>Pluto Descriptor Service API</name> - - <dependencies> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory> - </configuration> - </plugin> - </plugins> - </build> -</project> +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2005-2006 The Apache Software Foundation + + 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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.apache.pluto</groupId> + <artifactId>pluto</artifactId> + <version>1.1.0-286-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <artifactId>pluto-descriptor-api</artifactId> + <packaging>jar</packaging> + <name>Pluto Descriptor Service API</name> + + <dependencies> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <resourcesDirectory> + ${basedir}/../pluto-site/src/site/resources + </resourcesDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <!-- best lock down version of the plugin too --> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> +</project> Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDD.java?view=auto&rev=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDD.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDD.java Fri Nov 3 12:26:24 2006 @@ -0,0 +1,30 @@ +package org.apache.pluto.descriptors.portlet; + +/** + * Initialization Event + * + * @author <a href="mailto:elliottmatthew@example.net">Christian Raschka</a> + * + */ + +public class EventDD { + + /** + * Name of the Event + */ + private String name; + + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } +} Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java?view=auto&rev=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/EventDefinitionDD.java Fri Nov 3 12:26:24 2006 @@ -0,0 +1,127 @@ +package org.apache.pluto.descriptors.portlet; + +import java.util.List; + +/** + * Initialization Event Definitions + * + * @author <a href="mailto:elliottmatthew@example.net">Christian Raschka</a> + * + */ + +public class EventDefinitionDD { + + /** + * Name of the Event + */ + private String name; + + /** + * Descripton of the Event + */ + private String description; + + /** + * Java-Type of the Event + */ + private String javaType; + + /** + * XML-Type of the Event + */ + private String xmlType; + + /** + * Alias names of the Event + */ + private List alias; + + /** + * (optional) Event ID + */ + private String iD; + + /** + * @return Returns the alias. + */ + public List getAlias() { + return alias; + } + + /** + * @param alias The alias to set. + */ + public void setAlias(List alias) { + this.alias = alias; + } + + /** + * @return Returns the description. + */ + public String getDescription() { + return description; + } + + /** + * @param description The description to set. + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return Returns the iD. + */ + public String getID() { + return iD; + } + + /** + * @param id The iD to set. + */ + public void setID(String id) { + iD = id; + } + + /** + * @return Returns the javaType. + */ + public String getJavaType() { + return javaType; + } + + /** + * @param javaType The javaType to set. + */ + public void setJavaType(String javaType) { + this.javaType = javaType; + } + + /** + * @return Returns the name. + */ + public String getName() { + return name; + } + + /** + * @param name The name to set. + */ + public void setName(String name) { + this.name = name; + } + + /** + * @return Returns the xmlType. + */ + public String getXmlType() { + return xmlType; + } + + /** + * @param xmlType The xmlType to set. + */ + public void setXmlType(String xmlType) { + this.xmlType = xmlType; + } +} Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java?view=diff&rev=470977&r1=470976&r2=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletAppDD.java Fri Nov 3 12:26:24 2006 @@ -30,6 +30,12 @@ /** The defined portlets within the system. */ private List portlets = new ArrayList(); + /** The defined Portlet Events within the system. */ + private List<EventDefinitionDD> events = new ArrayList<EventDefinitionDD>(); + + /** The defined Shared Render Parameter within the system. */ + private List<SharedRenderParamDD> render = new ArrayList<SharedRenderParamDD>(); + /** * Default Constructor. */ @@ -51,7 +57,33 @@ public void setPortlets(List portlets) { this.portlets = portlets; } + + /** + * @return Returns the events. + */ + public List<EventDefinitionDD> getEvents() { + return events; + } + + /** + * @param events The events to set. + */ + public void setEvents(List<EventDefinitionDD> events) { + this.events = events; + } + /** + * @return Returns the shared render parameter. + */ + public List<SharedRenderParamDD> getRender() { + return render; + } + /** + * @param render The shared render parameter to set. + */ + public void setRender(List<SharedRenderParamDD> render) { + this.render = render; + } } Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java?view=diff&rev=470977&r1=470976&r2=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/PortletDD.java Fri Nov 3 12:26:24 2006 @@ -53,6 +53,18 @@ /** All security role references. */ private List securityRoleRefs = new ArrayList(); + /** the Sharing Parameter */ + private List sharingParams = new ArrayList(); + + /** the supported processing Events */ + private List<EventDD> processingEvents = new ArrayList<EventDD>(); + + /** the supported publishing Events */ + private List<EventDD> publishingEvents = new ArrayList<EventDD>(); + + /** the supported shared render parameter */ + private List<RenderDD> renderParameter = new ArrayList<RenderDD>(); + // Constructor ------------------------------------------------------------- @@ -153,6 +165,61 @@ public void setSecurityRoleRefs(List securityRoleRefs) { this.securityRoleRefs = securityRoleRefs; } + + public List getSharingParams() { + return sharingParams; + } + + public void setSharingParams(List sharingParams){ + this.sharingParams = sharingParams; + } + + /** + * @return Returns the processingEvents. + */ + public List<EventDD> getProcessingEvents() { + return processingEvents; + } + + + /** + * @param processingEvents The processingEvents to set. + */ + public void setProcessingEvents(List<EventDD> processingEvents) { + this.processingEvents = processingEvents; + } + + + /** + * @return Returns the publishingEvents. + */ + public List<EventDD> getPublishingEvents() { + return publishingEvents; + } + + + /** + * @param publishingEvents The publishingEvents to set. + */ + public void setPublishingEvents(List<EventDD> publishingEvents) { + this.publishingEvents = publishingEvents; + } + + + /** + * @return Returns the render parameter. + */ + public List<RenderDD> getRenderParameter() { + return renderParameter; + } + + + /** + * @param renderParameter The render parameter to set. + */ + public void setRenderParameter(List<RenderDD> renderParameter) { + this.renderParameter = renderParameter; + } // Object Methods ---------------------------------------------------------- Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/RenderDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/RenderDD.java?view=auto&rev=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/RenderDD.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/RenderDD.java Fri Nov 3 12:26:24 2006 @@ -0,0 +1,30 @@ +package org.apache.pluto.descriptors.portlet; + +/** + * Initialization Event + * + * @author <a href="mailto:elliottmatthew@example.net">Torsten Dettborn</a> + * + */ + +public class RenderDD { + + /** + * Name of the Render-Parameter + */ + String name; + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name The name to set + */ + public void setName(String name) { + this.name = name; + } +} Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharedRenderParamDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharedRenderParamDD.java?view=auto&rev=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharedRenderParamDD.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharedRenderParamDD.java Fri Nov 3 12:26:24 2006 @@ -0,0 +1,89 @@ +package org.apache.pluto.descriptors.portlet; + +import java.util.List; + +/** + * Initialization Event Definitions + * + * @author <a href="mailto:elliottmatthew@example.net">Torsten Dettborn</a> + * + */ + +public class SharedRenderParamDD { + /** + * Name of the shared render Parameter + */ + private String name; + + /** + * Descripton of the shared render Parameter + */ + private String description; + + /** + * Alias names of the shared render Parameter + */ + private List alias; + + /** + * (optional) Event ID + */ + private String iD; + + /** + * @return the alias + */ + public List getAlias() { + return alias; + } + + /** + * @param alias The alias to set + */ + public void setAlias(List alias) { + this.alias = alias; + } + + /** + * @return the description + */ + public String getDescription() { + return description; + } + + /** + * @param description The description to set + */ + public void setDescription(String description) { + this.description = description; + } + + /** + * @return the ID + */ + public String getID() { + return iD; + } + + /** + * @param id The ID to set + */ + public void setID(String id) { + iD = id; + } + + /** + * @return the name + */ + public String getName() { + return name; + } + + /** + * @param name The name to set + */ + public void setName(String name) { + this.name = name; + } + +} Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharingParamDD.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharingParamDD.java?view=auto&rev=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharingParamDD.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-api/src/main/java/org/apache/pluto/descriptors/portlet/SharingParamDD.java Fri Nov 3 12:26:24 2006 @@ -0,0 +1,123 @@ +package org.apache.pluto.descriptors.portlet; + +import java.util.List; + +/** + * Initialization Session Sharing Attributes + * + * @author <a href="mailto:elliottmatthew@example.net">Christian Raschka</a> + * + */ + +public class SharingParamDD { + + /** + * Name of the Session Sharing Attribute + */ + private String name; + + /** + * Descripton of the sharing attribute + */ + private String description; + + /** + * Type of the sharing attribute + */ + private String javaType; + + /** + * XML-Type of the sharing attribute + */ + private String xmlType; + + /** + * Alias names of the attributes + */ + private List alias; + + /** + * (optional) Param ID + */ + private String iD; + + + + public String getID() { + return iD; + } + + + public void setID(String id) { + iD = id; + } + + + /** + * Default Constructor + */ + public SharingParamDD() { + + } + + + public String getJavaType() { + return javaType; + } + + + public void setJavaType(String javaType) { + this.javaType = javaType; + } + + + public String getName() { + return name; + } + + + public void setName(String sharingSharingAttribute) { + this.name = sharingSharingAttribute; + } + + public List getAlias() { + return alias; + } + + + public void setAlias(List alias) { + this.alias = alias; + } + + + public String getDescription() { + return description; + } + + + public void setDescription(String description) { + this.description = description; + } + + + public String getXmlType() { + return xmlType; + } + + + public void setXmlType(String xmlType) { + this.xmlType = xmlType; + } + + + /** + * @see java.lang.Object#toString() + */ + //@Override + public String toString() { + String string; + string = getName() + " (" + getDescription() + ") " + + getJavaType(); + return string; + } +} Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml?view=diff&rev=470977&r1=470976&r2=470977 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-descriptor-impl/src/main/resources/org/apache/pluto/descriptors/services/castor/castor-portlet-xml-mapping.xml Fri Nov 3 12:26:24 2006 @@ -23,14 +23,24 @@ Bare Bones for now! --> - <class name="org.apache.pluto.descriptors.portlet.PortletAppDD"> - <map-to xml="portlet-app"/> - <field name="Portlets" - type="org.apache.pluto.descriptors.portlet.PortletDD" - collection="arraylist"> - <bind-xml name="portlet" node="element"/> - </field> - </class> + <class name="org.apache.pluto.descriptors.portlet.PortletAppDD"> + <map-to xml="portlet-app"/> + <field name="Portlets" + type="org.apache.pluto.descriptors.portlet.PortletDD" + collection="arraylist"> + <bind-xml name="portlet" node="element"/> + </field> + <field name="Events" + type="org.apache.pluto.descriptors.portlet.EventDefinitionDD" + collection="arraylist"> + <bind-xml name="event-definition" node="element"/> + </field> + <field name="Render" + type="org.apache.pluto.descriptors.portlet.SharedRenderParamDD" + collection="arraylist"> + <bind-xml name="shared-render-parameter" node="element"/> + </field> + </class> <class name="org.apache.pluto.descriptors.portlet.PortletDD"> <field name="PortletName"> @@ -48,6 +58,26 @@ <field name="InitParams" type="org.apache.pluto.descriptors.common.InitParamDD" collection="arraylist"> <bind-xml name="init-param" node="element" /> </field> + + <!-- Session Sharing --> + <field name="SharingParams" type="org.apache.pluto.descriptors.portlet.SharingParamDD" collection="arraylist"> + <bind-xml name="shared-session-attribute" node="element" /> + </field> + + <!-- processing Events --> + <field name="ProcessingEvents" type="org.apache.pluto.descriptors.portlet.EventDD" collection="arraylist"> + <bind-xml name="supported-processing-event" node="element" /> + </field> + + <!-- publishing Events --> + <field name="PublishingEvents" type="org.apache.pluto.descriptors.portlet.EventDD" collection="arraylist"> + <bind-xml name="supported-publishing-event" node="element" /> + </field> + + <!-- Shared-Render-Parameter --> + <field name="RenderParameter" type="org.apache.pluto.descriptors.portlet.RenderDD" collection="arraylist"> + <bind-xml name="supported-shared-render-parameter" node="element" /> + </field> <field name="ResourceBundle"> <bind-xml name="resource-bundle" node="element"/> @@ -68,7 +98,49 @@ <bind-xml name="portlet-preferences" node="element" /> </field> </class> - + + <class name="org.apache.pluto.descriptors.portlet.EventDefinitionDD"> + <field name="Description"> + <bind-xml name="description" node="element" /> + </field> + <field name="Name"> + <bind-xml name="name" node="element"/> + </field> + <field name="JavaType"> + <bind-xml name="java-type" node="element" /> + </field> + <field name="XmlType"> + <bind-xml name="xml-type" node="element" /> + </field> + <field name="Alias" type="java.lang.String" collection="arraylist"> + <bind-xml name="alias" node="element" /> + </field> + <field name="ID"> + <bind-xml name="id" node="element" /> + </field> + </class> + + <class name="org.apache.pluto.descriptors.portlet.SharedRenderParamDD"> + <field name="Description"> + <bind-xml name="description" node="element" /> + </field> + <field name="Name"> + <bind-xml name="name" node="element"/> + </field> + <field name="Alias" type="java.lang.String" collection="arraylist"> + <bind-xml name="alias" node="element" /> + </field> + <field name="ID"> + <bind-xml name="id" node="element" /> + </field> + </class> + + <class name="org.apache.pluto.descriptors.portlet.EventDD"> + <field name="Name"> + <bind-xml name="name" node="element"/> + </field> + </class> + <class name="org.apache.pluto.descriptors.portlet.PortletInfoDD"> <map-to xml="portlet-info"/> <field name="Title"> @@ -102,6 +174,27 @@ <field name="ParamValue"> <bind-xml name="value" node="element"/> </field> + </class> + + <class name="org.apache.pluto.descriptors.portlet.SharingParamDD"> + <field name="Description"> + <bind-xml name="description" node="element" /> + </field> + <field name="Name"> + <bind-xml name="name" node="element"/> + </field> + <field name="JavaType"> + <bind-xml name="java-type" node="element" /> + </field> + <field name="XmlType"> + <bind-xml name="xml-type" node="element" /> + </field> + <field name="Alias" type="java.lang.String" collection="arraylist"> + <bind-xml name="alias" node="element" /> + </field> + <field name="ID"> + <bind-xml name="id" node="element" /> + </field> </class> <class name="org.apache.pluto.descriptors.portlet.PortletPreferencesDD"> From pluto-scmelliottmatthew@example.net Fri Nov 03 20:50:48 2006 Return-Path: <pluto-scmelliottmatthew@example.net> Delivered-To: elliottmatthew@example.net Received: (qmail 49394 invoked from network); 3 Nov 2006 20:50:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur.apache.org with SMTP; 3 Nov 2006 20:50:31 -0000 Received: (qmail 37942 invoked by uid 500); 3 Nov 2006 20:50:43 -0000 Delivered-To: elliottmatthew@example.net Received: (qmail 37922 invoked by uid 500); 3 Nov 2006 20:50:43 -0000 Mailing-List: contact elliottmatthew@example.net; run by ezmlm Precedence: bulk list-help: <mailto:elliottmatthew@example.net> list-unsubscribe: <mailto:elliottmatthew@example.net> List-Post: <mailto:elliottmatthew@example.net> List-Id: <pluto-scm.portals.apache.org> Delivered-To: mailing list elliottmatthew@example.net Received: (qmail 37911 invoked by uid 99); 3 Nov 2006 20:50:42 -0000 Received: from herse.apache.org (HELO herse.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:50:42 -0800 X-ASF-Spam-Status: No, hits=-8.6 required=10.0 tests=ALL_TRUSTED,INFO_TLD,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [83.161.120.155] (HELO eris.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Nov 2006 12:50:28 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id A56941A9846; Fri, 3 Nov 2006 12:50:03 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470984 - in /portals/pluto/branches/1.1-286-COMPATIBILITY: pluto-container/ pluto-container/src/main/java/org/apache/pluto/ pluto-container/src/main/java/org/apache/pluto/core/ pluto-container/src/main/java/org/apache/pluto/internal/ pluto... Date: Fri, 03 Nov 2006 20:50:02 -0000 To: elliottmatthew@example.net From: elliottmatthew@example.net X-Mailer: svnmailer-1.1.0 Message-Id: <elliottmatthew@example.net> X-Virus-Checked: Checked by ClamAV on apache.org Author: cdoremus Date: Fri Nov 3 12:50:01 2006 New Revision: 470984 URL: http://svn.apache.org/viewvc?view=rev&rev=470984 Log: Applied patch in PLUTO-267. Thanks Christian! Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/EventContainer.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/InternalEventRequest.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/EventProvider.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/EventProviderImpl.java Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/pom.xml portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/Constants.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortletURLProvider.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/pom.xml portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortalCallbackServiceImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/services/container/PortletURLProviderImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver-impl/src/main/java/org/apache/pluto/driver/url/impl/PortalURLImpl.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/pom.xml portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/PortalDriverServlet.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/core/PortalRequestContext.java portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-portal-driver/src/main/java/org/apache/pluto/driver/url/PortalURL.java Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/pom.xml URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/pom.xml?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/pom.xml (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/pom.xml Fri Nov 3 12:50:01 2006 @@ -1,122 +1,131 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - Copyright 2005-2006 The Apache Software Foundation - - 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. ---> -<project xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - - <parent> - <groupId>org.apache.pluto</groupId> - <artifactId>pluto</artifactId> - <version>1.1.0-286-SNAPSHOT</version> - </parent> - - <modelVersion>4.0.0</modelVersion> - <groupId>org.apache.pluto</groupId> - <artifactId>pluto-container</artifactId> - <packaging>jar</packaging> - <name>Pluto Portlet Container</name> - <description>The pluto portlet container.</description> - - - <dependencies> - - <!-- Pluto Support Libraries =========================================== --> - <dependency> - <groupId>org.apache.pluto</groupId> - <artifactId>pluto-descriptor-api</artifactId> - <version>${pom.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>org.apache.pluto</groupId> - <artifactId>pluto-descriptor-impl</artifactId> - <version>${pom.version}</version> - <scope>runtime</scope> - </dependency> - - <!-- Other Support Libraries =========================================== --> - <dependency> - <groupId>commons-logging</groupId> - <artifactId>commons-logging</artifactId> - <version>${commons-logging.version}</version> - <scope>compile</scope> - </dependency> - - <!-- Specification Libraries =========================================== --> - <dependency> - <groupId>javax.portlet</groupId> - <artifactId>portlet-api</artifactId> - <version>${portlet-api.version}</version> - <scope>compile</scope> - </dependency> - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>${servlet-api.version}</version> - <scope>provided</scope> - </dependency> - - <!-- Testing Libraries ================================================= --> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>${junit.version}</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>jmock</groupId> - <artifactId>jmock</artifactId> - <version>${jmock.version}</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <plugins> - <!-- Assembly Plugin: Create Distributions =========================== --> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <configuration> - <descriptor>src/assemble/bin.xml</descriptor> - </configuration> - </plugin> - <!-- Surefire Plugin: Exec Tests ===================================== --> - <plugin> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <includes> - <include>**/*Test.java</include> - </includes> - <excludes> - <exclude>**/PlutoTestCase.java</exclude> - </excludes> - </configuration> - </plugin> - <plugin> - <artifactId>maven-site-plugin</artifactId> - <configuration> - <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory> - </configuration> - </plugin> - </plugins> - </build> - -</project> - - - - +<?xml version="1.0" encoding="UTF-8"?> +<!-- + Copyright 2005-2006 The Apache Software Foundation + + 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. +--> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <parent> + <groupId>org.apache.pluto</groupId> + <artifactId>pluto</artifactId> + <version>1.1.0-286-SNAPSHOT</version> + </parent> + + <modelVersion>4.0.0</modelVersion> + <groupId>org.apache.pluto</groupId> + <artifactId>pluto-container</artifactId> + <packaging>jar</packaging> + <name>Pluto Portlet Container</name> + <description>The pluto portlet container.</description> + + + <dependencies> + + <!-- Pluto Support Libraries =========================================== --> + <dependency> + <groupId>org.apache.pluto</groupId> + <artifactId>pluto-descriptor-api</artifactId> + <version>${pom.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.apache.pluto</groupId> + <artifactId>pluto-descriptor-impl</artifactId> + <version>${pom.version}</version> + <scope>runtime</scope> + </dependency> + + <!-- Other Support Libraries =========================================== --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${commons-logging.version}</version> + <scope>compile</scope> + </dependency> + + <!-- Specification Libraries =========================================== --> + <dependency> + <groupId>javax.portlet</groupId> + <artifactId>portlet-api</artifactId> + <version>${portlet-api.version}</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + <version>${servlet-api.version}</version> + <scope>provided</scope> + </dependency> + + <!-- Testing Libraries ================================================= --> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>jmock</groupId> + <artifactId>jmock</artifactId> + <version>${jmock.version}</version> + <scope>test</scope> + </dependency> + </dependencies> + + <build> + <plugins> + <!-- Assembly Plugin: Create Distributions =========================== --> + <plugin> + <artifactId>maven-assembly-plugin</artifactId> + <configuration> + <descriptor>src/assemble/bin.xml</descriptor> + </configuration> + </plugin> + <!-- Surefire Plugin: Exec Tests ===================================== --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <includes> + <include>**/*Test.java</include> + </includes> + <excludes> + <exclude>**/PlutoTestCase.java</exclude> + </excludes> + </configuration> + </plugin> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory> + </configuration> + </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <!-- best lock down version of the plugin too --> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + </plugins> + </build> + +</project> + + + + Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/Constants.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/Constants.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/Constants.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/Constants.java Fri Nov 3 12:50:01 2006 @@ -92,5 +92,19 @@ * method. */ public final static Integer METHOD_RESOURCE = new Integer(7); + + /** + * The unique method identifier for render requests. Render requests are + * requested through a call to the {@link PortletContainer#doEvent(org.apache.pluto.PortletWindow, + * javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)} + * method. + */ + public final static Integer METHOD_EVENT = new Integer(9); + + /** + * The key used to bind the <code>PortletEvent</code> to the underlying + * <code>HttpServletRequest</code>. + */ + public final static String PORTLET_EVENT = "javax.portlet.event"; } Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/EventContainer.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/EventContainer.java?view=auto&rev=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/EventContainer.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/EventContainer.java Fri Nov 3 12:50:01 2006 @@ -0,0 +1,28 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * 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. + */ +package org.apache.pluto; + +import java.io.IOException; + +import javax.portlet.PortletException; +import javax.servlet.ServletContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +public interface EventContainer { + public ServletContext getServletContext(); + public void fireEvent(HttpServletRequest request, HttpServletResponse response, PortletWindow window) throws PortletException, IOException; +} Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletContainerImpl.java Fri Nov 3 12:50:01 2006 @@ -18,30 +18,37 @@ import java.io.IOException; import java.util.Map; +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; import javax.portlet.PortletException; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - +import org.apache.pluto.EventContainer; +import org.apache.pluto.OptionalContainerServices; +import org.apache.pluto.PortletContainer; +import org.apache.pluto.PortletContainerException; +import org.apache.pluto.PortletWindow; +import org.apache.pluto.RequiredContainerServices; import org.apache.pluto.descriptors.portlet.PortletAppDD; import org.apache.pluto.internal.InternalPortletWindow; import org.apache.pluto.internal.PortletDescriptorRegistry; import org.apache.pluto.internal.impl.ActionRequestImpl; import org.apache.pluto.internal.impl.ActionResponseImpl; +import org.apache.pluto.internal.impl.EventRequestImpl; +import org.apache.pluto.internal.impl.EventResponseImpl; import org.apache.pluto.internal.impl.PortletWindowImpl; import org.apache.pluto.internal.impl.RenderRequestImpl; import org.apache.pluto.internal.impl.RenderResponseImpl; import org.apache.pluto.internal.impl.ResourceRequestImpl; import org.apache.pluto.internal.impl.ResourceResponseImpl; +import org.apache.pluto.spi.EventProvider; import org.apache.pluto.spi.PortletURLProvider; -import org.apache.pluto.OptionalContainerServices; -import org.apache.pluto.PortletContainer; -import org.apache.pluto.PortletContainerException; -import org.apache.pluto.PortletWindow; -import org.apache.pluto.RequiredContainerServices; /** * Default Pluto Container implementation. @@ -52,7 +59,8 @@ * @version 1.0 * @since Sep 18, 2004 */ -public class PortletContainerImpl implements PortletContainer { +public class PortletContainerImpl implements PortletContainer, + EventContainer { /** Internal logger. */ private static final Log LOG = LogFactory.getLog(PortletContainerImpl.class); @@ -232,6 +240,10 @@ debugWithName("Portlet action processed for: " + portletWindow.getPortletName()); + EventProvider provider = this.getRequiredContainerServices().getPortalCallbackService(). + getEventProvider(request,response); + provider.fireEvents(this); + // After processing action, send a redirect URL for rendering. String location = actionResponse.getRedirectLocation(); @@ -404,6 +416,78 @@ LOG.info("Portlet Container [" + name + "]: " + message); } } + + + public void fireEvent(HttpServletRequest request, HttpServletResponse response, + PortletWindow window) + throws PortletException, IOException { + + ensureInitialized(); + + InternalPortletWindow internalPortletWindow = + new PortletWindowImpl(servletContext, window); + debugWithName("Event request received for portlet: " + + window.getPortletName()); + + EventRequestImpl eventRequest = new EventRequestImpl( + this, internalPortletWindow, request); + EventResponseImpl eventResponse = new EventResponseImpl( + this, internalPortletWindow, request, response); + + PortletInvoker invoker = new PortletInvoker(internalPortletWindow); + invoker.event(eventRequest, eventResponse); + + debugWithName("Portlet event processed for: " + + window.getPortletName()); + +// After processing event, change the redirect URL for rendering. + String location = eventResponse.getRedirectLocation(); + + if (location == null) { + +// Create portlet URL provider to encode redirect URL. + debugWithName("No redirect location specified."); + PortletURLProvider redirectURL = requiredContainerServices + .getPortalCallbackService() + .getPortletURLProvider(request, internalPortletWindow); + +// Encode portlet mode if it is changed. + if (eventResponse.getChangedPortletMode() != null) { + redirectURL.setPortletMode( + eventResponse.getChangedPortletMode()); + } + +// Encode window state if it is changed. + if (eventResponse.getChangedWindowState() != null) { + redirectURL.setWindowState( + eventResponse.getChangedWindowState()); + } + +// Encode render parameters retrieved from action response. + Map renderParameters = eventResponse.getRenderParameters(); + redirectURL.clearParameters(); + redirectURL.setParameters(renderParameters); + +// Encode redirect URL as a render URL. + redirectURL.setAction(false); + +// Set secure of the redirect URL if necessary. + if (eventRequest.isSecure()) { + redirectURL.setSecure(); + } + +// save redirectURL in request + redirectURL.savePortalURL(request); + +// Encode the redirect URL to a string. + location = eventResponse.encodeRedirectURL(redirectURL.toString()); + } + } + + + public ServletContext getServletContext() { + return servletContext; + } } Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletInvoker.java Fri Nov 3 12:50:01 2006 @@ -150,6 +150,22 @@ invoke(request, response, Constants.METHOD_NOOP); } + /** + * Invoke the portlet with an event request. + * + * @param request + * @param response + * @throws PortletException + * @throws IOException + */ + public void event(PortletRequestImpl request, PortletResponseImpl response) + throws PortletException, IOException { + if (LOG.isDebugEnabled()) { + LOG.debug("Performing Event Invocation"); + } + invoke(request, response, Constants.METHOD_EVENT); + } + // Private Invoke Method --------------------------------------------------- Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/core/PortletServlet.java Fri Nov 3 12:50:01 2006 @@ -15,6 +15,19 @@ */ package org.apache.pluto.core; +import java.io.IOException; +import java.util.Iterator; + +import javax.portlet.EventPortlet; +import javax.portlet.Portlet; +import javax.portlet.PortletException; +import javax.portlet.ResourceServingPortlet; +import javax.servlet.ServletContext; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + import org.apache.pluto.Constants; import org.apache.pluto.PortletContainerException; import org.apache.pluto.descriptors.portlet.PortletAppDD; @@ -25,24 +38,14 @@ import org.apache.pluto.internal.InternalPortletResponse; import org.apache.pluto.internal.impl.ActionRequestImpl; import org.apache.pluto.internal.impl.ActionResponseImpl; +import org.apache.pluto.internal.impl.EventRequestImpl; +import org.apache.pluto.internal.impl.EventResponseImpl; import org.apache.pluto.internal.impl.PortletConfigImpl; import org.apache.pluto.internal.impl.RenderRequestImpl; import org.apache.pluto.internal.impl.RenderResponseImpl; import org.apache.pluto.internal.impl.ResourceRequestImpl; import org.apache.pluto.internal.impl.ResourceResponseImpl; -import javax.portlet.EventPortlet; -import javax.portlet.Portlet; -import javax.portlet.PortletException; -import javax.portlet.ResourceServingPortlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.Iterator; - /** * Portlet Invocation Servlet. This servlet recieves cross context requests from * the the container and services the portlet request for the specified method. @@ -233,6 +236,15 @@ ActionResponseImpl actionResponse = (ActionResponseImpl) portletResponse; portlet.processAction(actionRequest, actionResponse); + } + + //The request methode is Event: call Portlet.processEvent(..) + else if (methodId == Constants.METHOD_EVENT){ + EventRequestImpl eventRequest = + (EventRequestImpl) portletRequest; + EventResponseImpl eventResponse = + (EventResponseImpl) portletResponse; + eventPortlet.processEvent(eventRequest, eventResponse); } // The requested method is NOOP: do nothing. Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/InternalEventRequest.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/InternalEventRequest.java?view=auto&rev=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/InternalEventRequest.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/InternalEventRequest.java Fri Nov 3 12:50:01 2006 @@ -0,0 +1,26 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * 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. + */ +package org.apache.pluto.internal; + +/** +* The internal event request extends the internal portlet request and provides +* some action-specific methods (currently, no specific methods are declared). +* @author <a href="mailto:elliottmatthew@example.net">Christian Raschka</a> +*/ + +public interface InternalEventRequest extends InternalPortletRequest { + +} Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java?view=auto&rev=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/EventRequestImpl.java Fri Nov 3 12:50:01 2006 @@ -0,0 +1,83 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * 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. + */ +package org.apache.pluto.internal.impl; + +import javax.portlet.Event; +import javax.portlet.EventRequest; +import javax.portlet.PortletPreferences; +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.pluto.Constants; +import org.apache.pluto.PortletContainer; +import org.apache.pluto.internal.InternalEventRequest; +import org.apache.pluto.internal.InternalPortletWindow; + +public class EventRequestImpl extends PortletRequestImpl + implements EventRequest, InternalEventRequest { + + /** Logger. */ + private static final Log LOG = LogFactory.getLog(ActionRequestImpl.class); + + // Private Member Variables ------------------------------------------------ + + /** FIXME: The portlet preferences. + * see (ActionRequestImpl) + */ + private PortletPreferences portletPreferences = null; + + private HttpServletRequest request = null; + + // Constructor ------------------------------------------------------------- + + public EventRequestImpl(PortletContainer container, + InternalPortletWindow internalPortletWindow, + HttpServletRequest servletRequest) { + super(container, internalPortletWindow, servletRequest); + this.request = servletRequest; + if (LOG.isDebugEnabled()) { + LOG.debug("Created Event request for: " + internalPortletWindow); + } + + } + + // EventRequest impl ------------------------------------------------------- + + public Event getEvent(){ + Event event = (Event) request.getAttribute( + Constants.PORTLET_EVENT); + return event; + } + + // PortletRequestImpl impl ------------------------------------------------- + + /** + * FIXME: (see ActionRequestImpl) + */ + public PortletPreferences getPreferences() { + // TODO: Are there any changes to do in PortletPreferences? + if (portletPreferences == null) { + portletPreferences = new PortletPreferencesImpl( + getPortletContainer(), + getInternalPortletWindow(), + this, + Constants.METHOD_EVENT); + } + return portletPreferences; + } + +} Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/internal/impl/StateAwareResponseImpl.java Fri Nov 3 12:50:01 2006 @@ -15,25 +15,31 @@ */ package org.apache.pluto.internal.impl; +import java.io.IOException; import java.util.Enumeration; import java.util.HashMap; import java.util.Iterator; import java.util.Map; +import java.util.Set; import javax.portlet.PortalContext; +import javax.portlet.PortletException; import javax.portlet.PortletMode; import javax.portlet.PortletModeException; import javax.portlet.StateAwareResponse; import javax.portlet.WindowState; import javax.portlet.WindowStateException; +import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; import org.apache.pluto.PortletContainer; +import org.apache.pluto.PortletContainerException; import org.apache.pluto.descriptors.portlet.PortletDD; import org.apache.pluto.descriptors.portlet.SupportsDD; import org.apache.pluto.internal.InternalPortletWindow; +import org.apache.pluto.spi.EventProvider; import org.apache.pluto.spi.PortalCallbackService; import org.apache.pluto.spi.ResourceURLProvider; import org.apache.pluto.util.StringUtils; @@ -67,11 +73,46 @@ callback = container.getRequiredContainerServices().getPortalCallbackService(); } public void setEvent(String name, Object value) { - + EventProvider provider = callback.getEventProvider( + getHttpServletRequest(),getHttpServletResponse()); + try { + provider.registerToFireEvent(new EventImpl(name,value)); + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (PortletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (PortletContainerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } public void setEvents(Map events) { - + EventProvider provider = callback.getEventProvider( + getHttpServletRequest(),getHttpServletResponse()); + Set keys = events.keySet(); + try { + for (Object key : keys) { + provider.registerToFireEvent(new EventImpl((String)key,events.get(key))); + } + } catch (ServletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (PortletException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (PortletContainerException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } } public void sendRedirect(String location) throws java.io.IOException { Added: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/EventProvider.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/EventProvider.java?view=auto&rev=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/EventProvider.java (added) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/EventProvider.java Fri Nov 3 12:50:01 2006 @@ -0,0 +1,114 @@ +/* + * Copyright 2006 The Apache Software Foundation. + * + * 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. + */ +package org.apache.pluto.spi; + +import java.io.IOException; +import java.util.Enumeration; +import java.util.List; + +import javax.portlet.Event; +import javax.portlet.PortletException; +import javax.servlet.ServletException; + +import org.apache.pluto.EventContainer; +import org.apache.pluto.PortletContainerException; + + /** + * + * @author <a href="mailto:elliottmatthew@example.net">Fred Thiele</a> + * @author <a href="mailto:elliottmatthew@example.net">Christian Raschka</a> + * + */ + +public interface EventProvider { + + /** + * + * @param request + * @param response + * @param event + * @throws ServletException + * @throws IOException + * @throws PortletException + * @throws PortletContainerException + */ + public abstract void registerToFireEvent(Event event) + throws ServletException, IOException, PortletException, + PortletContainerException; + + /** + * @param evtLabel - + * the name of the event + * @return ArrayList of associated InternalPortletWindows + */ + public abstract List<String> getAllPortletNames(String evtLabel); + + /** + * Bind an InternalPortletWindow to an event and/or create a new event + * label. If the event label isn't already in the portalEvts hashmap, add + * it. + * + * + * @param evtLabel - + * the event we want to add + * @param portletName - + * null or the pw to be associated with the event + */ + public abstract void registerEvent(String evtLabel, String portletName); + + /** + * + * @param evtLabel - + * creates a new event with an empty ArrayList + */ + public abstract void registerEvent(String evtLabel); + + /** + * + * @param evtLabel - + * removes an event + */ + public abstract void removeEvent(String evtLabel); + + /** + * + * @param pw - + * the InternalPortletWindow to be removed + * @param evtLabelsList - + * pw is removed from the events listed herein or all events if + * evtLabelsList is null + */ + public abstract void removePortletName(String portletName, + List<String> evtLabelsList); + + public abstract void removePortletName(String portletName); + + /** + * + * @return Enumeration containing all events + */ + public abstract Enumeration<String> getAllEventLabelsEnumeration(); + + /** + * + * @return ArrayList containing all events + */ + public abstract List<String> getAllEventLabelsList(); + + public abstract List<Event> getAllSavedEvents(); + + public abstract void fireEvents(EventContainer container); +} Modified: portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java URL: http://svn.apache.org/viewvc/portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java?view=diff&rev=470984&r1=470983&r2=470984 ============================================================================== --- portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java (original) +++ portals/pluto/branches/1.1-286-COMPATIBILITY/pluto-container/src/main/java/org/apache/pluto/spi/PortalCallbackService.java Fri Nov 3 12:50:01 2006 @@ -15,12 +15,13 @@ */ package org.apache.pluto.spi; +import java.util.Map; + import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import org.apache.pluto.PortletWindow; -import java.util.Map; - /** * The callback service interface defining callback methods that will be invoked * by the portlet container when necessary. @@ -72,5 +73,9 @@ PortletWindow portletWindow,
{'source': 'Apache Software Foundation Public Mail Archives'}