cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r481340 - in /cocoon/trunk/blocks/cocoon-portal: cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/ cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/gene...
Date Fri, 01 Dec 2006 19:10:33 GMT
Author: cziegeler
Date: Fri Dec  1 11:10:31 2006
New Revision: 481340

URL: http://svn.apache.org/viewvc?view=rev&rev=481340
Log:
Use PortalException

Modified:
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
    cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManager.java
Fri Dec  1 11:10:31 2006
@@ -18,7 +18,6 @@
 
 import java.util.Properties;
 
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
@@ -50,10 +49,10 @@
     /**
      * Start the first phase of the request handling.
      * In this phase all events are fired and processed.
-     * @throws ProcessingException
+     * @throws PortalException
      */
     void process()
-    throws ProcessingException;
+    throws PortalException;
 
     /**
      * Render the portal.

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
Fri Dec  1 11:10:31 2006
@@ -28,7 +28,6 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.event.Event;
@@ -120,15 +119,13 @@
      * @see org.apache.cocoon.portal.event.EventManager#processEvents()
      */
     public void processEvents()
-    throws ProcessingException {
+    throws PortalException {
         if ( this.configuration != null ) {
             try {
                 this.chain = new AspectChain(EventAspect.class);
                 this.chain.configure(this.manager, this.configuration);
-            } catch (PortalException ce) {
-                throw new ProcessingException("Unable configure component.", ce);
             } catch (ConfigurationException ce) {
-                throw new ProcessingException("Unable configure component.", ce);
+                throw new PortalException("Unable configure component.", ce);
             }
             this.configuration = null;
         }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/generation/PortalGenerator.java
Fri Dec  1 11:10:31 2006
@@ -25,6 +25,7 @@
 import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.generation.ServiceableGenerator;
+import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.PortalManager;
 import org.apache.cocoon.portal.PortalService;
 import org.xml.sax.SAXException;
@@ -72,8 +73,12 @@
         // start the portal rendering
         // 1. event processing
         // 2. rendering
-        PortalManager pm = this.portalService.getPortalManager();
-        pm.process();
+        final PortalManager pm = this.portalService.getPortalManager();
+        try {
+            pm.process();
+        } catch (PortalException pe) {
+            throw new ProcessingException(pe);
+        }
         pm.showPortal(this.xmlConsumer, Parameters.toProperties(this.parameters));
 	}
 

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
Fri Dec  1 11:10:31 2006
@@ -23,7 +23,6 @@
 import org.apache.avalon.framework.configuration.Configurable;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.ajax.AjaxHelper;
 import org.apache.cocoon.environment.ObjectModelHelper;
 import org.apache.cocoon.environment.Request;
@@ -74,7 +73,7 @@
      * @see org.apache.cocoon.portal.PortalManager#process()
      */
     public void process()
-    throws ProcessingException {
+    throws PortalException {
         PortalManagerAspectContextImpl aspectContext =
             new PortalManagerAspectContextImpl(this.portalService, this.chain);
         aspectContext.invokeNext();
@@ -106,7 +105,7 @@
     /**
      * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
      */
-    public void prepare(PortalManagerAspectPrepareContext renderContext) throws ProcessingException
{
+    public void prepare(PortalManagerAspectPrepareContext renderContext) throws PortalException
{
         EventManager eventManager = this.portalService.getEventManager();
         eventManager.processEvents();
     }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CompositeLayout.java
Fri Dec  1 11:10:31 2006
@@ -20,8 +20,6 @@
 import java.util.Iterator;
 import java.util.List;
 
-import org.apache.cocoon.portal.services.LayoutFactory;
-
 /**
  * A composite layout is a layout that contains other layouts.
  *
@@ -36,7 +34,7 @@
     /**
      * Create a new composite layout object.
      * Never create a layout object directly. Use the
-     * {@link LayoutFactory} instead.
+     * {@link org.apache.cocoon.portal.services.LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
      * @param name The name of the layout.
      */

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/CopletLayout.java
Fri Dec  1 11:10:31 2006
@@ -16,8 +16,6 @@
  */
 package org.apache.cocoon.portal.om;
 
-import org.apache.cocoon.portal.services.LayoutFactory;
-
 /**
  * A coplet layout holds a coplet.
  *
@@ -31,7 +29,7 @@
     /**
      * Create a new coplet layout object.
      * Never create a layout object directly. Use the
-     * {@link LayoutFactory} instead.
+     * {@link org.apache.cocoon.portal.services.LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
      * @param name The name of the layout.
      */

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/FrameLayout.java
Fri Dec  1 11:10:31 2006
@@ -16,8 +16,6 @@
  */
 package org.apache.cocoon.portal.om;
 
-import org.apache.cocoon.portal.services.LayoutFactory;
-
 /**
  * A frame layout holds a source URI. The URI can be changed dynamically through
  * events. The URI may contain any URI that can be resolved by the Cocoon 
@@ -35,7 +33,7 @@
     /**
      * Create a new frame layout object.
      * Never create a layout object directly. Use the
-     * {@link LayoutFactory} instead.
+     * {@link org.apache.cocoon.portal.services.LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
      * @param name The name of the layout.
      */

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/om/LinkLayout.java
Fri Dec  1 11:10:31 2006
@@ -16,8 +16,6 @@
  */
 package org.apache.cocoon.portal.om;
 
-import org.apache.cocoon.portal.services.LayoutFactory;
-
 /**
  * A link layout references another layout to be used instead. The reference
  * can be changed at runtime using {@link LayoutInstance}.
@@ -35,7 +33,7 @@
     /**
      * Create a new link layout object.
      * Never create a layout object directly. Use the
-     * {@link LayoutFactory} instead.
+     * {@link org.apache.cocoon.portal.services.LayoutFactory} instead.
      * @param id The unique identifier of the layout object or null.
      * @param name The name of the profile.
      */

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspect.java
Fri Dec  1 11:10:31 2006
@@ -18,7 +18,7 @@
 
 import java.util.Properties;
 
-import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.portal.PortalException;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
@@ -29,7 +29,7 @@
 public interface PortalManagerAspect {
 
     void prepare(PortalManagerAspectPrepareContext context)
-    throws ProcessingException;
+    throws PortalException;
 
     void render(PortalManagerAspectRenderContext context,
                 ContentHandler                   ch,

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/PortalManagerAspectPrepareContext.java
Fri Dec  1 11:10:31 2006
@@ -16,7 +16,7 @@
  */
 package org.apache.cocoon.portal.services.aspects;
 
-import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.portal.PortalException;
 
 /**
  * @since 2.1.8
@@ -29,5 +29,5 @@
      * Invoke next aspect 
      */
     void invokeNext()
-    throws ProcessingException;
+    throws PortalException;
 }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/PreloadPortalManagerAspect.java
Fri Dec  1 11:10:31 2006
@@ -20,7 +20,7 @@
 import java.util.List;
 import java.util.Properties;
 
-import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
 import org.apache.cocoon.portal.om.CopletInstance;
 import org.apache.cocoon.portal.om.CopletInstanceFeatures;
@@ -50,7 +50,7 @@
      * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
      */
     public void prepare(PortalManagerAspectPrepareContext context)
-    throws ProcessingException {
+    throws PortalException {
         // let's just invoke the next
         context.invokeNext();
     }

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/services/aspects/impl/support/PortalManagerAspectContextImpl.java
Fri Dec  1 11:10:31 2006
@@ -18,7 +18,7 @@
 
 import java.util.Properties;
 
-import org.apache.cocoon.ProcessingException;
+import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.PortalService;
 import org.apache.cocoon.portal.services.aspects.PortalManagerAspect;
 import org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext;
@@ -47,7 +47,7 @@
 	 * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext#invokeNext()
 	 */
 	public void invokeNext() 
-    throws ProcessingException {
+    throws PortalException {
         final PortalManagerAspect aspect = (PortalManagerAspect)this.getNext();
         if ( aspect != null ) {
             aspect.prepare(this);

Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?view=diff&rev=481340&r1=481339&r2=481340
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
(original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
Fri Dec  1 11:10:31 2006
@@ -31,9 +31,9 @@
 import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameterizable;
 import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.ProcessingException;
 import org.apache.cocoon.environment.http.HttpEnvironment;
 import org.apache.cocoon.portal.Constants;
+import org.apache.cocoon.portal.PortalException;
 import org.apache.cocoon.portal.coplet.adapter.CopletDecorationProvider;
 import org.apache.cocoon.portal.coplet.adapter.DecorationAction;
 import org.apache.cocoon.portal.coplet.adapter.impl.AbstractCopletAdapter;
@@ -295,7 +295,7 @@
                 //        should try to provide an object
                 portletContainer.init(uniqueContainerName, null, this.portletContainerEnvironment,
properties);
             } catch (PortletContainerException exc) {
-                throw new ProcessingException("Initialization of the portlet container failed.",
exc);
+                throw new PortalException("Initialization of the portlet container failed.",
exc);
             }
         } else {
             this.getLogger().debug("PortletContainer already initialized.");
@@ -365,7 +365,7 @@
      * @see org.apache.cocoon.portal.services.aspects.PortalManagerAspect#prepare(org.apache.cocoon.portal.services.aspects.PortalManagerAspectPrepareContext)
      */
     public void prepare(PortalManagerAspectPrepareContext aspectContext)
-    throws ProcessingException {
+    throws PortalException {
         // process the events
         aspectContext.invokeNext();
 



Mime
View raw message