Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 95200 invoked from network); 24 May 2006 03:21:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 24 May 2006 03:21:57 -0000 Received: (qmail 35156 invoked by uid 500); 24 May 2006 03:21:56 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 35144 invoked by uid 500); 24 May 2006 03:21:55 -0000 Mailing-List: contact jetspeed-dev-help@portals.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "Jetspeed Developers List" Delivered-To: mailing list jetspeed-dev@portals.apache.org Received: (qmail 35133 invoked by uid 99); 24 May 2006 03:21:55 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 May 2006 20:21:55 -0700 X-ASF-Spam-Status: No, hits=0.6 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Received-SPF: pass (asf.osuosl.org: local policy) Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 May 2006 20:21:55 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id EC0521A983A; Tue, 23 May 2006 20:21:34 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r409054 - in /portals/jetspeed-2/trunk: components/page-manager/src/java/org/apache/jetspeed/om/page/ components/registry/src/java/org/apache/jetspeed/components/portletentity/ components/registry/src/test/org/apache/jetspeed/components/por... Date: Wed, 24 May 2006 03:21:34 -0000 To: jetspeed-dev@portals.apache.org From: ate@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20060524032134.EC0521A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: ate Date: Tue May 23 20:21:33 2006 New Revision: 409054 URL: http://svn.apache.org/viewvc?rev=409054&view=rev Log: Fixing the awful "Title Error: Cannot pass a null PortletDefinition to a PortletEntity." error message when a PortletDefinition cannot be found. Now, a more 'friendly' "Portlet "++" not found" message will be displayed *inside* the portlet, instead of on the window title. Furthermore, to reduce the number of error messages to the log, I've extended the ContentFragment to allow access to the overriddenContent so we can check if the same error message has been raised already... Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/ContentFragment.java Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java?rev=409054&r1=409053&r2=409054&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java (original) +++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java Tue May 23 20:21:33 2006 @@ -53,6 +53,14 @@ { return getContentFragments(); } + + /* (non-Javadoc) + * @see org.apache.jetspeed.om.page.ContentFragment#getOverriddenContent() + */ + public String getOverriddenContent() + { + return overridenContent != null ? overridenContent.toString() : null; + } /* (non-Javadoc) * @see org.apache.jetspeed.om.page.ContentFragment#getRenderedContent() Modified: portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java?rev=409054&r1=409053&r2=409054&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java (original) +++ portals/jetspeed-2/trunk/components/registry/src/java/org/apache/jetspeed/components/portletentity/PersistenceBrokerPortletEntityAccess.java Tue May 23 20:21:33 2006 @@ -238,19 +238,22 @@ // unique name has changed and access the portlet definition // using that unique name. parentPortletDef = registry.getPortletDefinitionByUniqueName(fragment.getName()); - ((PortletEntityCtrl)portletEntity).setPortletDefinition(parentPortletDef); - storePortletEntity(portletEntity); + if ( parentPortletDef != null) + { + ((PortletEntityCtrl)portletEntity).setPortletDefinition(parentPortletDef); + storePortletEntity(portletEntity); + } } - - if(parentPortletDef == null) { - final String msg = "No parent portlet definition could be located using unique name: "+portletUniqueName+ - ". Unless you plan on redploying this portlet definition, it is highly recommended "+ - "that you delete the orphaned portlet entity with the id: "+portletEntity.getId(); - fragment.overrideRenderedContent(msg); - logger.warn(msg); + final String msg = "Portlet "+portletUniqueName+" not found"; + String content = fragment.getOverriddenContent(); + if (content == null || !content.equals(msg)) + { + fragment.overrideRenderedContent(msg); + logger.error(msg); + } } return (MutablePortletEntity) portletEntity; Modified: portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java?rev=409054&r1=409053&r2=409054&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java (original) +++ portals/jetspeed-2/trunk/components/registry/src/test/org/apache/jetspeed/components/portletentity/ContentFragmentTestImpl.java Tue May 23 20:21:33 2006 @@ -320,6 +320,14 @@ public void overrideRenderedContent(String contnent) { } + + /* (non-Javadoc) + * @see org.apache.jetspeed.om.page.ContentFragment#getOverriddenContent() + */ + public String getOverriddenContent() + { + return null; + } /** * @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent) Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/ContentFragment.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/ContentFragment.java?rev=409054&r1=409053&r2=409054&view=diff ============================================================================== --- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/ContentFragment.java (original) +++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/page/ContentFragment.java Tue May 23 20:21:33 2006 @@ -66,6 +66,10 @@ public void overrideRenderedContent(String contnent); /** + * @return the overridden content set by overrideRenderedContent + */ + public String getOverriddenContent(); + /** * *

* setPortletContent --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org