Return-Path: X-Original-To: apmail-portals-jetspeed-dev-archive@www.apache.org Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 52E0672DC for ; Tue, 4 Oct 2011 15:15:02 +0000 (UTC) Received: (qmail 9392 invoked by uid 500); 4 Oct 2011 15:15:02 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 9369 invoked by uid 500); 4 Oct 2011 15:15:02 -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 9361 invoked by uid 99); 4 Oct 2011 15:15:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2011 15:15:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Oct 2011 15:14:59 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 089BF2388847; Tue, 4 Oct 2011 15:14:38 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1178828 - in /portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src: main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java test/java/org/apache/jetspeed/layout/TestPageLayout.java Date: Tue, 04 Oct 2011 15:14:37 -0000 To: jetspeed-dev@portals.apache.org From: woonsan@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111004151438.089BF2388847@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: woonsan Date: Tue Oct 4 15:14:37 2011 New Revision: 1178828 URL: http://svn.apache.org/viewvc?rev=1178828&view=rev Log: JS2-1259: reverting r1178716 because the original code setting null was properly intended to initialize the security constraints and reset later. Also, the original code work fine with CastorXmlPageManager. So, the question is now to add a test case with DatabasePageManager and test/fix it to work fine as well. Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java?rev=1178828&r1=1178827&r2=1178828&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/main/java/org/apache/jetspeed/layout/impl/PageLayoutComponentImpl.java Tue Oct 4 15:14:37 2011 @@ -1923,8 +1923,11 @@ public class PageLayoutComponentImpl imp // check for edit permission fragment.checkAccess(JetspeedActions.EDIT); - // update fragment preferences and page in page manager - fragment.setSecurityConstraints(constraints); + // update fragment preferences and page in page manager. + + // Initializing security constraints by setting null first to reset it after aggregating into fragmentConstraintsConstraints.. + fragment.setSecurityConstraints(null); + if ((constraints != null) && !constraints.isEmpty()) { SecurityConstraints fragmentConstraints = fragment.newSecurityConstraints(); Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java?rev=1178828&r1=1178827&r2=1178828&view=diff ============================================================================== --- portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java (original) +++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-layout/src/test/java/org/apache/jetspeed/layout/TestPageLayout.java Tue Oct 4 15:14:37 2011 @@ -602,6 +602,21 @@ public class TestPageLayout extends Abst throw exception; } } + + public void testUpdateSecurityConstraints() throws Exception { + assertNotNull(pageManager); + assertNotNull(pageLayout); + + Page page = pageManager.getPage("/page.psml"); + assertNotNull(page); + ContentPage pageContentPage = pageLayout.newContentPage(page, pageManager.getPageTemplate("/template.tpsml"), Collections.emptyMap()); + assertNotNull(pageContentPage); + ContentFragment contentFrag = pageContentPage.getFragmentByFragmentId("fake-portlet"); + assertNotNull(contentFrag); + + pageLayout.updateSecurityConstraints(contentFrag, null); + assertNull(contentFrag.getSecurityConstraints()); + } public static abstract class AbstractTestPrincipal extends TransientJetspeedPrincipal { --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org