weaver 2004/09/09 12:03:03
Modified: jetspeed-api/src/java/org/apache/jetspeed/om/folder
FolderMetaData.java
components/page-manager/src/java/org/apache/jetspeed/om/folder/impl
FolderMetaDataImpl.java FolderImpl.java
components/page-manager/src/java/META-INF page-mapping.xml
components/page-manager/testdata/pages/folder1/folder3
folder.metadata
Log:
Added metadata support for folder default pages
Revision Changes Path
1.3 +5 -1
jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java
Index: FolderMetaData.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/jetspeed-api/src/java/org/apache/jetspeed/om/folder/FolderMetaData.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FolderMetaData.java 3 Sep 2004 13:24:05 -0000 1.2
+++ FolderMetaData.java 9 Sep 2004 19:03:03 -0000 1.3
@@ -37,5 +37,9 @@
Vector getDocumentOrder();
void setDocumentOrder(Vector docIndexes);
+
+ String getDefaultPage();
+
+ void setDefaultPage(String defaultPage);
}
1.4 +16 -1
jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java
Index: FolderMetaDataImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/FolderMetaDataImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- FolderMetaDataImpl.java 3 Sep 2004 13:22:06 -0000 1.3
+++ FolderMetaDataImpl.java 9 Sep 2004 19:03:03 -0000 1.4
@@ -35,6 +35,7 @@
public class FolderMetaDataImpl extends AbstractNode implements FolderMetaData
{
private Vector docOrder;
+ private String defaultPage;
public FolderMetaDataImpl()
{
@@ -91,5 +92,19 @@
{
docOrder = docIndexes;
+ }
+ /**
+ * @return Returns the defaultPage.
+ */
+ public String getDefaultPage()
+ {
+ return defaultPage;
+ }
+ /**
+ * @param defaultPage The defaultPage to set.
+ */
+ public void setDefaultPage( String defaultPage )
+ {
+ this.defaultPage = defaultPage;
}
}
1.13 +12 -8
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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- FolderImpl.java 8 Sep 2004 20:48:06 -0000 1.12
+++ FolderImpl.java 9 Sep 2004 19:03:03 -0000 1.13
@@ -48,9 +48,8 @@
*/
public class FolderImpl extends AbstractNode implements Folder
{
-
- //TODO: need to grab this from metadata...once we have metadata
- private String defaultPage = "default-page.psml";
+
+ private static final String FALLBACK_DEFAULT_PAGE = "default-page.psml";
private String defaultTheme;
private NodeSet allNodes;
private File directory;
@@ -90,9 +89,14 @@
public String getDefaultPage()
{
try
- {
- getPage(defaultPage);
- return defaultPage;
+ {
+ String defaultPage = metadata.getDefaultPage();
+ if(defaultPage == null)
+ {
+ defaultPage = FALLBACK_DEFAULT_PAGE;
+ }
+ ;
+ return getPage(defaultPage).getName();
}
catch (NodeException e)
{
@@ -115,7 +119,7 @@
*/
public void setDefaultPage( String defaultPage )
{
- this.defaultPage = defaultPage;
+ metadata.setDefaultPage(defaultPage);
}
/*
1.5 +4 -0
jakarta-jetspeed-2/components/page-manager/src/java/META-INF/page-mapping.xml
Index: page-mapping.xml
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/META-INF/page-mapping.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- page-mapping.xml 8 Sep 2004 20:48:06 -0000 1.4
+++ page-mapping.xml 9 Sep 2004 19:03:03 -0000 1.5
@@ -142,6 +142,10 @@
<field name="title" type="java.lang.String">
<bind-xml name="title"/>
</field>
+
+ <field name="defaultPage" type="java.lang.String">
+ <bind-xml name="defaultPage"/>
+ </field>
<field name="documentOrder"
type="java.lang.String"
1.3 +3 -2
jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/folder.metadata
Index: folder.metadata
===================================================================
RCS file:
/home/cvs/jakarta-jetspeed-2/components/page-manager/testdata/pages/folder1/folder3/folder.metadata,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- folder.metadata 8 Sep 2004 20:48:06 -0000 1.2
+++ folder.metadata 9 Sep 2004 19:03:03 -0000 1.3
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
-<folder hidden="true">
- <title >Folder 3</title>
+<folder hidden="true">
+ <title >Folder 3</title>
+ <defaultPage>test001.psml</defaultPage>
<documentOrder>Jetspeed2Wiki.link</documentOrder>
<documentOrder>Jetspeed2.link</documentOrder>
<documentOrder>apache_portals.link</documentOrder>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
