You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by ta...@apache.org on 2006/10/12 01:18:03 UTC
svn commit: r463056 - in
/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed:
om/folder/impl/ om/page/ om/page/impl/ page/ page/document/impl/ page/impl/
Author: taylor
Date: Wed Oct 11 16:18:01 2006
New Revision: 463056
URL: http://svn.apache.org/viewvc?view=rev&rev=463056
Log:
OJB 1.0.3 requires collections to be removal aware.
Thus we can't seem to get away with just creating ArrayLists for Page Manager OM objects (folders, pages, fragments,...)
This issue on occurs when persisting newly create object collections
When persisting objects retrieved with OJB, this issue does not occur
http://issues.apache.org/jira/browse/JS2-590
Added:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
Modified:
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPropertyMap.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java
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/document/impl/NodeImpl.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/om/folder/impl/BaseMenuDefinitionImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionImpl.java Wed Oct 11 16:18:01 2006
@@ -15,10 +15,10 @@
*/
package org.apache.jetspeed.om.folder.impl;
-import java.util.ArrayList;
import java.util.List;
import org.apache.jetspeed.om.folder.MenuDefinition;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* BaseMenuDefinitionImpl
@@ -52,7 +52,7 @@
// create initial collection if necessary
if (elements == null)
{
- elements = new ArrayList(4);
+ elements = DatabasePageManagerUtils.createList();
}
return elements;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/BaseMenuDefinitionMetadata.java Wed Oct 11 16:18:01 2006
@@ -15,12 +15,12 @@
*/
package org.apache.jetspeed.om.folder.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Locale;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.page.PageMetadataImpl;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* BaseMenuDefinitionMetadata
@@ -57,7 +57,7 @@
{
if (metadataFields == null)
{
- metadataFields = new ArrayList(1);
+ metadataFields = DatabasePageManagerUtils.createCollection();
}
pageMetadata = newPageMetadata(metadataFields);
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java Wed Oct 11 16:18:01 2006
@@ -16,7 +16,6 @@
package org.apache.jetspeed.om.folder.impl;
import java.security.AccessController;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Comparator;
import java.util.Iterator;
@@ -48,6 +47,7 @@
import org.apache.jetspeed.page.document.NodeSet;
import org.apache.jetspeed.page.document.impl.NodeImpl;
import org.apache.jetspeed.page.document.impl.NodeSetImpl;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.jetspeed.security.FolderPermission;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
@@ -103,7 +103,7 @@
// create initial collection if necessary
if (orders == null)
{
- orders = new ArrayList();
+ orders = DatabasePageManagerUtils.createList();
}
return orders;
}
@@ -120,7 +120,7 @@
// create initial collection if necessary
if (menus == null)
{
- menus = new ArrayList(2);
+ menus = DatabasePageManagerUtils.createList();
}
return menus;
}
@@ -149,7 +149,7 @@
// create initial collection if necessary
if (folders == null)
{
- folders = new ArrayList();
+ folders = DatabasePageManagerUtils.createList();
}
return folders;
}
@@ -191,7 +191,7 @@
// create initial collection if necessary
if (pages == null)
{
- pages = new ArrayList();
+ pages = DatabasePageManagerUtils.createList();
}
return pages;
}
@@ -233,7 +233,7 @@
// create initial collection if necessary
if (links == null)
{
- links = new ArrayList();
+ links = DatabasePageManagerUtils.createList();
}
return links;
}
@@ -309,7 +309,7 @@
// create initial collection if necessary
if (all == null)
{
- all = new ArrayList();
+ all = DatabasePageManagerUtils.createList();
}
return all;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionElementList.java Wed Oct 11 16:18:01 2006
@@ -16,14 +16,6 @@
package org.apache.jetspeed.om.folder.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.jetspeed.om.folder.MenuDefinition;
-import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
-import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
-import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
-import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
/**
* FolderMenuDefinitionElementList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMenuDefinitionList.java Wed Oct 11 16:18:01 2006
@@ -16,10 +16,9 @@
package org.apache.jetspeed.om.folder.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.jetspeed.om.folder.MenuDefinition;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* FolderMenuDefinitionList
@@ -106,7 +105,7 @@
{
if (removedMenuDefinitions == null)
{
- removedMenuDefinitions = new ArrayList(folder.accessMenus().size());
+ removedMenuDefinitions = DatabasePageManagerUtils.createList();
}
return removedMenuDefinitions;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderOrderList.java Wed Oct 11 16:18:01 2006
@@ -16,9 +16,10 @@
package org.apache.jetspeed.om.folder.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
/**
* FolderOrderList
*
@@ -83,7 +84,7 @@
{
if (removedFolderOrders == null)
{
- removedFolderOrders = new ArrayList(folder.accessFolderOrders().size());
+ removedFolderOrders = DatabasePageManagerUtils.createList();
}
return removedFolderOrders;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/ContentFragmentImpl.java Wed Oct 11 16:18:01 2006
@@ -1,7 +1,6 @@
package org.apache.jetspeed.om.page;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
@@ -14,6 +13,7 @@
import org.apache.jetspeed.decoration.Decoration;
import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
public class ContentFragmentImpl implements ContentFragment
{
@@ -798,7 +798,7 @@
private List duplicateList()
{
- List rFragList = new ArrayList(baseList.size());
+ List rFragList = DatabasePageManagerUtils.createList();
for(int i=0; i < baseList.size(); i++)
{
Fragment f = (Fragment)baseList.get(i);
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/SecurityConstraintImpl.java Wed Oct 11 16:18:01 2006
@@ -15,13 +15,13 @@
*/
package org.apache.jetspeed.om.page;
-import java.util.ArrayList;
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;
/**
@@ -350,7 +350,7 @@
{
if (csv != null)
{
- List csvList = new ArrayList(4);
+ List csvList = DatabasePageManagerUtils.createList();
if (csv.indexOf(',') != -1)
{
StringTokenizer csvTokens = new StringTokenizer(csv, ",");
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/BaseElementImpl.java Wed Oct 11 16:18:01 2006
@@ -17,7 +17,6 @@
import java.security.AccessController;
import java.security.Principal;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
@@ -30,6 +29,7 @@
import org.apache.jetspeed.om.page.BaseElement;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.jetspeed.security.FolderPermission;
import org.apache.jetspeed.security.GroupPrincipal;
import org.apache.jetspeed.security.PagePermission;
@@ -345,7 +345,7 @@
viewActionList = null;
if (otherActionsList.remove(JetspeedActions.VIEW))
{
- viewActionList = new ArrayList(1);
+ viewActionList = DatabasePageManagerUtils.createList();
viewActionList.add(JetspeedActions.VIEW);
}
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentImpl.java Wed Oct 11 16:18:01 2006
@@ -16,19 +16,15 @@
package org.apache.jetspeed.om.page.impl;
import java.security.AccessController;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import org.apache.jetspeed.JetspeedActions;
-import org.apache.jetspeed.om.common.SecuredResource;
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.PageSecurity;
-import org.apache.jetspeed.om.preference.FragmentPreference;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.jetspeed.security.FragmentPermission;
/**
@@ -81,7 +77,7 @@
// create initial collection if necessary
if (fragments == null)
{
- fragments = new ArrayList(4);
+ fragments = DatabasePageManagerUtils.createList();
}
return fragments;
}
@@ -98,7 +94,7 @@
// create initial collection if necessary
if (preferences == null)
{
- preferences = new ArrayList(4);
+ preferences = DatabasePageManagerUtils.createList();
}
return preferences;
}
@@ -223,7 +219,7 @@
{
if (matchedFragments == null)
{
- matchedFragments = new ArrayList(1);
+ matchedFragments = DatabasePageManagerUtils.createList();
}
matchedFragments.add(this);
}
@@ -259,7 +255,7 @@
*/
List getPropertyMemberKeys()
{
- List keys = new ArrayList(5);
+ List keys = DatabasePageManagerUtils.createList();
if (layoutRowProperty >= 0)
{
keys.add(ROW_PROPERTY_NAME);
@@ -1011,7 +1007,7 @@
{
// not permitted, copy previously permitted fragments
// to new filteredFragments node set with same comparator
- filteredFragments = new ArrayList(fragments.size());
+ filteredFragments = DatabasePageManagerUtils.createList();
Iterator copyIter = fragments.iterator();
while (copyIter.hasNext())
{
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceImpl.java Wed Oct 11 16:18:01 2006
@@ -15,11 +15,11 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import org.apache.jetspeed.om.preference.FragmentPreference;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.pluto.om.common.Preference;
import org.apache.pluto.om.common.PreferenceCtrl;
@@ -50,7 +50,7 @@
// create initial collection if necessary
if (values == null)
{
- values = new ArrayList(4);
+ values = DatabasePageManagerUtils.createList();
}
return values;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceList.java Wed Oct 11 16:18:01 2006
@@ -16,8 +16,8 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* FragmentPreferenceList
@@ -84,7 +84,7 @@
{
if (removedPreferences == null)
{
- removedPreferences = new ArrayList(fragment.accessPreferences().size());
+ removedPreferences = DatabasePageManagerUtils.createList();
}
return removedPreferences;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPreferenceValueList.java Wed Oct 11 16:18:01 2006
@@ -16,8 +16,6 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
/**
* FragmentPreferenceValueList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPropertyMap.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPropertyMap.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPropertyMap.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/FragmentPropertyMap.java Wed Oct 11 16:18:01 2006
@@ -17,13 +17,12 @@
import java.util.AbstractMap;
import java.util.AbstractSet;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-import org.apache.jetspeed.om.page.Fragment;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* FragmentPropertyMap
@@ -85,7 +84,7 @@
private class FragmentPropertiesEntrySet extends AbstractSet
{
- private Collection entries = new ArrayList(5);
+ private Collection entries = DatabasePageManagerUtils.createCollection();
/* (non-Javadoc)
* @see java.util.Set#add(java.lang.Object)
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageImpl.java Wed Oct 11 16:18:01 2006
@@ -15,7 +15,6 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -30,6 +29,7 @@
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.PageMetadataImpl;
import org.apache.jetspeed.page.document.impl.DocumentImpl;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
/**
@@ -66,7 +66,7 @@
// create initial collection if necessary
if (menus == null)
{
- menus = new ArrayList(2);
+ menus = DatabasePageManagerUtils.createList();;
}
return menus;
}
@@ -201,7 +201,7 @@
// root fragment and save for reuse
if (this.fragment == null)
{
- this.fragment = new ArrayList(1);
+ this.fragment = DatabasePageManagerUtils.createList();
}
else if (!this.fragment.isEmpty())
{
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionElementList.java Wed Oct 11 16:18:01 2006
@@ -16,14 +16,6 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.jetspeed.om.folder.MenuDefinition;
-import org.apache.jetspeed.om.folder.MenuExcludeDefinition;
-import org.apache.jetspeed.om.folder.MenuIncludeDefinition;
-import org.apache.jetspeed.om.folder.MenuOptionsDefinition;
-import org.apache.jetspeed.om.folder.MenuSeparatorDefinition;
/**
* PageMenuDefinitionElementList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageMenuDefinitionList.java Wed Oct 11 16:18:01 2006
@@ -16,10 +16,10 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
-import org.apache.jetspeed.om.folder.MenuDefinition;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
/**
* PageMenuDefinitionList
@@ -106,7 +106,7 @@
{
if (removedMenuDefinitions == null)
{
- removedMenuDefinitions = new ArrayList(page.accessMenus().size());
+ removedMenuDefinitions = DatabasePageManagerUtils.createList();
}
return removedMenuDefinitions;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsDefList.java Wed Oct 11 16:18:01 2006
@@ -16,9 +16,10 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
/**
* PageSecurityConstraintsDefList
*
@@ -83,7 +84,7 @@
{
if (removedConstraintsDefs == null)
{
- removedConstraintsDefs = new ArrayList(pageSecurity.accessConstraintsDefs().size());
+ removedConstraintsDefs = DatabasePageManagerUtils.createList();
}
return removedConstraintsDefs;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityConstraintsRefList.java Wed Oct 11 16:18:01 2006
@@ -16,9 +16,10 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
/**
* PageSecurityConstraintsRefList
*
@@ -83,7 +84,7 @@
{
if (removedConstraintsRefs == null)
{
- removedConstraintsRefs = new ArrayList(pageSecurity.accessGlobalConstraintsRefs().size());
+ removedConstraintsRefs = DatabasePageManagerUtils.createList();
}
return removedConstraintsRefs;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/PageSecurityImpl.java Wed Oct 11 16:18:01 2006
@@ -15,18 +15,16 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
import java.util.Map;
import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
import org.apache.jetspeed.page.document.impl.DocumentImpl;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* PageSecurityImpl
@@ -60,7 +58,7 @@
// create initial collection if necessary
if (constraintsDefs == null)
{
- constraintsDefs = new ArrayList(4);
+ constraintsDefs = DatabasePageManagerUtils.createList();
}
return constraintsDefs;
}
@@ -77,7 +75,7 @@
// create initial collection if necessary
if (globalConstraintsRefs == null)
{
- globalConstraintsRefs = new ArrayList(4);
+ globalConstraintsRefs = DatabasePageManagerUtils.createList();
}
return globalConstraintsRefs;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintDefList.java Wed Oct 11 16:18:01 2006
@@ -16,10 +16,6 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.jetspeed.om.page.SecurityConstraintImpl;
/**
* SecurityConstraintDefList
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintList.java Wed Oct 11 16:18:01 2006
@@ -16,8 +16,6 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
-import java.util.List;
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsDefImpl.java Wed Oct 11 16:18:01 2006
@@ -15,10 +15,10 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.ArrayList;
import java.util.List;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* SecurityConstraintsDefImpl
@@ -30,7 +30,7 @@
{
private int id;
private String name;
- private List constraintDefs = new ArrayList(4);
+ private List constraintDefs = DatabasePageManagerUtils.createList();
private SecurityConstraintDefList securityConstraintDefs;
@@ -46,7 +46,7 @@
// create initial collection if necessary
if (constraintDefs == null)
{
- constraintDefs = new ArrayList(4);
+ constraintDefs = DatabasePageManagerUtils.createList();
}
return constraintDefs;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsImpl.java Wed Oct 11 16:18:01 2006
@@ -15,16 +15,14 @@
*/
package org.apache.jetspeed.om.page.impl;
-import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.util.ListIterator;
-import org.apache.jetspeed.om.common.SecurityConstraint;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintImpl;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* SecurityConstraintsImpl
@@ -55,7 +53,7 @@
// create initial collection if necessary
if (constraintsRefs == null)
{
- constraintsRefs = new ArrayList(4);
+ constraintsRefs = DatabasePageManagerUtils.createList();
}
return constraintsRefs;
}
@@ -72,7 +70,7 @@
// create initial collection if necessary
if (constraints == null)
{
- constraints = new ArrayList(4);
+ constraints = DatabasePageManagerUtils.createList();
}
return constraints;
}
@@ -214,7 +212,7 @@
}
// construct new ordered security constraints list
- allConstraints = new ArrayList(8);
+ allConstraints = DatabasePageManagerUtils.createList();
// add any defined security constraints
if ((getSecurityConstraints() != null) && !getSecurityConstraints().isEmpty())
@@ -280,7 +278,7 @@
{
if (constraints == null)
{
- constraints = new ArrayList(constraintsRefs.size());
+ constraints = DatabasePageManagerUtils.createList();
}
constraints.addAll(securityConstraintsDef.getSecurityConstraints());
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/om/page/impl/SecurityConstraintsRefList.java Wed Oct 11 16:18:01 2006
@@ -16,9 +16,10 @@
package org.apache.jetspeed.om.page.impl;
import java.util.AbstractList;
-import java.util.ArrayList;
import java.util.List;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
+
/**
* SecurityConstraintsRefList
*
@@ -103,7 +104,7 @@
{
if (removedConstraintsRefs == null)
{
- removedConstraintsRefs = new ArrayList(constraints.accessConstraintsRefs().size());
+ removedConstraintsRefs = DatabasePageManagerUtils.createList();
}
return removedConstraintsRefs;
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/AbstractPageManager.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- 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 Wed Oct 11 16:18:01 2006
@@ -15,7 +15,6 @@
*/
package org.apache.jetspeed.page;
-import java.security.Principal;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedList;
@@ -42,12 +41,9 @@
import org.apache.jetspeed.om.page.PageSecurity;
import org.apache.jetspeed.om.page.SecurityConstraintsDef;
import org.apache.jetspeed.om.preference.FragmentPreference;
-import org.apache.jetspeed.page.document.FailedToUpdateDocumentException;
import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.NodeException;
-import org.apache.jetspeed.security.RolePrincipal;
-import org.apache.jetspeed.security.SecurityHelper;
-import org.apache.jetspeed.security.UserPrincipal;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
/**
* AbstractPageManagerService
@@ -814,7 +810,7 @@
}
// copy document orders
- folder.setDocumentOrder(new ArrayList());
+ folder.setDocumentOrder(DatabasePageManagerUtils.createList());
Iterator documentOrders = source.getDocumentOrder().iterator();
while (documentOrders.hasNext())
{
@@ -902,7 +898,7 @@
}
// copy preferences
- copy.setPreferences(new ArrayList());
+ copy.setPreferences(DatabasePageManagerUtils.createList());
Iterator prefs = source.getPreferences().iterator();
while (prefs.hasNext())
{
@@ -910,7 +906,7 @@
FragmentPreference newPref = this.newFragmentPreference();
newPref.setName(pref.getName());
newPref.setReadOnly(pref.isReadOnly());
- newPref.setValueList(new ArrayList());
+ newPref.setValueList(DatabasePageManagerUtils.createList());
Iterator values = pref.getValueList().iterator();
while (values.hasNext())
{
@@ -967,14 +963,14 @@
copy.setVersion(source.getVersion());
// copy security constraint defintions
- copy.setSecurityConstraintsDefs(new ArrayList());
+ copy.setSecurityConstraintsDefs(DatabasePageManagerUtils.createList());
Iterator defs = source.getSecurityConstraintsDefs().iterator();
while (defs.hasNext())
{
SecurityConstraintsDef def = (SecurityConstraintsDef)defs.next();
SecurityConstraintsDef defCopy = this.newSecurityConstraintsDef();
defCopy.setName(def.getName());
- List copiedConstraints = new ArrayList();
+ List copiedConstraints = DatabasePageManagerUtils.createList();
Iterator constraints = def.getSecurityConstraints().iterator();
while (constraints.hasNext())
{
@@ -988,7 +984,7 @@
}
// copy global security constraint references
- copy.setGlobalSecurityConstraintsRefs(new ArrayList());
+ copy.setGlobalSecurityConstraintsRefs(DatabasePageManagerUtils.createList());
Iterator globals = source.getGlobalSecurityConstraintsRefs().iterator();
while (globals.hasNext())
{
@@ -1001,7 +997,7 @@
protected List copyMenuDefinitions(String type, List srcMenus)
{
- List copiedMenus = new ArrayList(4);
+ List copiedMenus = DatabasePageManagerUtils.createList();
Iterator menus = srcMenus.iterator();
while (menus.hasNext())
{
@@ -1048,7 +1044,7 @@
List elements = source.getMenuElements();
if (elements != null)
{
- List copiedElements = new ArrayList(4);
+ List copiedElements = DatabasePageManagerUtils.createList();
Iterator elementsIter = elements.iterator();
while (elementsIter.hasNext())
{
@@ -1161,7 +1157,7 @@
}
if (source.getSecurityConstraints() != null)
{
- List copiedConstraints = new ArrayList(8);
+ List copiedConstraints = DatabasePageManagerUtils.createList();
Iterator constraints = source.getSecurityConstraints().iterator();
while (constraints.hasNext())
{
@@ -1190,7 +1186,7 @@
}
if (source.getSecurityConstraintsRefs() != null)
{
- List copiedRefs = new ArrayList(8);
+ List copiedRefs = DatabasePageManagerUtils.createList();
Iterator refs = source.getSecurityConstraintsRefs().iterator();
while (refs.hasNext())
{
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/document/impl/NodeImpl.java Wed Oct 11 16:18:01 2006
@@ -15,7 +15,6 @@
*/
package org.apache.jetspeed.page.document.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Locale;
@@ -28,6 +27,7 @@
import org.apache.jetspeed.om.page.impl.BaseElementImpl;
import org.apache.jetspeed.om.page.impl.SecurityConstraintsImpl;
import org.apache.jetspeed.page.document.Node;
+import org.apache.jetspeed.page.impl.DatabasePageManagerUtils;
import org.apache.ojb.broker.core.proxy.ProxyHelper;
/**
@@ -112,7 +112,7 @@
{
if (metadataFields == null)
{
- metadataFields = new ArrayList(1);
+ metadataFields = DatabasePageManagerUtils.createList();
}
pageMetadata = newPageMetadata(metadataFields);
}
Modified: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java?view=diff&rev=463056&r1=463055&r2=463056
==============================================================================
--- 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 Wed Oct 11 16:18:01 2006
@@ -15,7 +15,6 @@
*/
package org.apache.jetspeed.page.impl;
-import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
@@ -881,7 +880,7 @@
try
{
// query for all nodes
- List all = new ArrayList(16);
+ List all = DatabasePageManagerUtils.createList();
Criteria filter = new Criteria();
filter.addEqualTo("parent", folderImpl.getId());
QueryByCriteria query = QueryFactory.newQuery(FolderImpl.class, filter);
Added: portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java?view=auto&rev=463056
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java (added)
+++ portals/jetspeed-2/trunk/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManagerUtils.java Wed Oct 11 16:18:01 2006
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2000-2004 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jetspeed.page.impl;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.ojb.broker.util.collections.RemovalAwareCollection;
+import org.apache.ojb.broker.util.collections.RemovalAwareList;
+
+
+/**
+ * DatabasePageManagerUtils
+ *
+ * @author <a href="mailto:taylor@apache.org">David Sean Taylor</a>
+ * @version $Id: $
+ */
+public class DatabasePageManagerUtils
+{
+ protected static Log log = LogFactory.getLog(DatabasePageManagerUtils.class);
+
+ /**
+ * OJB 1.0.3 requires collections to be removal aware.
+ * Thus we can't seem to get away with just creating ArrayLists
+ * This issue on occurs when persisting newly create object collections
+ * When persisting objects retrieved with OJB, this issue does not occur
+ *
+ * @see JS2-590
+ * @return
+ */
+ public static final Collection createCollection()
+ {
+ return new RemovalAwareCollection();
+ }
+
+ public static final List createList()
+ {
+ return new RemovalAwareList();
+ }
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org