portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rwat...@apache.org
Subject svn commit: r392042 [2/2] - in /portals/jetspeed-2/trunk: components/page-manager/src/java/JETSPEED-INF/ojb/ components/page-manager/src/java/org/apache/jetspeed/om/folder/impl/ components/page-manager/src/java/org/apache/jetspeed/om/folder/psml/ compo...
Date Thu, 06 Apr 2006 19:13:04 GMT
Modified: portals/jetspeed-2/trunk/components/page-manager/src/test/tx-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/page-manager/src/test/tx-page-manager.xml?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/page-manager/src/test/tx-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/components/page-manager/src/test/tx-page-manager.xml Thu Apr
 6 12:13:00 2006
@@ -44,14 +44,31 @@
         </property>
         <property name="transactionAttributes">
             <props>
-                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
                               								
-                <prop key="deepCopyFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="addPages*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
                               
+                <prop key="*">PROPAGATION_SUPPORTS</prop>
+                <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
             </props>
         </property>
     </bean>
 
+    <!-- Inject Page Manager Proxy into Page Manager -->
+    <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+        <property name="targetObject"><ref bean="securePageManagerImpl"/></property>
+        <property name="targetMethod"><value>setPageManagerProxy</value></property>
+        <property name="arguments">
+            <list>
+                <ref bean="pageManager"/>
+            </list>
+        </property>
+    </bean>
 
 </beans>

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/om/folder/proxy/FolderProxy.java
Thu Apr  6 12:13:00 2006
@@ -37,6 +37,7 @@
 import org.apache.jetspeed.page.document.DocumentNotFoundException;
 import org.apache.jetspeed.page.document.Node;
 import org.apache.jetspeed.page.document.NodeException;
+import org.apache.jetspeed.page.document.NodeNotFoundException;
 import org.apache.jetspeed.page.document.NodeSet;
 import org.apache.jetspeed.page.document.proxy.NodeProxy;
 import org.apache.jetspeed.page.document.proxy.NodeSetImpl;
@@ -298,10 +299,9 @@
      *
      * @param proxy this folder proxy
      * @return list containing sub-folders and documents in folder
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    public NodeSet getAll(Object proxy) throws FolderNotFoundException, DocumentException
+    public NodeSet getAll(Object proxy) throws DocumentException
     {
         // latently aggregate all children
         if (!childrenAggregated)
@@ -329,10 +329,9 @@
      *
      * @param proxy this folder proxy
      * @return list containing all sub-folders in folder
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    public NodeSet getFolders(Object proxy) throws FolderNotFoundException, DocumentException
+    public NodeSet getFolders(Object proxy) throws DocumentException
     {
         // latently subset folders by type from aggregated children
         if (!foldersAggregated)
@@ -681,6 +680,9 @@
                         catch (NodeException ne)
                         {
                         }
+                        catch (NodeNotFoundException nnfe)
+                        {
+                        }
                         catch (SecurityException se)
                         {
                         }
@@ -695,6 +697,9 @@
                             catch (NodeException ne)
                             {
                             }
+                            catch (NodeNotFoundException nnfe)
+                            {
+                            }
                             catch (SecurityException se)
                             {
                             }
@@ -714,6 +719,10 @@
                     {
                         fallbackDefaultPageNotFound = true;
                     }
+                    catch (NodeNotFoundException nnfe)
+                    {
+                        fallbackDefaultPageNotFound = true;
+                    }
                     catch (SecurityException se)
                     {
                         fallbackDefaultPageNotFound = true;
@@ -897,6 +906,9 @@
                     }
                 }
                 catch (NodeException ne)
+                {
+                }
+                catch (NodeNotFoundException ne)
                 {
                 }
                 catch (SecurityException se)

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/impl/PortalSiteSessionContextImpl.java
Thu Apr  6 12:13:00 2006
@@ -495,6 +495,9 @@
                 catch (NodeException ne)
                 {
                 }
+                catch (NodeNotFoundException nnfe)
+                {
+                }
                 catch (SecurityException se)
                 {
                     requestFolder = null;
@@ -579,6 +582,9 @@
                             return requestPage;
                         }
                         catch (NodeException ne)
+                        {
+                        }
+                        catch (NodeNotFoundException nnfe)
                         {
                         }
                         catch (SecurityException se)

Modified: portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
(original)
+++ portals/jetspeed-2/trunk/components/portal-site/src/java/org/apache/jetspeed/portalsite/view/SiteView.java
Thu Apr  6 12:13:00 2006
@@ -168,6 +168,9 @@
                     catch (NodeException ne)
                     {
                     }
+                    catch (NodeNotFoundException nnfe)
+                    {
+                    }
                     catch (SecurityException se)
                     {
                     }
@@ -641,6 +644,12 @@
                 fnfe.initCause(ne);
                 throw fnfe;
             }
+            catch (NodeNotFoundException nnfe)
+            {
+                FolderNotFoundException fnfe = new FolderNotFoundException("Root folder not
found");
+                fnfe.initCause(nnfe);
+                throw fnfe;
+            }
         }
         return rootFolderProxy;
     }
@@ -729,6 +738,12 @@
                         nnfe.initCause(ne);
                         throw nnfe;
                     }
+                    catch (NodeNotFoundException nnfe)
+                    {
+                        NodeNotFoundException nnfeWrapper = new NodeNotFoundException("Specified
path " + path + " not found.");
+                        nnfeWrapper.initCause(nnfe);
+                        throw nnfeWrapper;
+                    }
                 }
             }
             else
@@ -826,7 +841,7 @@
             {
                 currentFolder = getRootFolderProxy();
             }
-            catch (NodeException ne)
+            catch (FolderNotFoundException fnfe)
             {
                 return null;
             }
@@ -928,6 +943,11 @@
                         }
                     }
                     catch (NodeException ne)
+                    {
+                        // could not access sub-folders
+                        return null;
+                    }
+                    catch (NodeNotFoundException nnfe)
                     {
                         // could not access sub-folders
                         return null;

Modified: portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
(original)
+++ portals/jetspeed-2/trunk/components/portal/src/java/org/apache/jetspeed/administration/PortalAdministrationImpl.java
Thu Apr  6 12:13:00 2006
@@ -269,11 +269,7 @@
                              return e1;
                          } catch (NodeException e1){
                              return e1;
-                         } catch (PageNotUpdatedException e1) {
-                             return e1;
-                         } catch (JetspeedException e1) {
-                             return e1;
-                         }                     
+                         }
                     }
                 }, null);
                 

Modified: portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/etc/import/assembly/import-page-manager.xml Thu Apr  6 12:13:00
2006
@@ -44,13 +44,29 @@
         <property name="transactionAttributes">
             <props>
                 <prop key="*">PROPAGATION_SUPPORTS</prop>
-                <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-                <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
                               								
-                <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
                             
-				<prop key="deepCopyFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
			
+                <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+                <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
             </props>
+        </property>
+    </bean>
+
+    <!-- Inject Page Manager Proxy into Page Manager -->
+    <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+        <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+        <property name="targetMethod"><value>setPageManagerProxy</value></property>
+        <property name="arguments">
+            <list>
+                <ref bean="dbPageManager"/>
+            </list>
         </property>
     </bean>
 

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/om/folder/Folder.java
Thu Apr  6 12:13:00 2006
@@ -151,10 +151,9 @@
      *
      * @return A <code>NodeSet</code> containing all sub-folders directly under
      * this folder.
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    NodeSet getFolders() throws FolderNotFoundException, DocumentException;
+    NodeSet getFolders() throws DocumentException;
     
     /**
      * 
@@ -242,10 +241,9 @@
      *
      * @return A <code>NodeSet</code> containing all sub-folders and documents
directly under
      * this folder.
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    NodeSet getAll() throws FolderNotFoundException, DocumentException;
+    NodeSet getAll() throws DocumentException;
 
     /**
      * getMenuDefinitions - get list of menu definitions

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotRemovedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotRemovedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotRemovedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotRemovedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class FolderNotRemovedException extends JetspeedException
+public class FolderNotRemovedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotUpdatedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotUpdatedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotUpdatedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/FolderNotUpdatedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class FolderNotUpdatedException extends JetspeedException
+public class FolderNotUpdatedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotRemovedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotRemovedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotRemovedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotRemovedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class LinkNotRemovedException extends JetspeedException
+public class LinkNotRemovedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotUpdatedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotUpdatedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotUpdatedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/LinkNotUpdatedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class LinkNotUpdatedException extends JetspeedException
+public class LinkNotUpdatedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageManager.java
Thu Apr  6 12:13:00 2006
@@ -18,7 +18,6 @@
 
 import javax.security.auth.Subject;
 
-import org.apache.jetspeed.exception.JetspeedException;
 import org.apache.jetspeed.om.common.SecurityConstraint;
 import org.apache.jetspeed.om.common.SecurityConstraints;
 import org.apache.jetspeed.om.folder.Folder;
@@ -281,7 +280,7 @@
      * @throws PageNotFoundException if the page cannot be found
      * @throws NodeException
      */
-    public Link getLink(String name) throws DocumentNotFoundException, UnsupportedDocumentTypeException,
FolderNotFoundException, NodeException;
+    public Link getLink(String name) throws DocumentNotFoundException, UnsupportedDocumentTypeException,
NodeException;
 
     /**
      * <p>
@@ -291,11 +290,10 @@
      * Returns the PageSecurity document
      *
      * @throws DocumentNotFoundException if the document cannot be found
-     * @throws FolderNotFoundException if a folder cannot be found
      * @throws UnsupportedDocumentTypeException
      * @throws NodeException
      */
-    public PageSecurity getPageSecurity() throws DocumentNotFoundException, UnsupportedDocumentTypeException,
FolderNotFoundException, NodeException;
+    public PageSecurity getPageSecurity() throws DocumentNotFoundException, UnsupportedDocumentTypeException,
NodeException;
     
     /**
      * <p>
@@ -326,10 +324,9 @@
      * @param folder The parent folder.
      * @return A <code>NodeSet</code> containing all sub-folders
      *         directly under this folder.
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    public NodeSet getFolders(Folder folder) throws FolderNotFoundException, DocumentException;
+    public NodeSet getFolders(Folder folder) throws DocumentException;
 
     /**
      * <p>
@@ -455,66 +452,65 @@
      * @param folder The parent folder.
      * @return A <code>NodeSet</code> containing all sub-folders
      *         and documents directly under this folder.
-     * @throws FolderNotFoundException
      * @throws DocumentException
      */
-    public NodeSet getAll(Folder folder) throws FolderNotFoundException, DocumentException;
+    public NodeSet getAll(Folder folder) throws DocumentException;
 
     /** Update a page in persistent storage
      *
      * @param page The page to be updated.
      */
-    public void updatePage(Page page) throws JetspeedException, PageNotUpdatedException;
+    public void updatePage(Page page) throws NodeException, PageNotUpdatedException;
 
     /** Remove a document.
      *
      * @param page The page to be removed.
      */
-    public void removePage(Page page) throws JetspeedException, PageNotRemovedException;
+    public void removePage(Page page) throws NodeException, PageNotRemovedException;
 
     /** Update a folder and all child folders
      *  and documents in persistent storage
      *
      * @param folder The folder to be updated.
      */
-    public void updateFolder(Folder folder) throws JetspeedException, FolderNotUpdatedException;
+    public void updateFolder(Folder folder) throws NodeException, FolderNotUpdatedException;
 
     /** Update a folder in persistent storage
      *
      * @param folder The folder to be updated.
      * @param deep Flag to control recursive deep updates.
      */
-    public void updateFolder(Folder folder, boolean deep) throws JetspeedException, FolderNotUpdatedException;
+    public void updateFolder(Folder folder, boolean deep) throws NodeException, FolderNotUpdatedException;
 
     /** Remove a folder.
      *
      * @param page The folder to be removed.
      */
-    public void removeFolder(Folder folder) throws JetspeedException, FolderNotRemovedException;
+    public void removeFolder(Folder folder) throws NodeException, FolderNotRemovedException;
 
     /** Update a link in persistent storage
      *
      * @param link The link to be updated.
      */
-    public void updateLink(Link link) throws JetspeedException, LinkNotUpdatedException;
+    public void updateLink(Link link) throws NodeException, LinkNotUpdatedException;
 
     /** Remove a link.
      *
      * @param link The link to be removed.
      */
-    public void removeLink(Link link) throws JetspeedException, LinkNotRemovedException;
+    public void removeLink(Link link) throws NodeException, LinkNotRemovedException;
 
     /** Update a page security document in persistent storage
      *
      * @param pageSecurity The document to be updated.
      */
-    public void updatePageSecurity(PageSecurity pageSecurity) throws JetspeedException, FailedToUpdateDocumentException;
+    public void updatePageSecurity(PageSecurity pageSecurity) throws NodeException, FailedToUpdateDocumentException;
 
     /** Remove a page security document.
      *
      * @param pageSecurity The document to be removed.
      */
-    public void removePageSecurity(PageSecurity pageSecurity) throws JetspeedException, FailedToDeleteDocumentException;
+    public void removePageSecurity(PageSecurity pageSecurity) throws NodeException, FailedToDeleteDocumentException;
 
     /**
      * addListener - add page manager event listener
@@ -545,7 +541,7 @@
      * @return a new Page object copied from the source, with new fragment ids
      */
     public Page copyPage(Page source, String path) 
-        throws JetspeedException, PageNotUpdatedException;
+        throws NodeException;
 
     /** 
      * Copy the source link creating and returning a new copy of the link  
@@ -555,7 +551,7 @@
      * @return a new Link object copied from the source
      */
     public Link copyLink(Link source, String path) 
-        throws JetspeedException, LinkNotUpdatedException;
+        throws NodeException;
 
     /** 
      * Copy the source folder creating and returning a new copy of the folder  
@@ -567,7 +563,7 @@
      * @return a new Folder object copied from the source, with new subobject ids
      */
     public Folder copyFolder(Folder source, String path) 
-        throws JetspeedException, PageNotUpdatedException;
+        throws NodeException;
 
     /** 
      * Copy the source fragment creating and returning a new copy of the fragment  
@@ -579,7 +575,7 @@
      * @return a new Fragment object copied from the source
      */
     public Fragment copyFragment(Fragment source, String name) 
-        throws JetspeedException, PageNotUpdatedException;
+        throws NodeException;
 
     /**
      * Copy the source page security (both global constraints and constraint references)
@@ -587,10 +583,10 @@
      *  
      * @param source The source PageSecurity definitions
      * @return the new page security object
-     * @throws JetspeedException
+     * @throws NodeException
      */
     public PageSecurity copyPageSecurity(PageSecurity source) 
-        throws JetspeedException;
+        throws NodeException;
         
     /**
      * Deep copy a folder. Copies a folder and all subcontents including
@@ -601,7 +597,7 @@
      * @param owner set owner of the new folder(s), or null for no owner
      */
     public void deepCopyFolder(Folder srcFolder, String destinationPath, String owner)
-    throws JetspeedException, PageNotUpdatedException;
+        throws NodeException;
 
     /**
      * Retrieve a page for the given user name and page name
@@ -676,14 +672,14 @@
      * @param subject The full user Java Security subject.
      */
     public void createUserHomePagesFromRoles(Subject subject)
-    throws JetspeedException;
+    throws NodeException;
     
     /**
      * 
      * @param pages
      * @return
-     * @throws JetspeedException
+     * @throws NodeException
      */
     public int addPages(Page[] pages)
-    throws JetspeedException;
+    throws NodeException;
 }

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotRemovedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotRemovedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotRemovedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotRemovedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class PageNotRemovedException extends JetspeedException
+public class PageNotRemovedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotUpdatedException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotUpdatedException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotUpdatedException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/PageNotUpdatedException.java
Thu Apr  6 12:13:00 2006
@@ -15,7 +15,7 @@
  */
 package org.apache.jetspeed.page;
 
-import org.apache.jetspeed.exception.JetspeedException;
+import org.apache.jetspeed.page.document.NodeException;
 
 /**
  * <p>
@@ -26,7 +26,7 @@
  * @version $Id$
  *
  */
-public class PageNotUpdatedException extends JetspeedException
+public class PageNotUpdatedException extends NodeException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeException.java
Thu Apr  6 12:13:00 2006
@@ -13,7 +13,9 @@
  * NodeException
  * </p>
  * <p>
- *
+ * Note that these exceptions are assumed to be "unexpected" and/or
+ * fatal; use NodeNotFoundException or other exceptions derived from
+ * the base JetspeedException for "informational" exceptions.
  * </p>
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
  * @version $Id$

Modified: portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeNotFoundException.java
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeNotFoundException.java?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeNotFoundException.java
(original)
+++ portals/jetspeed-2/trunk/jetspeed-api/src/java/org/apache/jetspeed/page/document/NodeNotFoundException.java
Thu Apr  6 12:13:00 2006
@@ -15,18 +15,21 @@
  */
 package org.apache.jetspeed.page.document;
 
+import org.apache.jetspeed.exception.JetspeedException;
+
 /**
  * <p>
  * NodeNotFoundException
  * </p>
  * <p>
- *
+ * Note that these "informational" exceptions must not derive from
+ * NodeException and instead derive from only the base JetspeedException.
  * </p>
  * @author <a href="mailto:weaver@apache.org">Scott T. Weaver</a>
  * @version $Id$
  *
  */
-public class NodeNotFoundException extends NodeException
+public class NodeNotFoundException extends JetspeedException
 {
 
     /**

Modified: portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml
URL: http://svn.apache.org/viewcvs/portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml?rev=392042&r1=392041&r2=392042&view=diff
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml (original)
+++ portals/jetspeed-2/trunk/src/webapp/WEB-INF/assembly/alternate/db-page-manager.xml Thu
Apr  6 12:13:00 2006
@@ -46,13 +46,29 @@
       <property name="transactionAttributes">
           <props>
               <prop key="*">PROPAGATION_SUPPORTS</prop>
-              <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-              <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-              <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
-              <prop key="addPages">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
             
-              <prop key="deepCopyFolder*">PROPAGATION_REQUIRED,-org.apache.jetspeed.exception.JetspeedException</prop>
+              <prop key="get*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="update*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="remove*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="create*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="deepCopy*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="add*">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="folderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="pageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="linkExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userFolderExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
+              <prop key="userPageExists">PROPAGATION_REQUIRED,-org.apache.jetspeed.page.document.NodeException</prop>
           </props>
+      </property>
+  </bean>
+
+  <!-- Inject Page Manager Proxy into Page Manager -->
+  <bean id="injectPageManagerProxy" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+      <property name="targetObject"><ref bean="pageManagerImpl"/></property>
+      <property name="targetMethod"><value>setPageManagerProxy</value></property>
+      <property name="arguments">
+          <list>
+              <ref bean="pageManager"/>
+          </list>
       </property>
   </bean>
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org


Mime
View raw message