portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tay...@apache.org
Subject svn commit: r331674 - in /portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page: AbstractPageManager.java impl/DatabasePageManager.java
Date Tue, 08 Nov 2005 02:59:09 GMT
Author: taylor
Date: Mon Nov  7 18:59:07 2005
New Revision: 331674

URL: http://svn.apache.org/viewcvs?rev=331674&view=rev
Log:
http://issues.apache.org/jira/browse/JS2-395

ongoing, continued work on importing, supporting import of security constraints, and all global
security constraints definitions
and refs (page.security)


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=331674&r1=331673&r2=331674&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
Mon Nov  7 18:59:07 2005
@@ -744,12 +744,14 @@
 //        copy.setShortTitle(source.getTitle());        
 //        copy.setTitle(source.getTitle());
         
-        this.copySecurityConstraints(source.getSecurityConstraints());        
+        if (source.getSecurityConstraints() != null)
+            copySecurityConstraints(source.getSecurityConstraints());        
         
         Iterator globals = source.getGlobalSecurityConstraintsRefs().iterator();
         while (globals.hasNext())
         {
             String global = (String)globals.next();
+            System.out.println("copy = " + copy.getGlobalSecurityConstraintsRefs());
             copy.getGlobalSecurityConstraintsRefs().add(global);
         }
         

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=331674&r1=331673&r2=331674&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
Mon Nov  7 18:59:07 2005
@@ -714,4 +714,10 @@
         return this.delegator.copyFragment(source, name);
     }
     
+    public PageSecurity copyPageSecurity(PageSecurity source) 
+    throws JetspeedException
+    {
+        return this.delegator.copyPageSecurity(source);
+    }
+    
 }



---------------------------------------------------------------------
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