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 we...@apache.org on 2005/04/29 15:57:57 UTC
cvs commit: jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl FolderImpl.java
weaver 2005/04/29 06:57:57
Modified: components/page-manager/src/java/org/apache/jetspeed/om/page/psml
PageImpl.java FragmentImpl.java
components/file-cache/src/java/org/apache/jetspeed/cache/file
FileCacheEntryImpl.java
components/page-manager/src/java/org/apache/jetspeed/om/folder/impl
FolderImpl.java
Added: components/page-manager/src/java/org/apache/jetspeed/om/page/psml
ContentFragmentImpl.java ContentPageImpl.java
Log:
See JS2-252: http://issues.apache.org/jira/browse/JS2-252
Revision Changes Path
1.8 +2 -1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java
Index: PageImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/PageImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- PageImpl.java 17 Sep 2004 20:01:04 -0000 1.7
+++ PageImpl.java 29 Apr 2005 13:57:57 -0000 1.8
@@ -200,5 +200,6 @@
return super.getUrl();
return getId();
}
+
}
1.7 +1 -91 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java
Index: FragmentImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/FragmentImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FragmentImpl.java 11 Jan 2005 19:59:40 -0000 1.6
+++ FragmentImpl.java 29 Apr 2005 13:57:57 -0000 1.7
@@ -47,12 +47,8 @@
private String name;
- private InheritableThreadLocal portletContent = new InheritableThreadLocal();
-
private static final Log log = LogFactory.getLog(FragmentImpl.class);
- private InheritableThreadLocal overridenContent = new InheritableThreadLocal();
-
public FragmentImpl()
{
}
@@ -232,11 +228,6 @@
this.properties = props;
}
- public void setFragments( List fragments )
- {
- this.fragments = fragments;
- }
-
public Object clone() throws java.lang.CloneNotSupportedException
{
Object cloned = super.clone();
@@ -315,85 +306,4 @@
this.name = name;
}
-
- /**
- *
- * <p>
- * getRenderedContent
- * </p>
- *
- * @see org.apache.jetspeed.om.page.Fragment#getRenderedContent()
- * @return
- */
- public String getRenderedContent()
- {
- if(overridenContent.get() != null)
- {
- return ((StringBuffer) overridenContent.get()).toString();
- }
-
- PortletContent content = (PortletContent) portletContent.get();
- if (content != null)
- {
- synchronized (content)
- {
- if (content.isComplete())
- {
- return content.getContent();
- }
- else
- {
- try
- {
- log.debug("Waiting on content for Fragment " + getId());
- content.wait();
- return content.getContent();
- }
- catch (InterruptedException e)
- {
- return e.getMessage();
- }
- finally
- {
- log.debug("Been notified that Faragment " + getId() + " is complete");
- }
- }
- }
- }
- else
- {
- throw new IllegalStateException("You cannot invoke getRenderedContent() until the content has been set.");
- }
- }
-
- /**
- * <p>
- * setPortletContent
- * </p>
- *
- * @see org.apache.jetspeed.om.page.Fragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent)
- * @param portletContent
- */
- public void setPortletContent( PortletContent portletContent )
- {
- this.portletContent.set(portletContent);
- }
- /**
- * <p>
- * overrideRenderedContent
- * </p>
- *
- * @see org.apache.jetspeed.om.page.Fragment#overrideRenderedContent(java.lang.String)
- * @param contnent
- */
- public void overrideRenderedContent( String content )
- {
- StringBuffer buffer = (StringBuffer)overridenContent.get();
- if(buffer == null)
- {
- buffer = new StringBuffer("Encountered the following problem(s) while attmepting to render portlet fragment: "+getId()+"<br />");
- overridenContent.set(buffer);
- }
- buffer.append(content).append("<br />");
- }
}
1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentFragmentImpl.java
Index: ContentFragmentImpl.java
===================================================================
package org.apache.jetspeed.om.page.psml;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.jetspeed.aggregator.PortletContent;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Property;
public class ContentFragmentImpl implements ContentFragment
{
private final Fragment fragment;
private StringBuffer overridenContent;
private PortletContent portletContent;
private List contentFragments;
private static final Log log = LogFactory.getLog(ContentFragmentImpl.class);
private final Map cachedFragments;
public ContentFragmentImpl(Fragment fragment, Map cachedFagments)
{
this.fragment = fragment;
this.cachedFragments = cachedFagments;
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentFragment#getContentFragments()
*/
public List getContentFragments()
{
if(contentFragments == null)
{
contentFragments = new ContentFragmentList();
}
return contentFragments;
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentFragment#getFragments()
*/
public List getFragments()
{
return getContentFragments();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentFragment#getRenderedContent()
*/
public String getRenderedContent() throws IllegalStateException
{
if(overridenContent != null)
{
return overridenContent.toString();
}
if (portletContent != null)
{
synchronized (portletContent)
{
if (portletContent.isComplete())
{
return portletContent.getContent();
}
else
{
try
{
log.debug("Waiting on content for Fragment " + getId());
portletContent.wait();
return portletContent.getContent();
}
catch (InterruptedException e)
{
return e.getMessage();
}
finally
{
log.debug("Been notified that Faragment " + getId() + " is complete");
}
}
}
}
else
{
throw new IllegalStateException("You cannot invoke getRenderedContent() until the content has been set.");
}
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentFragment#overrideRenderedContent(java.lang.String)
*/
public void overrideRenderedContent(String contnent)
{
if(overridenContent == null)
{
overridenContent = new StringBuffer();
}
overridenContent.append(contnent);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentFragment#setPortletContent(org.apache.jetspeed.aggregator.PortletContent)
*/
public void setPortletContent(PortletContent portletContent)
{
this.portletContent = portletContent;
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#addProperty(org.apache.jetspeed.om.page.Property)
*/
public void addProperty(Property p)
{
fragment.addProperty(p);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#clearProperties(java.lang.String)
*/
public void clearProperties(String layoutName)
{
fragment.clearProperties(layoutName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#clone()
*/
public Object clone() throws CloneNotSupportedException
{
return fragment.clone();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getDecorator()
*/
public String getDecorator()
{
return fragment.getDecorator();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getLayoutProperties()
*/
public List getLayoutProperties()
{
return fragment.getLayoutProperties();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getName()
*/
public String getName()
{
return fragment.getName();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getProperties(java.lang.String)
*/
public List getProperties(String layoutName)
{
return fragment.getProperties(layoutName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getPropertyValue(java.lang.String, java.lang.String)
*/
public String getPropertyValue(String layout, String propName)
{
return fragment.getPropertyValue(layout, propName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getSkin()
*/
public String getSkin()
{
return fragment.getSkin();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getState()
*/
public String getState()
{
return fragment.getState();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#getType()
*/
public String getType()
{
return fragment.getType();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#isReference()
*/
public boolean isReference()
{
return fragment.isReference();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#removeProperty(org.apache.jetspeed.om.page.Property)
*/
public void removeProperty(Property p)
{
fragment.removeProperty(p);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setDecorator(java.lang.String)
*/
public void setDecorator(String decoratorName)
{
fragment.setDecorator(decoratorName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setName(java.lang.String)
*/
public void setName(String name)
{
fragment.setName(name);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setPropertyValue(java.lang.String, java.lang.String, java.lang.String)
*/
public void setPropertyValue(String layout, String propName, String value)
{
fragment.setPropertyValue(layout, propName, value);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setSkin(java.lang.String)
*/
public void setSkin(String skinName)
{
fragment.setSkin(skinName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setState(java.lang.String)
*/
public void setState(String state)
{
fragment.setState(state);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Fragment#setType(java.lang.String)
*/
public void setType(String type)
{
fragment.setType(type);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getId()
*/
public String getId()
{
return fragment.getId();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getShortTitle()
*/
public String getShortTitle()
{
return fragment.getShortTitle();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getTitle()
*/
public String getTitle()
{
return fragment.getTitle();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setId(java.lang.String)
*/
public void setId(String id)
{
fragment.setId(id);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String)
*/
public void setShortTitle(String title)
{
fragment.setShortTitle(title);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setTitle(java.lang.String)
*/
public void setTitle(String title)
{
fragment.setTitle(title);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String)
*/
public void checkAccess(String actions) throws SecurityException
{
fragment.checkAccess(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang.String)
*/
public void checkConstraints(String actions) throws SecurityException
{
fragment.checkConstraints(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkPermissions(java.lang.String)
*/
public void checkPermissions(String actions) throws SecurityException
{
fragment.checkPermissions(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled()
*/
public boolean getConstraintsEnabled()
{
return fragment.getConstraintsEnabled();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled()
*/
public boolean getPermissionsEnabled()
{
return fragment.getPermissionsEnabled();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints()
*/
public SecurityConstraints getSecurityConstraints()
{
return fragment.getSecurityConstraints();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints)
*/
public void setSecurityConstraints(SecurityConstraints constraints)
{
fragment.setSecurityConstraints(constraints);
}
/**
* Checks the ContentFragment cache for a ContentFragment
* that matches the <code>Id</code> of this fragment. If
* one is found, it returned. If no matches are found, a new
* <code>ContentFragment</code> represnentive of the {@link Fragment}
* argument is subsequently created, stored into the cahce and returned.
*
* @param f
* @return ContentFrament
*/
protected ContentFragment getContentFragment(Fragment f)
{
ContentFragment cf;
if(cachedFragments.containsKey(f.getId()))
{
cf = (ContentFragment) cachedFragments.get(f.getId());
}
else
{
cf = new ContentFragmentImpl(f, cachedFragments);
cachedFragments.put(f.getId(), cf);
}
return cf;
}
protected final class ContentFragmentList implements List
{
private List baseList = fragment.getFragments();
/* (non-Javadoc)
* @see java.util.List#add(int, java.lang.Object)
*/
public void add(int index, Object element)
{
baseList.add(index, element);
}
/* (non-Javadoc)
* @see java.util.List#add(java.lang.Object)
*/
public boolean add(Object o)
{
return baseList.add(o);
}
/* (non-Javadoc)
* @see java.util.List#addAll(int, java.util.Collection)
*/
public boolean addAll(int index, Collection c)
{
return baseList.addAll(index, c);
}
/* (non-Javadoc)
* @see java.util.List#addAll(java.util.Collection)
*/
public boolean addAll(Collection c)
{
return baseList.addAll(c);
}
/* (non-Javadoc)
* @see java.util.List#clear()
*/
public void clear()
{
baseList.clear();
}
/* (non-Javadoc)
* @see java.util.List#contains(java.lang.Object)
*/
public boolean contains(Object o)
{
return baseList.contains(o);
}
/* (non-Javadoc)
* @see java.util.List#containsAll(java.util.Collection)
*/
public boolean containsAll(Collection c)
{
return baseList.containsAll(c);
}
/* (non-Javadoc)
* @see java.util.List#equals(java.lang.Object)
*/
public boolean equals(Object o)
{
return baseList.equals(o);
}
/* (non-Javadoc)
* @see java.util.List#get(int)
*/
public Object get(int index)
{
Fragment f= (Fragment) baseList.get(index);
return getContentFragment(f);
}
/* (non-Javadoc)
* @see java.util.List#hashCode()
*/
public int hashCode()
{
return baseList.hashCode();
}
/* (non-Javadoc)
* @see java.util.List#indexOf(java.lang.Object)
*/
public int indexOf(Object o)
{
return baseList.indexOf(o);
}
/* (non-Javadoc)
* @see java.util.List#isEmpty()
*/
public boolean isEmpty()
{
return baseList.isEmpty();
}
/* (non-Javadoc)
* @see java.util.List#iterator()
*/
public Iterator iterator()
{
return duplicateList().iterator();
}
/* (non-Javadoc)
* @see java.util.List#lastIndexOf(java.lang.Object)
*/
public int lastIndexOf(Object o)
{
return baseList.lastIndexOf(o);
}
/* (non-Javadoc)
* @see java.util.List#listIterator()
*/
public ListIterator listIterator()
{
return duplicateList().listIterator();
}
/* (non-Javadoc)
* @see java.util.List#listIterator(int)
*/
public ListIterator listIterator(int index)
{
return duplicateList().listIterator(index);
}
/* (non-Javadoc)
* @see java.util.List#remove(int)
*/
public Object remove(int index)
{
return baseList.remove(index);
}
/* (non-Javadoc)
* @see java.util.List#remove(java.lang.Object)
*/
public boolean remove(Object o)
{
return baseList.remove(o);
}
/* (non-Javadoc)
* @see java.util.List#removeAll(java.util.Collection)
*/
public boolean removeAll(Collection c)
{
return baseList.removeAll(c);
}
/* (non-Javadoc)
* @see java.util.List#retainAll(java.util.Collection)
*/
public boolean retainAll(Collection c)
{
return baseList.retainAll(c);
}
/* (non-Javadoc)
* @see java.util.List#set(int, java.lang.Object)
*/
public Object set(int index, Object element)
{
return baseList.set(index, element);
}
/* (non-Javadoc)
* @see java.util.List#size()
*/
public int size()
{
return baseList.size();
}
/* (non-Javadoc)
* @see java.util.List#subList(int, int)
*/
public List subList(int fromIndex, int toIndex)
{
return duplicateList().subList(fromIndex, toIndex);
}
/* (non-Javadoc)
* @see java.util.List#toArray()
*/
public Object[] toArray()
{
return duplicateList().toArray();
}
/* (non-Javadoc)
* @see java.util.List#toArray(java.lang.Object[])
*/
public Object[] toArray(Object[] a)
{
return duplicateList().toArray(a);
}
private List duplicateList()
{
List rFragList = new ArrayList(baseList.size());
for(int i=0; i < baseList.size(); i++)
{
Fragment f = (Fragment)baseList.get(i);
ContentFragment cf = getContentFragment(f);
rFragList.add(cf);
}
return rFragList;
}
}
}
1.1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
Index: ContentPageImpl.java
===================================================================
package org.apache.jetspeed.om.page.psml;
import java.util.HashMap;
import java.util.Locale;
import java.util.Map;
import org.apache.jetspeed.om.common.GenericMetadata;
import org.apache.jetspeed.om.common.SecurityConstraints;
import org.apache.jetspeed.om.page.ContentFragment;
import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.page.document.Node;
public class ContentPageImpl implements ContentPage
{
private final Page page;
private final Map cachedFragments;
private ContentFragment rootContentFragment;
public ContentPageImpl(Page page)
{
this.page = page;
this.cachedFragments = new HashMap();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentPage#getContentFragmentById(java.lang.String)
*/
public ContentFragment getContentFragmentById(String id)
{
ContentFragment contentFragment = null;
if(cachedFragments.containsKey(id))
{
contentFragment = (ContentFragment) cachedFragments.get(id);
}
else
{
Fragment f = page.getFragmentById(id);
if(f != null)
{
contentFragment = new ContentFragmentImpl(f, cachedFragments);
cachedFragments.put(id, contentFragment);
}
}
return contentFragment;
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentPage#getFragmentById(java.lang.String)
*/
public Fragment getFragmentById(String id)
{
return getContentFragmentById(id);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentPage#getRootContentFragment()
*/
public ContentFragment getRootContentFragment()
{
if(rootContentFragment == null)
{
rootContentFragment = new ContentFragmentImpl(page.getRootFragment(), cachedFragments);
cachedFragments.put(rootContentFragment.getId(), rootContentFragment);
}
return rootContentFragment;
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.ContentPage#setRootFragment(org.apache.jetspeed.om.page.Fragment)
*/
public Fragment getRootFragment()
{
return getRootContentFragment();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#clone()
*/
public Object clone() throws CloneNotSupportedException
{
return new ContentPageImpl((Page)page.clone());
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#getDefaultDecorator(java.lang.String)
*/
public String getDefaultDecorator(String fragmentType)
{
return page.getDefaultDecorator(fragmentType);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#getDefaultSkin()
*/
public String getDefaultSkin()
{
return page.getDefaultSkin();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#setDefaultDecorator(java.lang.String, java.lang.String)
*/
public void setDefaultDecorator(String decoratorName, String fragmentType)
{
page.setDefaultDecorator(decoratorName, fragmentType);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#setDefaultSkin(java.lang.String)
*/
public void setDefaultSkin(String skinName)
{
page.setDefaultSkin(skinName);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.Page#setRootFragment(org.apache.jetspeed.om.page.Fragment)
*/
public void setRootFragment(Fragment fragment)
{
page.setRootFragment(fragment);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getMetadata()
*/
public GenericMetadata getMetadata()
{
return page.getMetadata();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getName()
*/
public String getName()
{
return page.getName();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getParent()
*/
public Node getParent()
{
return page.getParent();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getPath()
*/
public String getPath()
{
return page.getPath();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getShortTitle(java.util.Locale)
*/
public String getShortTitle(Locale locale)
{
return page.getShortTitle(locale);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getTitle(java.util.Locale)
*/
public String getTitle(Locale locale)
{
return page.getTitle(locale);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getType()
*/
public String getType()
{
return page.getType();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#getUrl()
*/
public String getUrl()
{
return page.getUrl();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#isHidden()
*/
public boolean isHidden()
{
return page.isHidden();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#setParent(org.apache.jetspeed.page.document.Node)
*/
public void setParent(Node parent)
{
page.setParent(parent);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.page.document.Node#setPath(java.lang.String)
*/
public void setPath(String path)
{
page.setPath(path);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkAccess(java.lang.String)
*/
public void checkAccess(String actions) throws SecurityException
{
page.checkAccess(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkConstraints(java.lang.String)
*/
public void checkConstraints(String actions) throws SecurityException
{
page.checkConstraints(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#checkPermissions(java.lang.String)
*/
public void checkPermissions(String actions) throws SecurityException
{
page.checkPermissions(actions);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getConstraintsEnabled()
*/
public boolean getConstraintsEnabled()
{
return page.getConstraintsEnabled();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getPermissionsEnabled()
*/
public boolean getPermissionsEnabled()
{
return page.getPermissionsEnabled();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#getSecurityConstraints()
*/
public SecurityConstraints getSecurityConstraints()
{
return page.getSecurityConstraints();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.common.SecuredResource#setSecurityConstraints(org.apache.jetspeed.om.common.SecurityConstraints)
*/
public void setSecurityConstraints(SecurityConstraints constraints)
{
page.setSecurityConstraints(constraints);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getId()
*/
public String getId()
{
return page.getId();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getShortTitle()
*/
public String getShortTitle()
{
return page.getShortTitle();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#getTitle()
*/
public String getTitle()
{
return page.getTitle();
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setId(java.lang.String)
*/
public void setId(String id)
{
page.setId(id);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setShortTitle(java.lang.String)
*/
public void setShortTitle(String title)
{
page.setShortTitle(title);
}
/* (non-Javadoc)
* @see org.apache.jetspeed.om.page.BaseElement#setTitle(java.lang.String)
*/
public void setTitle(String title)
{
page.setTitle(title);
}
}
1.2 +2 -2 jakarta-jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java
Index: FileCacheEntryImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/file-cache/src/java/org/apache/jetspeed/cache/file/FileCacheEntryImpl.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- FileCacheEntryImpl.java 19 May 2004 20:19:49 -0000 1.1
+++ FileCacheEntryImpl.java 29 Apr 2005 13:57:57 -0000 1.2
@@ -59,7 +59,7 @@
*/
public File getFile()
{
- return this.file;
+ return new File(this.file.getAbsolutePath());
}
/**
1.23 +12 -2 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java
Index: FolderImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderImpl.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- FolderImpl.java 25 Jan 2005 00:56:38 -0000 1.22
+++ FolderImpl.java 29 Apr 2005 13:57:57 -0000 1.23
@@ -29,6 +29,7 @@
import org.apache.jetspeed.om.folder.Folder;
import org.apache.jetspeed.om.folder.FolderMetaData;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
+import org.apache.jetspeed.om.folder.Reset;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.PageSecurity;
@@ -54,7 +55,7 @@
* @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
* @version $Id$
*/
-public class FolderImpl extends AbstractNode implements Folder
+public class FolderImpl extends AbstractNode implements Folder, Reset
{
public static final String FALLBACK_DEFAULT_PAGE = "default-page.psml";
@@ -813,4 +814,13 @@
{
((AbstractNode)metadata).setHidden(hidden);
}
+
+ /* (non-Javadoc)
+ * @see org.apache.jetspeed.om.folder.Reset#reset()
+ */
+ public void reset()
+ {
+ allNodes = null;
+
+ }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org