Return-Path: Delivered-To: apmail-portals-jetspeed-dev-archive@www.apache.org Received: (qmail 32852 invoked from network); 30 Nov 2005 06:30:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 30 Nov 2005 06:30:05 -0000 Received: (qmail 31330 invoked by uid 500); 30 Nov 2005 06:30:04 -0000 Delivered-To: apmail-portals-jetspeed-dev-archive@portals.apache.org Received: (qmail 31128 invoked by uid 500); 30 Nov 2005 06:30:03 -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 31117 invoked by uid 99); 30 Nov 2005 06:30:03 -0000 Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Nov 2005 22:30: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 [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 29 Nov 2005 22:31:33 -0800 Received: (qmail 32370 invoked by uid 65534); 30 Nov 2005 06:29:42 -0000 Message-ID: <20051130062942.32340.qmail@minotaur.apache.org> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r349895 - in /portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page: AbstractPageManager.java impl/DatabasePageManager.java Date: Wed, 30 Nov 2005 06:29:40 -0000 To: jetspeed-dev@portals.apache.org From: taylor@apache.org X-Mailer: svnmailer-1.0.5 X-Virus-Checked: Checked by ClamAV on apache.org X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N Author: taylor Date: Tue Nov 29 22:29:37 2005 New Revision: 349895 URL: http://svn.apache.org/viewcvs?rev=349895&view=rev Log: need the owner in order to create the root user folder Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java?rev=349895&r1=349894&r2=349895&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java (original) +++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java Tue Nov 29 22:29:37 2005 @@ -795,7 +795,7 @@ * @param source source folder * @param dest destination folder */ - public void deepCopyFolder(Folder srcFolder, String destinationPath) + public void deepCopyFolder(Folder srcFolder, String destinationPath, String owner) throws JetspeedException, PageNotUpdatedException { boolean found = true; @@ -812,6 +812,10 @@ throw new JetspeedException("Destination already exists"); } Folder dstFolder = this.copyFolder(srcFolder, destinationPath); + if (owner != null) + { + dstFolder.getSecurityConstraints().setOwner(owner); + } this.updateFolder(dstFolder); Iterator pages = srcFolder.getPages().iterator(); @@ -829,7 +833,7 @@ { Folder folder = (Folder)folders.next(); String newPath = concatenatePaths(destinationPath, folder.getName()); - deepCopyFolder(folder, newPath); + deepCopyFolder(folder, newPath, owner); } } Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java?rev=349895&r1=349894&r2=349895&view=diff ============================================================================== --- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java (original) +++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java Tue Nov 29 22:29:37 2005 @@ -905,10 +905,10 @@ return this.delegator.copyPageSecurity(source); } - public void deepCopyFolder(Folder srcFolder, String destinationPath) + public void deepCopyFolder(Folder srcFolder, String destinationPath, String owner) throws JetspeedException, PageNotUpdatedException { - this.delegator.deepCopyFolder(srcFolder, destinationPath); + this.delegator.deepCopyFolder(srcFolder, destinationPath, owner); } } --------------------------------------------------------------------- To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org For additional commands, e-mail: jetspeed-dev-help@portals.apache.org