weaver 2005/04/29 06:58:35
Modified:
components/page-manager/src/java/org/apache/jetspeed/page/document
FileSystemFolderHandler.java
components/page-manager/src/java/org/apache/jetspeed/page/impl
DatabasePageManager.java CastorXmlPageManager.java
Log:
http://issues.apache.org/jira/browse/JS2-252
Revision Changes Path
1.6 +7 -1
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java
Index: FileSystemFolderHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/document/FileSystemFolderHandler.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- FileSystemFolderHandler.java 23 Nov 2004 00:01:31 -0000 1.5
+++ FileSystemFolderHandler.java 29 Apr 2005 13:58:35 -0000 1.6
@@ -29,6 +29,7 @@
import org.apache.jetspeed.om.folder.FolderMetaData;
import org.apache.jetspeed.om.folder.FolderNotFoundException;
import org.apache.jetspeed.om.folder.InvalidFolderException;
+import org.apache.jetspeed.om.folder.Reset;
import org.apache.jetspeed.om.folder.impl.FolderImpl;
import org.apache.jetspeed.om.page.Document;
@@ -501,6 +502,11 @@
refresh(folderEntry);
}
}
+
+ if(entry.getDocument() instanceof Reset)
+ {
+ ((Reset)entry.getDocument()).reset();
+ }
}
1.12 +11 -1
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java
Index: DatabasePageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/DatabasePageManager.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DatabasePageManager.java 25 Jan 2005 00:56:38 -0000 1.11
+++ DatabasePageManager.java 29 Apr 2005 13:58:35 -0000 1.12
@@ -27,9 +27,11 @@
import org.apache.jetspeed.idgenerator.IdGenerator;
import org.apache.jetspeed.om.folder.DocumentSet;
import org.apache.jetspeed.om.folder.Folder;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.om.page.psml.ContentPageImpl;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.PageNotFoundException;
import org.apache.jetspeed.page.PageNotRemovedException;
@@ -274,4 +276,12 @@
{
throw new UnsupportedOperationException("Not supported by DB impl
yet");
}
+
+ /* (non-Javadoc)
+ * @see
org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String)
+ */
+ public ContentPage getContentPage(String path) throws
PageNotFoundException, NodeException
+ {
+ return new ContentPageImpl(getPage(path));
+ }
}
1.27 +13 -2
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java
Index: CastorXmlPageManager.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl/CastorXmlPageManager.java,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- CastorXmlPageManager.java 25 Jan 2005 00:56:38 -0000 1.26
+++ CastorXmlPageManager.java 29 Apr 2005 13:58:35 -0000 1.27
@@ -45,9 +45,11 @@
import org.apache.jetspeed.om.folder.FolderNotFoundException;
import org.apache.jetspeed.om.folder.InvalidFolderException;
import org.apache.jetspeed.om.folder.impl.FolderImpl;
+import org.apache.jetspeed.om.page.ContentPage;
import org.apache.jetspeed.om.page.Link;
import org.apache.jetspeed.om.page.Page;
import org.apache.jetspeed.om.page.PageSecurity;
+import org.apache.jetspeed.om.page.psml.ContentPageImpl;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.PageNotFoundException;
import org.apache.jetspeed.page.document.AbstractNode;
@@ -145,7 +147,7 @@
String pageContextCacheKey = pageContextCacheKey(pageContext);
log.debug("computeProfiledPageContext() invoked, cache key = " +
pageContextCacheKey + ", (profilingEnabled = " + profilingEnabled + ")");
CacheablePageContext cachedPageContext =
lookupPageContext(pageContextCacheKey);
- if (cachedPageContext != null)
+ if (cachedPageContext != null )
{
// populate returned profiled page context
populateProfiledPageContext(cachedPageContext, pageContext);
@@ -542,6 +544,7 @@
populateProfiledPageContext(cachedPageContext, pageContext);
}
+
private NodeSetImpl expandAndProfileDocumentSet(Map profileLocators,
DocumentSet documentSet, NodeSetImpl expandedNodes, String
documentSetNamePrefix, Map documentSetNames, Map documentSetNodeSets, List
allProfiledFolders)
{
// expand and profile document set using document set or default
@@ -1915,6 +1918,14 @@
}
}
return cacheKeyBuffer.toString();
+ }
+
+ /* (non-Javadoc)
+ * @see
org.apache.jetspeed.page.PageManager#getContentPage(java.lang.String)
+ */
+ public ContentPage getContentPage(String path) throws
PageNotFoundException, NodeException
+ {
+ return new ContentPageImpl(getPage(path));
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
