portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r1577887 [1/5] - in /portals/jetspeed-2/portal/trunk: components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/ components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/ components/jetspeed-...
Date Sat, 15 Mar 2014 15:59:19 GMT
Author: rwatler
Date: Sat Mar 15 15:59:17 2014
New Revision: 1577887

URL: http://svn.apache.org/r1577887
Log:
JS2-874: PageManager generics propagation.

Modified:
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseFragmentsElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BasePageElementImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FilteredFragmentList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/FragmentPropertyListImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/LinkImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageMenuSeparatorDefinitionImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBaseFragmentsElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/AbstractBasePageElement.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/DefaultsImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FilteredFragmentList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/FragmentPreferenceImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PageSecurityImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/PropertiesList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsDefImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/psml/SecurityConstraintsImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/AbstractPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/DelegatingPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/PageManagerSecurityUtils.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/impl/NodeImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/impl/NodeSetImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/AbstractNode.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/CastorFileSystemDocumentHandler.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/DocumentHandlerFactoryImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/FileSystemFolderHandler.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/NodeOrderComparator.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/document/psml/NodeSetImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCache.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerCachedFragmentPropertyList.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/page/psml/CastorXmlPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/util/ojb/ACLFieldConversion.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/DirectoryXMLTransform.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/PageManagerTestShared.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCastorXmlPageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestCreateUserHomePagesFromRoles.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestDatabasePageManager.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/TestTransactions.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/cache/DatabasePageManagerServer.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/test/java/org/apache/jetspeed/page/document/psml/TestCastorFileSystemDocumentHandler.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-portal-site/src/main/java/org/apache/jetspeed/portalsite/impl/MenuImpl.java
    portals/jetspeed-2/portal/trunk/components/jetspeed-rdbms/src/main/java/org/apache/jetspeed/util/ojb/CollectionUtils.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/FragmentPropertyList.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/page/PageManager.java
    portals/jetspeed-2/portal/trunk/jetspeed-api/src/main/java/org/apache/jetspeed/portalsite/Menu.java

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java Sat Mar 15 15:59:17 2014
@@ -40,7 +40,7 @@ public abstract class BaseMenuDefinition
     private String skin;
     private String title;
     private String shortTitle;
-    private List elements;
+    private List<MenuDefinitionElement> elements;
 
     /**
      * accessElements
@@ -49,7 +49,7 @@ public abstract class BaseMenuDefinition
      *
      * @return persistent collection
      */
-    public List accessElements()
+    public List<MenuDefinitionElement> accessElements()
     {
         // create initial collection if necessary
         if (elements == null)

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java Sat Mar 15 15:59:17 2014
@@ -16,13 +16,14 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
-import java.util.Collection;
-import java.util.Locale;
-
 import org.apache.jetspeed.om.page.PageMetadataImpl;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
+import org.apache.jetspeed.om.portlet.LocalizedField;
 import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
 
+import java.util.Collection;
+import java.util.Locale;
+
 /**
  * BaseMenuDefinitionMetadata
  * 
@@ -31,7 +32,7 @@ import org.apache.jetspeed.page.impl.Dat
  */
 public abstract class BaseMenuDefinitionMetadata extends BaseMenuDefinitionElement 
 {
-    private Collection metadataFields;
+    private Collection<LocalizedField> metadataFields;
 
     private PageMetadataImpl pageMetadata;
 
@@ -43,7 +44,7 @@ public abstract class BaseMenuDefinition
      * @param fields mutable fields collection
      * @return page metadata
      */
-    public abstract PageMetadataImpl newPageMetadata(Collection fields);
+    public abstract PageMetadataImpl newPageMetadata(Collection<LocalizedField> fields);
 
     /**
      * getPageMetadata

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java Sat Mar 15 15:59:17 2014
@@ -16,13 +16,6 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
-import java.security.AccessController;
-import java.security.Permission;
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.om.folder.Folder;
 import org.apache.jetspeed.om.folder.FolderNotFoundException;
@@ -45,6 +38,7 @@ import org.apache.jetspeed.om.page.impl.
 import org.apache.jetspeed.om.page.impl.PageImpl;
 import org.apache.jetspeed.om.page.impl.PageSecurityImpl;
 import org.apache.jetspeed.om.page.impl.PageTemplateImpl;
+import org.apache.jetspeed.om.portlet.LocalizedField;
 import org.apache.jetspeed.page.PageNotFoundException;
 import org.apache.jetspeed.page.document.DocumentException;
 import org.apache.jetspeed.page.document.DocumentNotFoundException;
@@ -58,6 +52,15 @@ import org.apache.jetspeed.page.impl.Dat
 import org.apache.jetspeed.security.PermissionFactory;
 import org.apache.ojb.broker.core.proxy.ProxyHelper;
 
+import java.security.AccessController;
+import java.security.Permission;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * FolderImpl
  *
@@ -70,28 +73,28 @@ public class FolderImpl extends NodeImpl
     private String skin;
     private String defaultLayoutDecorator;
     private String defaultPortletDecorator;
-    private List orders;
-    private List menus;
+    private List<FolderOrder> orders;
+    private List<FolderMenuDefinitionImpl> menus;
 
-    private List folders;
+    private List<FolderImpl> folders;
     private boolean foldersCached;
-    private List pages;
+    private List<PageImpl> pages;
     private boolean pagesCached;
-    private List pageTemplates;
+    private List<PageTemplateImpl> pageTemplates;
     private boolean pageTemplatesCached;
-    private List dynamicPages;
+    private List<DynamicPageImpl> dynamicPages;
     private boolean dynamicPagesCached;
-    private List fragmentDefinitions;
+    private List<FragmentDefinitionImpl> fragmentDefinitions;
     private boolean fragmentDefinitionsCached;
-    private List links;
+    private List<LinkImpl> links;
     private boolean linksCached;
     private PageSecurityImpl pageSecurity;
     private boolean pageSecurityCached;
-    private List all;
+    private List<Node> all;
     private boolean allCached;
     private FolderOrderList documentOrder;
     private boolean documentOrderComparatorValid;
-    private Comparator documentOrderComparator;
+    private Comparator<String> documentOrderComparator;
     private NodeSet foldersNodeSet;
     private NodeSet pagesNodeSet;
     private NodeSet pageTemplatesNodeSet;
@@ -120,7 +123,7 @@ public class FolderImpl extends NodeImpl
      *
      * @return persistent collection
      */
-    List accessFolderOrders()
+    List<FolderOrder> accessFolderOrders()
     {
         // create initial collection if necessary
         if (orders == null)
@@ -137,7 +140,7 @@ public class FolderImpl extends NodeImpl
      *
      * @return persistent collection
      */
-    List accessMenus()
+    List<FolderMenuDefinitionImpl> accessMenus()
     {
         // create initial collection if necessary
         if (menus == null)
@@ -154,12 +157,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return folders collection
      */
-    public List accessFolders()
+    public List<FolderImpl> accessFolders()
     {
         // create initial collection if necessary
         if (folders == null)
         {
-            folders = DatabasePageManagerUtils.createList();
+            folders = Collections.synchronizedList(new ArrayList<FolderImpl>());
         }
         return folders;
     }
@@ -196,12 +199,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return pages collection
      */
-    public List accessPages()
+    public List<PageImpl> accessPages()
     {
         // create initial collection if necessary
         if (pages == null)
         {
-            pages = DatabasePageManagerUtils.createList();
+            pages = Collections.synchronizedList(new ArrayList<PageImpl>());
         }
         return pages;
     }
@@ -238,12 +241,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return page templates collection
      */
-    public List accessPageTemplates()
+    public List<PageTemplateImpl> accessPageTemplates()
     {
         // create initial collection if necessary
         if (pageTemplates == null)
         {
-            pageTemplates = DatabasePageManagerUtils.createList();
+            pageTemplates = Collections.synchronizedList(new ArrayList<PageTemplateImpl>());
         }
         return pageTemplates;
     }
@@ -280,12 +283,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return dynamic pages collection
      */
-    public List accessDynamicPages()
+    public List<DynamicPageImpl> accessDynamicPages()
     {
         // create initial collection if necessary
         if (dynamicPages == null)
         {
-            dynamicPages = DatabasePageManagerUtils.createList();
+            dynamicPages = Collections.synchronizedList(new ArrayList<DynamicPageImpl>());
         }
         return dynamicPages;
     }
@@ -322,12 +325,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return fragment definitions collection
      */
-    public List accessFragmentDefinitions()
+    public List<FragmentDefinitionImpl> accessFragmentDefinitions()
     {
         // create initial collection if necessary
         if (fragmentDefinitions == null)
         {
-            fragmentDefinitions = DatabasePageManagerUtils.createList();
+            fragmentDefinitions = Collections.synchronizedList(new ArrayList<FragmentDefinitionImpl>());
         }
         return fragmentDefinitions;
     }
@@ -364,12 +367,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return links collection
      */
-    public List accessLinks()
+    public List<LinkImpl> accessLinks()
     {
         // create initial collection if necessary
         if (links == null)
         {
-            links = DatabasePageManagerUtils.createList();
+            links = Collections.synchronizedList(new ArrayList<LinkImpl>());
         }
         return links;
     }
@@ -416,7 +419,7 @@ public class FolderImpl extends NodeImpl
      *
      * Reset pageSecurity transient cache instance for use by PageManager.
      *
-     * @param newPageSecurty cached page security instance.
+     * @param newPageSecurity cached page security instance.
      * @param cached set cached state for page security
      */
     public void resetPageSecurity(PageSecurityImpl newPageSecurity, boolean cached)
@@ -440,12 +443,12 @@ public class FolderImpl extends NodeImpl
      *
      * @return all collection
      */
-    public List accessAll()
+    public List<Node> accessAll()
     {
         // create initial collection if necessary
         if (all == null)
         {
-            all = DatabasePageManagerUtils.createList();
+            all = Collections.synchronizedList(new ArrayList<Node>());
         }
         return all;
     }
@@ -488,27 +491,27 @@ public class FolderImpl extends NodeImpl
                     Node node = (Node)nodeIter.next();
                     if (node instanceof PageImpl)
                     {
-                        pages.add(node);
+                        pages.add((PageImpl)node);
                     }
                     else if (node instanceof PageTemplateImpl)
                     {
-                        pageTemplates.add(node);
+                        pageTemplates.add((PageTemplateImpl)node);
                     }
                     else if (node instanceof DynamicPageImpl)
                     {
-                        dynamicPages.add(node);
+                        dynamicPages.add((DynamicPageImpl)node);
                     }
                     else if (node instanceof FragmentDefinitionImpl)
                     {
-                        fragmentDefinitions.add(node);
+                        fragmentDefinitions.add((FragmentDefinitionImpl)node);
                     }
                     else if (node instanceof FolderImpl)
                     {
-                        folders.add(node);
+                        folders.add((FolderImpl)node);
                     }
                     else if (node instanceof LinkImpl)
                     {
-                        links.add(node);
+                        links.add((LinkImpl)node);
                     }
                     else if (node instanceof PageSecurityImpl)
                     {
@@ -537,38 +540,38 @@ public class FolderImpl extends NodeImpl
      *
      * @return document order comparator
      */
-    private Comparator createDocumentOrderComparator()
+    private Comparator<String> createDocumentOrderComparator()
     {
         if (!documentOrderComparatorValid)
         {
             documentOrderComparatorValid = true;
             // return null if no document order exists;
             // (null implies natural ordering by name)
-            final List documentOrder = getDocumentOrder();
+            final List<String> documentOrder = getDocumentOrder();
             if ((documentOrder == null) || documentOrder.isEmpty())
             {
                 return null;
             }
             // create new document order comparator
-            documentOrderComparator = new Comparator()
+            documentOrderComparator = new Comparator<String>()
                 {
                     /* (non-Javadoc)
                      * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
                      */
-                    public int compare(Object o1, Object o2)
+                    public int compare(String s1, String s2)
                     {
                         // Compare node names using document order;
                         // use indices as names if found in document
                         // order to force explicitly ordered items
                         // ahead of unordered items
-                        String name1 = (String)o1;
+                        String name1 = (String)s1;
                         int index1 = documentOrder.indexOf(name1);
                         if (index1 >= 0)
                         {
                             // use order index as name1
                             name1 = String.valueOf(index1);
                         }
-                        String name2 = (String)o2;
+                        String name2 = (String)s2;
                         int index2 = documentOrder.indexOf(name2);
                         if (index2 >= 0)
                         {
@@ -618,7 +621,7 @@ public class FolderImpl extends NodeImpl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.page.document.impl.NodeImpl#newPageMetadata(java.util.Collection)
      */
-    public PageMetadataImpl newPageMetadata(Collection fields)
+    public PageMetadataImpl newPageMetadata(Collection<LocalizedField> fields)
     {
         PageMetadataImpl pageMetadata = new PageMetadataImpl(FolderMetadataLocalizedFieldImpl.class);
         pageMetadata.setFields(fields);
@@ -776,7 +779,7 @@ public class FolderImpl extends NodeImpl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#getDocumentOrder()
      */
-    public List getDocumentOrder()
+    public List<String> getDocumentOrder()
     {
         // return mutable document order list
         // by using list wrapper to manage sort
@@ -791,12 +794,12 @@ public class FolderImpl extends NodeImpl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#setDocumentOrder(java.util.List)
      */
-    public void setDocumentOrder(List docNames)
+    public void setDocumentOrder(List<String> docNames)
     {
         // set document order using ordered document
         // names by replacing existing entries with
         // new elements if new collection is specified
-        List documentOrder = getDocumentOrder();
+        List<String> documentOrder = getDocumentOrder();
         if (docNames != documentOrder)
         {
             // replace all document order names
@@ -1125,7 +1128,7 @@ public class FolderImpl extends NodeImpl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#getMenuDefinitions()
      */
-    public List getMenuDefinitions()
+    public List<MenuDefinition> getMenuDefinitions()
     {
         // return mutable menu definition list
         // by using list wrapper to manage
@@ -1180,12 +1183,12 @@ public class FolderImpl extends NodeImpl
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#setMenuDefinitions(java.util.List)
      */
-    public void setMenuDefinitions(List definitions)
+    public void setMenuDefinitions(List<MenuDefinition> definitions)
     {
         // set menu definitions by replacing
         // existing entries with new elements if
         // new collection is specified
-        List menuDefinitions = getMenuDefinitions();
+        List<MenuDefinition> menuDefinitions = getMenuDefinitions();
         if (definitions != menuDefinitions)
         {
             // replace all menu definitions
@@ -1374,12 +1377,10 @@ public class FolderImpl extends NodeImpl
         {
             if ((all != null) && !all.isEmpty())
             {
-                List allCopy = new java.util.ArrayList();
                 synchronized(all)
                 {
-                    allCopy.addAll(all); 
+                    allNodeSet = new NodeSetImpl(new ArrayList<Node>(all), createDocumentOrderComparator());
                 }
-                allNodeSet = new NodeSetImpl(allCopy, createDocumentOrderComparator());
             }
             else
             {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElement.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElement.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElement.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElement.java Sat Mar 15 15:59:17 2014
@@ -16,13 +16,15 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
+import org.apache.jetspeed.om.folder.MenuDefinitionElement;
+
 /**
  * FolderMenuDefinitionElement
  * 
  * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
  * @version $Id:$
  */
-public interface FolderMenuDefinitionElement
+public interface FolderMenuDefinitionElement extends MenuDefinitionElement
 {
     // new interface defined only to facilitate OJB table/class mapping
 

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java Sat Mar 15 15:59:17 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
+import org.apache.jetspeed.om.folder.MenuDefinitionElement;
+
 import java.util.AbstractList;
 
 /**
@@ -24,7 +26,7 @@ import java.util.AbstractList;
  * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
  * @version $Id$
  */
-class FolderMenuDefinitionElementList extends AbstractList
+class FolderMenuDefinitionElementList extends AbstractList<MenuDefinitionElement>
 {
     private FolderMenuDefinitionImpl menuDefinition;
 
@@ -42,20 +44,20 @@ class FolderMenuDefinitionElementList ex
      * @param menuElement element to add
      * @return list element to add
      */
-    private FolderMenuDefinitionElement validateMenuElementForAdd(FolderMenuDefinitionElement menuElement)
+    private FolderMenuDefinitionElement validateMenuElementForAdd(MenuDefinitionElement menuElement)
     {
         // validate element instance class
         if (menuElement == null)
         {
             throw new NullPointerException("Unable to add null to list.");
         }
-        return menuElement;
+        return (FolderMenuDefinitionElement)menuElement;
     }
 
     /* (non-Javadoc)
      * @see java.util.List#add(int,java.lang.Object)
      */
-    public void add(int index, Object element)
+    public void add(int index, MenuDefinitionElement element)
     {
         // implement for modifiable AbstractList:
         // validate index
@@ -64,7 +66,7 @@ class FolderMenuDefinitionElementList ex
             throw new IndexOutOfBoundsException("Unable to add to list at index: " + index);
         }
         // verify element
-        FolderMenuDefinitionElement menuElement = validateMenuElementForAdd((FolderMenuDefinitionElement)element);
+        FolderMenuDefinitionElement menuElement = validateMenuElementForAdd(element);
         // add to underlying ordered list
         menuDefinition.accessElements().add(index, menuElement);
         // set element order in added element
@@ -97,7 +99,7 @@ class FolderMenuDefinitionElementList ex
     /* (non-Javadoc)
      * @see java.util.List#get(int)
      */
-    public Object get(int index)
+    public MenuDefinitionElement get(int index)
     {
         // implement for modifiable AbstractList
         return menuDefinition.accessElements().get(index);
@@ -106,7 +108,7 @@ class FolderMenuDefinitionElementList ex
     /* (non-Javadoc)
      * @see java.util.List#remove(int)
      */
-    public Object remove(int index)
+    public MenuDefinitionElement remove(int index)
     {
         // implement for modifiable AbstractList
         return menuDefinition.accessElements().remove(index);
@@ -115,11 +117,11 @@ class FolderMenuDefinitionElementList ex
     /* (non-Javadoc)
      * @see java.util.List#set(int,java.lang.Object)
      */
-    public Object set(int index, Object element)
+    public MenuDefinitionElement set(int index, MenuDefinitionElement element)
     {
         // implement for modifiable AbstractList:
         // verify element
-        FolderMenuDefinitionElement newMenuElement = validateMenuElementForAdd((FolderMenuDefinitionElement)element);
+        FolderMenuDefinitionElement newMenuElement = validateMenuElementForAdd(element);
         // set in underlying ordered list
         FolderMenuDefinitionElement menuElement = (FolderMenuDefinitionElement)menuDefinition.accessElements().set(index, newMenuElement);
         // set element order in new element

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionImpl.java Sat Mar 15 15:59:17 2014
@@ -19,6 +19,7 @@ package org.apache.jetspeed.om.folder.im
 import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.folder.MenuDefinitionElement;
 import org.apache.jetspeed.om.page.PageMetadataImpl;
+import org.apache.jetspeed.om.portlet.LocalizedField;
 
 import java.util.Collection;
 import java.util.List;
@@ -38,7 +39,7 @@ public class FolderMenuDefinitionImpl ex
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.impl.BaseMenuDefinitionMetadata#newPageMetadata()
      */
-    public PageMetadataImpl newPageMetadata(Collection fields)
+    public PageMetadataImpl newPageMetadata(Collection<LocalizedField> fields)
     {
         PageMetadataImpl pageMetadata = new PageMetadataImpl(FolderMenuMetadataLocalizedFieldImpl.class);
         pageMetadata.setFields(fields);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java Sat Mar 15 15:59:17 2014
@@ -16,22 +16,24 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
+import org.apache.jetspeed.om.folder.MenuDefinition;
+
 import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
-
 /**
  * FolderMenuDefinitionList
  *
  * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
  * @version $Id$
  */
-class FolderMenuDefinitionList extends AbstractList
+class FolderMenuDefinitionList extends AbstractList<MenuDefinition>
 {
     private FolderImpl folder;
 
-    private List removedMenuDefinitions;
+    private List<MenuDefinition> removedMenuDefinitions;
 
     FolderMenuDefinitionList(FolderImpl folder)
     {
@@ -47,7 +49,7 @@ class FolderMenuDefinitionList extends A
      * @param definition menu definition to add
      * @return list element to add
      */
-    private FolderMenuDefinitionImpl validateDefinitionForAdd(FolderMenuDefinitionImpl definition)
+    private FolderMenuDefinitionImpl validateDefinitionForAdd(MenuDefinition definition)
     {
         // only non-null definitions supported
         if (definition == null)
@@ -68,8 +70,8 @@ class FolderMenuDefinitionList extends A
             if (removedIndex >= 0)
             {
                 // reuse menu definition with matching name
-                FolderMenuDefinitionImpl addDefinition = definition;
-                definition = (FolderMenuDefinitionImpl)removedMenuDefinitions.remove(removedIndex);
+                MenuDefinition addDefinition = definition;
+                definition = removedMenuDefinitions.remove(removedIndex);
                 // TODO: move this logic to copy methods on implementations
                 // copy menu definition members
                 definition.setOptions(addDefinition.getOptions());
@@ -94,7 +96,7 @@ class FolderMenuDefinitionList extends A
                 definition.getMetadata().copyFields(addDefinition.getMetadata().getFields());
             }
         }
-        return definition;
+        return (FolderMenuDefinitionImpl)definition;
     }
 
     /**
@@ -102,11 +104,11 @@ class FolderMenuDefinitionList extends A
      *
      * @return removed menu definitions tracking collection
      */
-    private List getRemovedMenuDefinitions()
+    private List<MenuDefinition> getRemovedMenuDefinitions()
     {
         if (removedMenuDefinitions == null)
         {
-            removedMenuDefinitions = DatabasePageManagerUtils.createList();
+            removedMenuDefinitions = Collections.synchronizedList(new ArrayList<MenuDefinition>());
         }
         return removedMenuDefinitions;
     }
@@ -114,7 +116,7 @@ class FolderMenuDefinitionList extends A
     /* (non-Javadoc)
      * @see java.util.List#add(int,java.lang.Object)
      */
-    public void add(int index, Object element)
+    public void add(int index, MenuDefinition element)
     {
         // implement for modifiable AbstractList:
         // validate index
@@ -123,7 +125,7 @@ class FolderMenuDefinitionList extends A
             throw new IndexOutOfBoundsException("Unable to add to list at index: " + index);
         }
         // verify menu definition
-        FolderMenuDefinitionImpl definition = validateDefinitionForAdd((FolderMenuDefinitionImpl)element);
+        FolderMenuDefinitionImpl definition = validateDefinitionForAdd(element);
         // add to underlying ordered list
         folder.accessMenus().add(index, definition);
     }
@@ -131,7 +133,7 @@ class FolderMenuDefinitionList extends A
     /* (non-Javadoc)
      * @see java.util.List#get(int)
      */
-    public Object get(int index)
+    public MenuDefinition get(int index)
     {
         // implement for modifiable AbstractList
         return folder.accessMenus().get(index);
@@ -140,11 +142,11 @@ class FolderMenuDefinitionList extends A
     /* (non-Javadoc)
      * @see java.util.List#remove(int)
      */
-    public Object remove(int index)
+    public MenuDefinition remove(int index)
     {
         // implement for modifiable AbstractList:
         // save removed element 
-        FolderMenuDefinitionImpl removed = (FolderMenuDefinitionImpl)folder.accessMenus().remove(index);
+        FolderMenuDefinitionImpl removed = folder.accessMenus().remove(index);
         if (removed != null)
         {
             getRemovedMenuDefinitions().add(removed);
@@ -155,13 +157,13 @@ class FolderMenuDefinitionList extends A
     /* (non-Javadoc)
      * @see java.util.List#set(int,java.lang.Object)
      */
-    public Object set(int index, Object element)
+    public MenuDefinition set(int index, MenuDefinition element)
     {
         // implement for modifiable AbstractList:
         // verify menu definition
-        FolderMenuDefinitionImpl newDefinition = validateDefinitionForAdd((FolderMenuDefinitionImpl)element);
+        FolderMenuDefinitionImpl newDefinition = validateDefinitionForAdd(element);
         // set in underlying ordered list
-        FolderMenuDefinitionImpl definition = (FolderMenuDefinitionImpl)folder.accessMenus().set(index, newDefinition);
+        FolderMenuDefinitionImpl definition = folder.accessMenus().set(index, newDefinition);
         // save replaced element
         getRemovedMenuDefinitions().add(definition);
         // return menu definition

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuSeparatorDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuSeparatorDefinitionImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuSeparatorDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderMenuSeparatorDefinitionImpl.java Sat Mar 15 15:59:17 2014
@@ -16,10 +16,11 @@
  */
 package org.apache.jetspeed.om.folder.impl;
 
-import java.util.Collection;
-
 import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
 import org.apache.jetspeed.om.page.PageMetadataImpl;
+import org.apache.jetspeed.om.portlet.LocalizedField;
+
+import java.util.Collection;
 
 /**
  * FolderMenuSeparatorDefinitionImpl
@@ -34,7 +35,7 @@ public class FolderMenuSeparatorDefiniti
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.impl.BaseMenuDefinitionMetadata#newPageMetadata()
      */
-    public PageMetadataImpl newPageMetadata(Collection fields)
+    public PageMetadataImpl newPageMetadata(Collection<LocalizedField> fields)
     {
         PageMetadataImpl pageMetadata = new PageMetadataImpl(FolderMenuMetadataLocalizedFieldImpl.class);
         pageMetadata.setFields(fields);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java Sat Mar 15 15:59:17 2014
@@ -17,21 +17,21 @@
 package org.apache.jetspeed.om.folder.impl;
 
 import java.util.AbstractList;
+import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
-import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
-
 /**
  * FolderOrderList
  *
  * @author <a href="mailto:rwatler@apache.org">Randy Watler</a>
  * @version $Id$
  */
-class FolderOrderList extends AbstractList
+class FolderOrderList extends AbstractList<String>
 {
     private FolderImpl folder;
 
-    private List removedFolderOrders;
+    private List<FolderOrder> removedFolderOrders;
 
     FolderOrderList(FolderImpl folder)
     {
@@ -81,11 +81,11 @@ class FolderOrderList extends AbstractLi
      *
      * @return removed folder orders tracking collection
      */
-    private List getRemovedFolderOrders()
+    private List<FolderOrder> getRemovedFolderOrders()
     {
         if (removedFolderOrders == null)
         {
-            removedFolderOrders = DatabasePageManagerUtils.createList();
+            removedFolderOrders = Collections.synchronizedList(new ArrayList<FolderOrder>());
         }
         return removedFolderOrders;
     }
@@ -93,7 +93,7 @@ class FolderOrderList extends AbstractLi
     /* (non-Javadoc)
      * @see java.util.List#add(int,java.lang.Object)
      */
-    public void add(int index, Object element)
+    public void add(int index, String element)
     {
         // implement for modifiable AbstractList:
         // validate index
@@ -102,13 +102,13 @@ class FolderOrderList extends AbstractLi
             throw new IndexOutOfBoundsException("Unable to add to list at index: " + index);
         }
         // wrap and verify folder order name string
-        FolderOrder folderOrder = wrapNameStringForAdd((String)element);
+        FolderOrder folderOrder = wrapNameStringForAdd(element);
         // add to underlying ordered list
         folder.accessFolderOrders().add(index, folderOrder);
         // set sort order in added element
         if (index > 0)
         {
-            folderOrder.setSortOrder(((FolderOrder)folder.accessFolderOrders().get(index-1)).getSortOrder() + 1);
+            folderOrder.setSortOrder(folder.accessFolderOrders().get(index-1).getSortOrder() + 1);
         }
         else
         {
@@ -117,7 +117,7 @@ class FolderOrderList extends AbstractLi
         // maintain sort order in subsequent elements
         for (int i = index, limit = folder.accessFolderOrders().size() - 1; (i < limit); i++)
         {
-            FolderOrder nextFolderOrder = (FolderOrder)folder.accessFolderOrders().get(i + 1);
+            FolderOrder nextFolderOrder = folder.accessFolderOrders().get(i + 1);
             if (nextFolderOrder.getSortOrder() <= folderOrder.getSortOrder())
             {
                 // adjust sort order for next element
@@ -137,40 +137,41 @@ class FolderOrderList extends AbstractLi
     /* (non-Javadoc)
      * @see java.util.List#get(int)
      */
-    public Object get(int index)
+    public String get(int index)
     {
         // implement for modifiable AbstractList:
         // unwrap folder order name string
-        return ((FolderOrder)folder.accessFolderOrders().get(index)).getName();
+        return folder.accessFolderOrders().get(index).getName();
     }
 
     /* (non-Javadoc)
      * @see java.util.List#remove(int)
      */
-    public Object remove(int index)
+    public String remove(int index)
     {
         // implement for modifiable AbstractList
-        FolderOrder removed = (FolderOrder)folder.accessFolderOrders().remove(index);
+        FolderOrder removed = folder.accessFolderOrders().remove(index);
         if (removed != null)
         {
             // save removed element 
             getRemovedFolderOrders().add(removed);
             // clear all cached folder ordering
             folder.clearDocumentOrderComparator();
+            return removed.getName();
         }
-        return removed;
+        return null;
     }
 
     /* (non-Javadoc)
      * @see java.util.List#set(int,java.lang.Object)
      */
-    public Object set(int index, Object element)
+    public String set(int index, String element)
     {
         // implement for modifiable AbstractList:
         // wrap and verify folder order name string
-        FolderOrder newFolderOrder = wrapNameStringForAdd((String)element);
+        FolderOrder newFolderOrder = wrapNameStringForAdd(element);
         // set in underlying ordered list
-        FolderOrder folderOrder = (FolderOrder)folder.accessFolderOrders().set(index, newFolderOrder);
+        FolderOrder folderOrder = folder.accessFolderOrders().set(index, newFolderOrder);
         // set sort order in new element
         newFolderOrder.setSortOrder(folderOrder.getSortOrder());
         // save replaced element

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderImpl.java Sat Mar 15 15:59:17 2014
@@ -16,12 +16,6 @@
  */
 package org.apache.jetspeed.om.folder.psml;
 
-import java.security.AccessController;
-import java.security.Permission;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
 import org.apache.jetspeed.JetspeedActions;
 import org.apache.jetspeed.idgenerator.IdGenerator;
 import org.apache.jetspeed.om.common.SecurityConstraints;
@@ -55,10 +49,15 @@ import org.apache.jetspeed.page.document
 import org.apache.jetspeed.page.document.psml.NodeOrderComparator;
 import org.apache.jetspeed.page.document.psml.NodeSetImpl;
 import org.apache.jetspeed.security.PermissionFactory;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.AccessController;
+import java.security.Permission;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+
 /**
  * FolderImpl
  * 
@@ -170,7 +169,7 @@ public class FolderImpl extends Abstract
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#getDocumentOrder()
      */
-    public List getDocumentOrder()
+    public List<String> getDocumentOrder()
     {
         return metadata.getDocumentOrder();
     }
@@ -178,7 +177,7 @@ public class FolderImpl extends Abstract
     /* (non-Javadoc)
      * @see org.apache.jetspeed.om.folder.Folder#setDocumentOrder(java.util.List)
      */
-    public void setDocumentOrder(List docIndexes)
+    public void setDocumentOrder(List<String> docIndexes)
     {
         metadata.setDocumentOrder(docIndexes);
     }
@@ -835,7 +834,7 @@ public class FolderImpl extends Abstract
      * getMetadata
      * </p>
      *
-     * @see org.apache.jetspeed.page.document.AbstractNode#getMetadata()
+     * @see org.apache.jetspeed.page.document.psml.AbstractNode#getMetadata()
      * @return metadata
      */
     public GenericMetadata getMetadata()
@@ -848,7 +847,7 @@ public class FolderImpl extends Abstract
      * getSecurityConstraints
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecureResource#getSecurityConstraints()
+     * @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints()
      * @return
      */
     public SecurityConstraints getSecurityConstraints()
@@ -860,7 +859,7 @@ public class FolderImpl extends Abstract
      * setSecurityConstraints
      * </p>
      *
-     * @see org.apache.jetspeed.om.common.SecureResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints)
+     * @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints)
      * @param constraints
      */
     public void setSecurityConstraints(SecurityConstraints constraints)
@@ -871,7 +870,7 @@ public class FolderImpl extends Abstract
     /**
      * getEffectivePageSecurity
      *
-     * @see org.apache.jetspeed.om.page.psml.AbstractElementImpl#getEffectivePageSecurity()
+     * @see org.apache.jetspeed.om.page.psml.AbstractBaseElement#getEffectivePageSecurity()
      */
     public PageSecurity getEffectivePageSecurity()
     {
@@ -1032,7 +1031,7 @@ public class FolderImpl extends Abstract
      * setHidden
      * </p>
      *
-     * @see org.apache.jetspeed.page.document.AbstractNode#setHidden(boolean)
+     * @see org.apache.jetspeed.page.document.Node#setHidden(boolean)
      * @param hidden
      */
     public void setHidden( boolean hidden )
@@ -1046,7 +1045,6 @@ public class FolderImpl extends Abstract
     public void reset()
     {
         allNodes = null;
-        
     }
 
     /**
@@ -1054,7 +1052,7 @@ public class FolderImpl extends Abstract
      *
      * @return definition list
      */
-    public List getMenuDefinitions()
+    public List<MenuDefinition> getMenuDefinitions()
     {
         return metadata.getMenuDefinitions();
     }
@@ -1114,7 +1112,7 @@ public class FolderImpl extends Abstract
      *
      * @param definitions definition list
      */
-    public void setMenuDefinitions(List definitions)
+    public void setMenuDefinitions(List<MenuDefinition> definitions)
     {
         metadata.setMenuDefinitions(definitions);
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/FolderMetaDataImpl.java Sat Mar 15 15:59:17 2014
@@ -16,15 +16,16 @@
  */
 package org.apache.jetspeed.om.folder.psml;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
 import org.apache.jetspeed.idgenerator.IdGenerator;
+import org.apache.jetspeed.om.folder.MenuDefinition;
 import org.apache.jetspeed.om.page.Document;
 import org.apache.jetspeed.om.page.psml.DefaultsImpl;
 import org.apache.jetspeed.om.page.psml.DocumentImpl;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
 /**
  * <p>
  * FolderMetaDataImpl
@@ -42,17 +43,17 @@ public class FolderMetaDataImpl extends 
     public static final String DOCUMENT_TYPE = "folder.metadata";
 
     private DefaultsImpl defaults = new DefaultsImpl();
-    private List docOrder;
+    private List<String> docOrder;
     private String defaultPage;
 
     /**
      * menuDefinitions - menu definitions for folder
      */
-    private List menuDefinitions;
+    private List<MenuDefinition> menuDefinitions;
     
     public FolderMetaDataImpl()
     {
-        docOrder = new ArrayList(4);
+        docOrder = new ArrayList<String>(4);
     }
        
     /**
@@ -140,7 +141,7 @@ public class FolderMetaDataImpl extends 
      *
      * @return document order
      */
-    public List getDocumentOrder()
+    public List<String> getDocumentOrder()
     {
         return docOrder;
     }
@@ -152,7 +153,7 @@ public class FolderMetaDataImpl extends 
      *
      * @param docIndexes
      */
-    public void setDocumentOrder(List docIndexes)
+    public void setDocumentOrder(List<String> docIndexes)
     {
         docOrder = docIndexes;
     }
@@ -178,7 +179,7 @@ public class FolderMetaDataImpl extends 
      *
      * @return definition list
      */
-    public List getMenuDefinitions()
+    public List<MenuDefinition> getMenuDefinitions()
     {
         return menuDefinitions;
     }
@@ -188,7 +189,7 @@ public class FolderMetaDataImpl extends 
      *
      * @param definitions definition list
      */
-    public void setMenuDefinitions(List definitions)
+    public void setMenuDefinitions(List<MenuDefinition> definitions)
     {
         menuDefinitions = definitions;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuDefinitionImpl.java Sat Mar 15 15:59:17 2014
@@ -88,12 +88,12 @@ public class MenuDefinitionImpl extends 
      * menuElements - ordered polymorphic list of menu options nested
      *                menu, separator, include, and exclude definitions
      */
-    private List menuElements;
+    private List<MenuDefinitionElement> menuElements;
 
     /**
      * menuElementImpls - ordered homogeneous list of menu elements
      */
-    private List menuElementImpls;
+    private List<MenuElementImpl> menuElementImpls;
 
     /**
      * MenuDefinitionImpl - constructor
@@ -329,7 +329,7 @@ public class MenuDefinitionImpl extends 
      *
      * @return element list
      */
-    public List getMenuElementImpls()
+    public List<MenuElementImpl> getMenuElementImpls()
     {
         return menuElementImpls;
     }
@@ -340,7 +340,7 @@ public class MenuDefinitionImpl extends 
      *
      * @param elements element list
      */
-    public void setMenuElementImpls(List elements)
+    public void setMenuElementImpls(List<MenuElementImpl> elements)
     {
         menuElementImpls = elements;
     }
@@ -358,12 +358,12 @@ public class MenuDefinitionImpl extends 
         // unmarshalled notification
         if (menuElementImpls != null)
         {
-            menuElements = new ArrayList(menuElementImpls.size());
+            menuElements = new ArrayList<MenuDefinitionElement>(menuElementImpls.size());
             Iterator menuElementIter = menuElementImpls.iterator();
             while (menuElementIter.hasNext())
             {
                 // unwrap menu element
-                Object menuElement = ((MenuElementImpl)menuElementIter.next()).getElement();
+                MenuDefinitionElement menuElement = ((MenuElementImpl)menuElementIter.next()).getElement();
                 menuElements.add(menuElement);
 
                 // propagate unmarshalled notification
@@ -389,12 +389,12 @@ public class MenuDefinitionImpl extends 
         // marshalling notification
         if (menuElements != null)
         {
-            menuElementImpls = new ArrayList(menuElements.size());
+            menuElementImpls = new ArrayList<MenuElementImpl>(menuElements.size());
             Iterator menuElementIter = menuElements.iterator();
             while (menuElementIter.hasNext())
             {
                 // wrap menu element
-                Object menuElement = menuElementIter.next();
+                MenuDefinitionElement menuElement = (MenuDefinitionElement)menuElementIter.next();
                 menuElementImpls.add(new MenuElementImpl(menuElement));
 
                 // propagate marshalling notification

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuElementImpl.java Sat Mar 15 15:59:17 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.jetspeed.om.folder.psml;
 
+import org.apache.jetspeed.om.folder.MenuDefinitionElement;
+
 import java.io.Serializable;
 
 /**
@@ -30,7 +32,7 @@ public class MenuElementImpl implements 
     /**
      * element - wrapped menu element
      */
-    private Object element;
+    private MenuDefinitionElement element;
 
     /**
      * MenuElementImpl - constructor
@@ -42,15 +44,15 @@ public class MenuElementImpl implements 
     /**
      * MenuElementImpl - constructor
      */
-    public MenuElementImpl(Object element)
+    public MenuElementImpl(MenuDefinitionElement element)
     {
         this.element = element;
     }
 
     /**
-     * getOption - get wrapped menu element
+     * getElement - get wrapped menu element
      */
-    public Object getElement()
+    public MenuDefinitionElement getElement()
     {
         return element;
     }

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/folder/psml/MenuMetadataImpl.java Sat Mar 15 15:59:17 2014
@@ -16,11 +16,12 @@
  */
 package org.apache.jetspeed.om.folder.psml;
 
-import java.util.Collection;
-import java.util.Locale;
-
 import org.apache.jetspeed.om.page.PageMetadataImpl;
 import org.apache.jetspeed.om.portlet.GenericMetadata;
+import org.apache.jetspeed.om.portlet.LocalizedField;
+
+import java.util.Collection;
+import java.util.Locale;
 
 /**
  * This class implements metadata protocols for menu
@@ -148,7 +149,7 @@ public abstract class MenuMetadataImpl
      *
      * @return metadata fields collection
      */
-    public Collection getMetadataFields()
+    public Collection<LocalizedField> getMetadataFields()
     {
         // return metadata fields collection that
         // may in fact be side effected on unmarshall
@@ -160,7 +161,7 @@ public abstract class MenuMetadataImpl
      *
      * @param metadataFields metadata fields collection
      */
-    public void setMetadataFields(Collection metadataFields)
+    public void setMetadataFields(Collection<LocalizedField> metadataFields)
     {
         // set metadata fields collection that
         // may in fact be side effected after
@@ -191,7 +192,7 @@ public abstract class MenuMetadataImpl
         // force metadata update after unmarshalled since
         // metadata collection can be side effected by
         // unmarshalling colection accessors
-        Collection metadataFields = getMetadataFields();
+        Collection<LocalizedField> metadataFields = getMetadataFields();
         if (metadataFields != null)
         {
             setMetadataFields(metadataFields);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/BaseFragmentPropertyImpl.java Sat Mar 15 15:59:17 2014
@@ -16,6 +16,13 @@
  */
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.security.Group;
+import org.apache.jetspeed.security.JSSubject;
+import org.apache.jetspeed.security.Role;
+import org.apache.jetspeed.security.SubjectHelper;
+import org.apache.jetspeed.security.User;
+
+import javax.security.auth.Subject;
 import java.security.AccessController;
 import java.security.Principal;
 import java.util.ArrayList;
@@ -23,15 +30,6 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import javax.security.auth.Subject;
-
-import org.apache.jetspeed.om.page.FragmentProperty;
-import org.apache.jetspeed.security.Group;
-import org.apache.jetspeed.security.JSSubject;
-import org.apache.jetspeed.security.Role;
-import org.apache.jetspeed.security.SubjectHelper;
-import org.apache.jetspeed.security.User;
-
 /**
  * BaseFragmentPropertyImpl
  *
@@ -155,9 +153,9 @@ public abstract class BaseFragmentProper
      * @param properties unfiltered fragment properties list
      * @return filtered fragment properties
      */
-    public static List filterFragmentProperties(List properties)
+    public static List<FragmentProperty> filterFragmentProperties(List<FragmentProperty> properties)
     {
-        List filteredProperties = new ArrayList();
+        List<FragmentProperty> filteredProperties = new ArrayList<FragmentProperty>();
         
         // iterate through properties list and merge with current
         // principals to determine most specific property value

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java Sat Mar 15 15:59:17 2014
@@ -16,14 +16,14 @@
  */
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.om.common.SecurityConstraint;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.StringTokenizer;
 
-import org.apache.jetspeed.om.common.SecurityConstraint;
-import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
-
 
 /**
  * <p>
@@ -40,10 +40,10 @@ public class SecurityConstraintImpl impl
 {
     private int id;
     private int applyOrder;
-    private List usersList;
-    private List rolesList;
-    private List groupsList;
-    private List permissionsList;
+    private List<String> usersList;
+    private List<String> rolesList;
+    private List<String> groupsList;
+    private List<String> permissionsList;
 
     private String users;
     private String roles;
@@ -186,7 +186,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#getUsers()
      * @return users list
      */
-    public List getUsers()
+    public List<String> getUsers()
     {
         return usersList;
     }
@@ -199,7 +199,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#setUsers(java.util.List)
      * @param users users list
      */
-    public void setUsers(List users)
+    public void setUsers(List<String> users)
     {
         // set and clear potentially stale string representation
         usersList = users;
@@ -214,7 +214,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#getRoles()
      * @return roles list
      */
-    public List getRoles()
+    public List<String> getRoles()
     {
         return rolesList;
     }
@@ -227,7 +227,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#setRoles(java.util.List)
      * @param roles roles list
      */
-    public void setRoles(List roles)
+    public void setRoles(List<String> roles)
     {
         // set and clear potentially stale string representation
         rolesList = roles;
@@ -242,7 +242,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#getGroups()
      * @return groups list
      */
-    public List getGroups()
+    public List<String> getGroups()
     {
         return groupsList;
     }
@@ -255,7 +255,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#setGroups(java.util.List)
      * @param groups groups list
      */
-    public void setGroups(List groups)
+    public void setGroups(List<String> groups)
     {
         // set and clear potentially stale string representation
         groupsList = groups;
@@ -270,7 +270,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#getPermissions()
      * @return permissions list
      */
-    public List getPermissions()
+    public List<String> getPermissions()
     {
         return permissionsList;
     }
@@ -283,7 +283,7 @@ public class SecurityConstraintImpl impl
      * @see org.apache.jetspeed.om.common.SecurityConstraint#setPermissions(java.util.List)
      * @param permissions permissions list
      */
-    public void setPermissions(List permissions)
+    public void setPermissions(List<String> permissions)
     {
         // set and clear potentially stale string representation
         permissionsList = permissions;
@@ -347,11 +347,11 @@ public class SecurityConstraintImpl impl
      * @param csv
      * @return parsed values list.
      */
-    public static List parseCSVList(String csv)
+    public static List<String> parseCSVList(String csv)
     {
         if (csv != null)
         {
-            List csvList = DatabasePageManagerUtils.createList();
+            List<String> csvList = DatabasePageManagerUtils.createList();;
             if (csv.indexOf(',') != -1)
             {
                 StringTokenizer csvTokens = new StringTokenizer(csv, ",");
@@ -380,7 +380,7 @@ public class SecurityConstraintImpl impl
      * @param list
      * @return formatted string value.
      */
-    public static String formatCSVList(List list)
+    public static String formatCSVList(List<String> list)
     {
         if ((list != null) && !list.isEmpty())
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefExpression.java Sat Mar 15 15:59:17 2014
@@ -29,9 +29,9 @@ import java.util.Stack;
 public class SecurityConstraintsRefExpression
 {
     private String constraintsRef;
-    private List constraintsRefTokens;
+    private List<SecurityConstraintsRefToken> constraintsRefTokens;
 
-    SecurityConstraintsRefExpression(String constraintsRef, List constraintsRefTokens)
+    SecurityConstraintsRefExpression(String constraintsRef, List<SecurityConstraintsRefToken> constraintsRefTokens)
     {
         this.constraintsRef = constraintsRef;
         this.constraintsRefTokens = constraintsRefTokens;
@@ -49,10 +49,10 @@ public class SecurityConstraintsRefExpre
      * @return flag indicating permission grant
      * @throws RuntimeException if expression evaluation error occurs
      */
-    public boolean checkExpression(String action, List userPrincipals, List rolePrincipals, List groupPrincipals)
+    public boolean checkExpression(String action, List<String> userPrincipals, List<String> rolePrincipals, List<String> groupPrincipals)
     {
         // evaluate postfix constraints ref tokens
-        Stack operandsStack = new Stack();
+        Stack<Boolean> operandsStack = new Stack<Boolean>();
         Iterator constraintsRefTokensIter = constraintsRefTokens.iterator();
         while (constraintsRefTokensIter.hasNext())
         {
@@ -64,9 +64,9 @@ public class SecurityConstraintsRefExpre
                 {
                     if (operandsStack.size() >= 1)
                     {
-                        boolean operand = ((Boolean)operandsStack.pop()).booleanValue();
+                        boolean operand = operandsStack.pop();
                         operand = !operand;
-                        operandsStack.push(new Boolean(operand));
+                        operandsStack.push(operand);
                     }
                     else
                     {
@@ -77,10 +77,10 @@ public class SecurityConstraintsRefExpre
                 {
                     if (operandsStack.size() >= 2)
                     {
-                        boolean operand0 = ((Boolean)operandsStack.pop()).booleanValue();
-                        boolean operand1 = ((Boolean)operandsStack.pop()).booleanValue();
+                        boolean operand0 = operandsStack.pop();
+                        boolean operand1 = operandsStack.pop();
                         boolean operand = (operand0 && operand1);
-                        operandsStack.push(new Boolean(operand));
+                        operandsStack.push(operand);
                     }
                     else
                     {
@@ -91,10 +91,10 @@ public class SecurityConstraintsRefExpre
                 {
                     if (operandsStack.size() >= 2)
                     {
-                        boolean operand0 = ((Boolean)operandsStack.pop()).booleanValue();
-                        boolean operand1 = ((Boolean)operandsStack.pop()).booleanValue();
+                        boolean operand0 = operandsStack.pop();
+                        boolean operand1 = operandsStack.pop();
                         boolean operand = (operand0 || operand1);
-                        operandsStack.push(new Boolean(operand));
+                        operandsStack.push(operand);
                     }
                     else
                     {
@@ -110,7 +110,7 @@ public class SecurityConstraintsRefExpre
             {
                 // evaluate security constraint operand and place on stack
                 boolean operand = checkExpressionConstraint(action, userPrincipals, rolePrincipals, groupPrincipals, token.getConstraint());
-                operandsStack.push(new Boolean(operand));
+                operandsStack.push(operand);
             }
             else
             {
@@ -121,7 +121,7 @@ public class SecurityConstraintsRefExpre
         // return single operand left on stack
         if (operandsStack.size() == 1)
         {
-            return ((Boolean)operandsStack.pop()).booleanValue();
+            return operandsStack.pop();
         }
         else
         {
@@ -143,7 +143,7 @@ public class SecurityConstraintsRefExpre
      * @param constraint check constraint
      * @return flag indicating permission grant
      */
-    private boolean checkExpressionConstraint(String action, List userPrincipals, List rolePrincipals, List groupPrincipals, SecurityConstraintImpl constraint)
+    private boolean checkExpressionConstraint(String action, List<String> userPrincipals, List<String> rolePrincipals, List<String> groupPrincipals, SecurityConstraintImpl constraint)
     {
         if (constraint.getPermissions() != null)
         {

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/SecurityConstraintsRefParser.java Sat Mar 15 15:59:17 2014
@@ -16,6 +16,8 @@
  */
 package org.apache.jetspeed.om.page;
 
+import org.apache.jetspeed.om.common.SecurityConstraint;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -65,14 +67,14 @@ public class SecurityConstraintsRefParse
                 SecurityConstraintsDef securityConstraintsDef = pageSecurity.getSecurityConstraintsDef(postfixToken);
                 if ((securityConstraintsDef != null) && (securityConstraintsDef.getSecurityConstraints() != null))
                 {
-                    return new ArrayList(securityConstraintsDef.getSecurityConstraints());
+                    return new ArrayList<SecurityConstraint>(securityConstraintsDef.getSecurityConstraints());
                 }
                 return null;
             }
         }
 
         // convert postfix expression tokens into constraints reference tokens
-        List constraintsRefTokens = new ArrayList();
+        List<SecurityConstraintsRefToken> constraintsRefTokens = new ArrayList<SecurityConstraintsRefToken>();
         Iterator postfixTokensIter = postfixTokens.iterator();
         while (postfixTokensIter.hasNext()) {
             String postfixToken = (String)postfixTokensIter.next();
@@ -128,8 +130,8 @@ public class SecurityConstraintsRefParse
      */
     static List parseConstraintsRef(String constraintsRef)
     {
-        List postfixTokens = new ArrayList();
-        Stack infixToPostfixStack = new Stack();
+        List<String> postfixTokens = new ArrayList<String>();
+        Stack<String> infixToPostfixStack = new Stack<String>();
         int tokenIndex = -1;
         boolean token = false;
         int parseIndex = 0;
@@ -176,7 +178,7 @@ public class SecurityConstraintsRefParse
     /**
      * Logical operator precedence map.
      */
-    private static final Map OPERATOR_PRECEDENCE = new HashMap();
+    private static final Map<String,Integer> OPERATOR_PRECEDENCE = new HashMap<String,Integer>();
     static
     {
         OPERATOR_PRECEDENCE.put(NOT_OPERATION, new Integer(2));
@@ -193,14 +195,14 @@ public class SecurityConstraintsRefParse
      * @param stack infix to postfix operations stack
      * @param postfixTokens postfix expression tokens
      */
-    private static void infixToPostfix(String expression, String token, int parseIndex, Stack stack, List postfixTokens)
+    private static void infixToPostfix(String expression, String token, int parseIndex, Stack<String> stack, List<String> postfixTokens)
     {
         // null token: end expression infix to postfix operation conversion
         if (token == null)
         {
             if (!stack.empty())
             {
-                String peek = (String)stack.peek();
+                String peek = stack.peek();
                 while (!peek.equals(OPEN_PAREN))
                 {
                     postfixTokens.add(stack.pop());
@@ -208,7 +210,7 @@ public class SecurityConstraintsRefParse
                     {
                         break;
                     }
-                    peek = (String)stack.peek();
+                    peek = stack.peek();
                 }
                 if (peek.equals(OPEN_PAREN))
                 {
@@ -229,7 +231,7 @@ public class SecurityConstraintsRefParse
             boolean matchedParen = false;
             if (!stack.empty())
             {
-                String peek = (String)stack.peek();
+                String peek = stack.peek();
                 while (!peek.equals(OPEN_PAREN))
                 {
                     postfixTokens.add(stack.pop());
@@ -237,7 +239,7 @@ public class SecurityConstraintsRefParse
                     {
                         break;
                     }
-                    peek = (String)stack.peek();
+                    peek = stack.peek();
                 }
                 if (peek.equals(OPEN_PAREN))
                 {
@@ -265,7 +267,7 @@ public class SecurityConstraintsRefParse
             token = NOT_OPERATION;
         }
         // push non-operation tokens
-        Integer operatorPrecedence = (Integer)OPERATOR_PRECEDENCE.get(token);
+        Integer operatorPrecedence = OPERATOR_PRECEDENCE.get(token);
         if (operatorPrecedence == null)
         {
             postfixTokens.add(token);
@@ -274,15 +276,15 @@ public class SecurityConstraintsRefParse
         // infix to postfix operation conversion
         if (!stack.empty())
         {
-            String peek = (String)stack.peek();
-            while (!peek.equals(OPEN_PAREN) && (((Integer)OPERATOR_PRECEDENCE.get(peek)).intValue() >= operatorPrecedence.intValue()))
+            String peek = stack.peek();
+            while (!peek.equals(OPEN_PAREN) && ((OPERATOR_PRECEDENCE.get(peek)).intValue() >= operatorPrecedence.intValue()))
             {
                 postfixTokens.add(stack.pop());
                 if (stack.empty())
                 {
                     break;
                 }
-                peek = (String)stack.peek();
+                peek = stack.peek();
             }
         }
         stack.push(token);

Modified: portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?rev=1577887&r1=1577886&r2=1577887&view=diff
==============================================================================
--- portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (original)
+++ portals/jetspeed-2/portal/trunk/components/jetspeed-page-manager/src/main/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Sat Mar 15 15:59:17 2014
@@ -178,7 +178,7 @@ public abstract class BaseElementImpl im
      * @param checkParentsOnly check parent folder scope only
      * @throws SecurityException
      */
-    public void checkConstraints(List actions, List userPrincipals, List rolePrincipals, List groupPrincipals, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException
+    public void checkConstraints(List<String> actions, List<String> userPrincipals, List<String> rolePrincipals, List<String> groupPrincipals, boolean checkNodeOnly, boolean checkParentsOnly) throws SecurityException
     {
         // check node constraints if available
         if ((constraints != null) && !constraints.isEmpty())
@@ -371,8 +371,8 @@ public abstract class BaseElementImpl im
 
         // get action names lists; separate view and other
         // actions to mimic file system permissions logic
-        List viewActionList = SecurityConstraintImpl.parseCSVList(actions);
-        List otherActionsList = null;
+        List<String> viewActionList = SecurityConstraintImpl.parseCSVList(actions);
+        List<String> otherActionsList = null;
         if (viewActionList.size() == 1)
         {
             if (!viewActionList.contains(JetspeedActions.VIEW))
@@ -400,9 +400,9 @@ public abstract class BaseElementImpl im
         }
 
         // get user/group/role principal names
-        List userPrincipals = null;
-        List rolePrincipals = null;
-        List groupPrincipals = null;
+        List<String> userPrincipals = null;
+        List<String> rolePrincipals = null;
+        List<String> groupPrincipals = null;
         Iterator principals = subject.getPrincipals().iterator();
         while (principals.hasNext())
         {
@@ -411,7 +411,7 @@ public abstract class BaseElementImpl im
             {
                 if (userPrincipals == null)
                 {
-                    userPrincipals = new LinkedList();
+                    userPrincipals = new LinkedList<String>();
                 }
                 userPrincipals.add(principal.getName());
             }
@@ -419,7 +419,7 @@ public abstract class BaseElementImpl im
             {
                 if (rolePrincipals == null)
                 {
-                    rolePrincipals = new LinkedList();
+                    rolePrincipals = new LinkedList<String>();
                 }
                 rolePrincipals.add(principal.getName());
             }
@@ -427,7 +427,7 @@ public abstract class BaseElementImpl im
             {
                 if (groupPrincipals == null)
                 {
-                    groupPrincipals = new LinkedList();
+                    groupPrincipals = new LinkedList<String>();
                 }
                 groupPrincipals.add(principal.getName());
             }



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