portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
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 GMT
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


Mime
View raw message