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 rw...@apache.org on 2005/05/24 01:55:21 UTC
cvs commit: jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/page/impl CastorXmlPageManager.java DatabasePageManager.java
rwatler 2005/05/23 16:55:21
Modified: components/page-manager/src/java/org/apache/jetspeed/om/page/psml
ContentPageImpl.java
components/page-manager/src/java/org/apache/jetspeed/page/impl
CastorXmlPageManager.java DatabasePageManager.java
Log:
unwrap ContentPage instances for PageManager register, update, and remove operations
Revision Changes Path
1.3 +9 -1 jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java
Index: ContentPageImpl.java
===================================================================
RCS file: /home/cvs/jakarta-jetspeed-2/components/page-manager/src/java/org/apache/jetspeed/om/page/psml/ContentPageImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ContentPageImpl.java 29 Apr 2005 23:24:56 -0000 1.2
+++ ContentPageImpl.java 23 May 2005 23:55:21 -0000 1.3
@@ -348,5 +348,13 @@
page.setTitle(title);
}
-
+ /**
+ * getPage - access wrapped page
+ *
+ * @return wrapped page
+ */
+ public Page getPage()
+ {
+ return page;
+ }
}
1.28 +19 -1 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.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- CastorXmlPageManager.java 29 Apr 2005 13:58:35 -0000 1.27
+++ CastorXmlPageManager.java 23 May 2005 23:55:21 -0000 1.28
@@ -1600,6 +1600,12 @@
*/
public void registerPage(Page page) throws JetspeedException
{
+ // unwrap page to be registered
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
// make sure path and related members are set
if ((page.getPath() == null) && (page.getId() != null))
{
@@ -1654,6 +1660,12 @@
*/
public void updatePage(Page page) throws JetspeedException
{
+ // unwrap page to be updated
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
registerPage(page);
}
@@ -1666,6 +1678,12 @@
*/
public void removePage(Page page) throws JetspeedException
{
+ // unwrap page to be removed
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
// check for edit access
page.checkAccess(SecuredResource.EDIT_ACTION);
1.13 +22 -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.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- DatabasePageManager.java 29 Apr 2005 13:58:35 -0000 1.12
+++ DatabasePageManager.java 23 May 2005 23:55:21 -0000 1.13
@@ -162,6 +162,13 @@
return;
}
+ // unwrap page to be registered
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
+ // register page
String id = page.getId();
if (id == null)
@@ -180,6 +187,13 @@
*/
public void updatePage( Page page ) throws JetspeedException, PageNotUpdatedException
{
+ // unwrap page to be updated
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
+ // update page
try
{
persistenceStore.getTransaction().begin();
@@ -201,6 +215,13 @@
*/
public void removePage( Page page ) throws PageNotRemovedException
{
+ // unwrap page to be removed
+ if (page instanceof ContentPageImpl)
+ {
+ page = ((ContentPageImpl)page).getPage();
+ }
+
+ // remove page
if (pageCache.containsKey(page.getId()))
{
pageCache.remove(pageCache.get(page.getId()));
---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org