taylor 2004/11/26 10:51:55
Modified: jetspeed-api/src/java/org/apache/jetspeed/profiler
ProfiledPageContext.java
jetspeed-api/src/java/org/apache/jetspeed/page/document
NodeSet.java
jetspeed-api/src/java/org/apache/jetspeed/om/folder
Folder.java
Log:
Nested Document Sets implementation in page manager, decorators, templates,
and demo site.
- Addition of getAll() method to jetspeed API Folder interface.
- Changes to CastorXmlPageManager/FolderImpl implementation and associated
unit tests for updating and removing PSML pages.
- Improved indenting in left menu pane for Tigris layout.
Note that an updated profiler/page manager design document is contained in
the "new" zip file.
To test nested document sets:
Login as user/user and validate nested document set named "More Pages"
appears within "Top Pages" and contains a new page and link to the Tigris
sample page.
patch from Randy Watler
Reviewed by: [EMAIL PROTECTED]
CVS: ----------------------------------------------------------------------
CVS: PR:
CVS: If this change addresses a PR in the problem report tracking
CVS: database, then enter the PR number(s) here.
CVS: Obtained from:
CVS: If this change has been taken from another system, such as NCSA,
CVS: then name the system in this line, otherwise delete it.
CVS: Submitted by:
CVS: If this code has been contributed to Apache by someone else; i.e.,
CVS: they sent us a patch or a new module, then include their name/email
CVS: address here. If this is your work then delete this line.
CVS: Reviewed by:
CVS: If we are doing pre-commit code reviews and someone else has
CVS: reviewed your changes, include their name(s) here.
CVS: If you have not had it reviewed then delete this line.
Revision Changes Path
1.3 +12 -1
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfiledPageContext.java
Index: ProfiledPageContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/profiler/ProfiledPageContext.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProfiledPageContext.java 15 Oct 2004 07:07:49 -0000 1.2
+++ ProfiledPageContext.java 26 Nov 2004 18:51:54 -0000 1.3
@@ -185,4 +185,15 @@
* @param nodes The expanded document set nodes.
*/
void setDocumentSet(String name, DocumentSet documentSet, NodeSet nodes);
+
+ /**
+ * Set a named nested document set and expanded nodes. These
+ * document sets do not appear in the names iterator but
+ * are mapped by name along with their expanded nodes.
+ *
+ * @param name The name of the document set.
+ * @param documentSet The document set.
+ * @param nodes The expanded document set nodes.
+ */
+ void setNestedDocumentSet(String name, DocumentSet documentSet, NodeSet
nodes);
}
1.5 +3 -1
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeSet.java
Index: NodeSet.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeSet.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NodeSet.java 23 Nov 2004 00:01:31 -0000 1.4
+++ NodeSet.java 26 Nov 2004 18:51:54 -0000 1.5
@@ -56,4 +56,6 @@
NodeSet exclusiveSubset(String regex);
int size();
+
+ boolean contains(Node node);
}
1.10 +6 -5
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
Index: Folder.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Folder.java 23 Nov 2004 20:31:24 -0000 1.9
+++ Folder.java 26 Nov 2004 18:51:54 -0000 1.10
@@ -199,12 +199,13 @@
/**
*
* <p>
- * getAllNodes
+ * getAll
* </p>
*
- * @return All Nodes immediatley under this Folder.
- * @throws DocumentException
+ * @return A <code>NodeSet</code> containing all sub-folders and
documents directly under
+ * this folder.
* @throws FolderNotFoundException
+ * @throws DocumentException
*/
- NodeSet getAllNodes() throws FolderNotFoundException, DocumentException;
+ NodeSet getAll() throws FolderNotFoundException, DocumentException;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
