cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r365578 [1/2] - in /cocoon/blocks: portal-sample/trunk/samples/conf/ portal-sample/trunk/samples/resources/ portal/trunk/java/org/apache/cocoon/portal/ portal/trunk/java/org/apache/cocoon/portal/acting/ portal/trunk/java/org/apache/cocoon/p...
Date Tue, 03 Jan 2006 08:35:52 GMT
Author: cziegeler
Date: Tue Jan  3 00:34:59 2006
New Revision: 365578

URL: http://svn.apache.org/viewcvs?rev=365578&view=rev
Log:
Fix NPE in window aspect, simplify component handling

Removed:
    cocoon/blocks/portal-sample/trunk/samples/resources/login.xml
Modified:
    cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalComponentManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalService.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/BookmarkAction.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/CopletSetDataAction.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/SaveAction.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/LayoutMapping.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutChangeParameterEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/user/UserEventUtil.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/PortalGenerator.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PageLabelManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/reading/ProxyReader.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/CopletSourceFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSource.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSourceFactory.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/NewEventLinkTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/ProxyTransformer.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/adapter/WSRPPortletWindowAspect.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/PortletDriverImpl.java
    cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/wsrp/consumer/URLGeneratorImpl.java

Modified: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf Tue Jan  3 00:34:59 2006
@@ -23,11 +23,12 @@
       |                       THIS IS A SAMPLE PORTAL
       |
       | It demonstrates several features of the portal engine,
-      | so it's not neither configured for *your* environment nor
+      | so it's neither configured for *your* environment nor
       | optimized for production. If you use the portal for your
       | own projects make sure that you remove all unused stuff
       | from the configuration and that you configure the remaining
-      | components properly.
+      | components properly. However, the best way is to start your
+      | portal project from scratch!
       +-->
 
   <!-- Include portal roles -->

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalComponentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalComponentManager.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalComponentManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalComponentManager.java Tue Jan  3 00:34:59 2006
@@ -25,14 +25,11 @@
 import org.apache.cocoon.portal.profile.ProfileManager;
 
 /**
- * This component provides access to all other components used
- * throughout the portal.
- * Any component in the portal should never lookup these components
- * itself, but use this component manager instead.
- *
- * This manager allows to run differently configured portals in Cocoon
- * at the same time. This component can't be looked up using the
- * usual Avalon mechanisms, it has to be get by the {@link PortalService}.
+ * This component provides access to the most important portal components
+ * like the link service, all renderers etc.
+ * These components should never be looked up directly using the Cocoon
+ * mechanisms (ServiceManager) - always use the PortalComponentManager
+ * and the {@link PortalService}. 
  *
  * @version $Id$
  */
@@ -82,6 +79,7 @@
     /**
      * Return the component context.
      * @since 2.1.8
+     * @deprecated Use the core object instead.
      */
     Context getComponentContext();
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalService.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalService.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalService.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/PortalService.java Tue Jan  3 00:34:59 2006
@@ -22,13 +22,13 @@
 /**
  * This is the central component in the portal. It holds the configuration
  * of the portal, the current name etc.
- * The main use of this component is to get the {@link PortalComponentManager}
- * to get all the other portal components.
+ * The main use of this component is to get other components of the portal,
+ * like the link service or the event manager.
  * This component is a singleton.
  *
  * @version $Id$
  */
-public interface PortalService {
+public interface PortalService extends PortalComponentManager {
 
     /** The role to lookup this component. */
     String ROLE = PortalService.class.getName();
@@ -95,7 +95,8 @@
     Iterator getTemporaryAttributeNames();
 
     /**
-     * Return the component manager for the current portal
+     * Return the component manager for the current portal.
+     * @deprecated Starting with 2.2, this service extends the PortalComponentManager.
      */
     PortalComponentManager getComponentManager();
 
@@ -120,7 +121,29 @@
      */
     Map getObjectModel();
 
+    /**
+     * Get a configuration value.
+     * @param key The key for the configuration.
+     * @return The value of the configuration or null.
+     * @since 2.2
+     */
     String getConfiguration(String key);
+
+    /**
+     * Get a configuration value.
+     * @param key The key for the configuration.
+     * @param defaultValue The default value if no configuration for the key is available.
+     * @return The value of the configuration or the default value.
+     * @since 2.2
+     */
     String getConfiguration(String key, String defaultValue);
+
+    /**
+     * Get a configuration value as a boolean.
+     * @param key The key for the configuration.
+     * @param defaultValue The default value if no configuration for the key is available.
+     * @return The value of the configuration or the default value.
+     * @since 2.2
+     */
     boolean getConfigurationAsBoolean(String key, boolean defaultValue);
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/BookmarkAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/BookmarkAction.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/BookmarkAction.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/BookmarkAction.java Tue Jan  3 00:34:59 2006
@@ -187,7 +187,7 @@
         }
 
         Map result;
-        this.portalService.getComponentManager().getPortalManager().process();
+        this.portalService.getPortalManager().process();
 
         final Request request = ObjectModelHelper.getRequest(objectModel);
         final Session session = request.getSession(false);
@@ -223,7 +223,7 @@
                 events.add(m.getEvent(this.portalService, value));
             }                
         }
-        String uri = this.portalService.getComponentManager().getLinkService().getLinkURI(events);
+        String uri = this.portalService.getLinkService().getLinkURI(events);
         result = new HashMap();
         result.put("uri", uri.substring(uri.indexOf('?')+1));
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/CopletSetDataAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/CopletSetDataAction.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/CopletSetDataAction.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/CopletSetDataAction.java Tue Jan  3 00:34:59 2006
@@ -59,12 +59,12 @@
         // if the value is null or empty, the value is not set!
         final String[] names = parameters.getNames();
         if ( names != null ) {
-            final EventManager publisher = this.portalService.getComponentManager().getEventManager();
+            final EventManager publisher = this.portalService.getEventManager();
             for(int i=0; i<names.length; i++) {
                 final String path = names[i];
                 final String value = parameters.getParameter(path, null );
                 if ( value != null && value.trim().length() > 0 ) {
-                    final Event event = new CopletJXPathEvent(this.portalService.getComponentManager().getProfileManager().getCopletInstanceData(copletId),
+                    final Event event = new CopletJXPathEvent(this.portalService.getProfileManager().getCopletInstanceData(copletId),
                             path,
                             value);
                     publisher.send(event);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/SaveAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/SaveAction.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/SaveAction.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/SaveAction.java Tue Jan  3 00:34:59 2006
@@ -42,7 +42,7 @@
             this.getLogger().debug("Portal Save Action called.");
         }
 
-        this.portalService.getComponentManager().getProfileManager().saveUserProfiles(null);
+        this.portalService.getProfileManager().saveUserProfiles(null);
         return EMPTY_MAP;
     }
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/CopletMapping.java Tue Jan  3 00:34:59 2006
@@ -34,7 +34,7 @@
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
     public Event getEvent(PortalService service, Object data) {
-        CopletInstanceData cid = service.getComponentManager().getProfileManager().getCopletInstanceData(this.copletId);
+        CopletInstanceData cid = service.getProfileManager().getCopletInstanceData(this.copletId);
         Event e = new CopletJXPathEvent(cid, this.path, data);
         return e;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/FullScreenMapping.java Tue Jan  3 00:34:59 2006
@@ -35,7 +35,7 @@
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
     public Event getEvent(PortalService service, Object data) {
-        final ProfileManager manager = service.getComponentManager().getProfileManager();
+        final ProfileManager manager = service.getProfileManager();
         final CopletInstanceData cid = manager.getCopletInstanceData(this.copletId);
         //final Layout layout = manager.getPortalLayout(null, layoutId) ;
         

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/LayoutMapping.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/LayoutMapping.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/LayoutMapping.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/acting/helpers/LayoutMapping.java Tue Jan  3 00:34:59 2006
@@ -34,7 +34,7 @@
      * @see org.apache.cocoon.portal.acting.helpers.Mapping#getEvent(org.apache.cocoon.portal.PortalService, java.lang.Object)
      */
     public Event getEvent(PortalService service, Object data) {
-        Layout layout = service.getComponentManager().getProfileManager().getPortalLayout(null, this.layoutId);
+        Layout layout = service.getProfileManager().getPortalLayout(null, this.layoutId);
         Event e = new LayoutJXPathEvent(layout, this.path, data);
         return e;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/CopletModule.java Tue Jan  3 00:34:59 2006
@@ -78,7 +78,7 @@
         if ( name.equals("#") ) {
             return copletId;
         }
-        JXPathContext jxpathContext = JXPathContext.newContext(portalService.getComponentManager().getProfileManager().getCopletInstanceData(copletId));
+        JXPathContext jxpathContext = JXPathContext.newContext(portalService.getProfileManager().getCopletInstanceData(copletId));
         return jxpathContext.getValue(name);
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/LayoutModule.java Tue Jan  3 00:34:59 2006
@@ -54,7 +54,7 @@
         }
 
         // get the layout
-        final Object layout = portalService.getComponentManager().getProfileManager().getPortalLayout(layoutKey, layoutId);
+        final Object layout = portalService.getProfileManager().getPortalLayout(layoutKey, layoutId);
         Object value = layout;
         if ( layout != null && path != null ) {
             final JXPathContext jxpathContext = JXPathContext.newContext(layout);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/components/modules/input/SkinModule.java Tue Jan  3 00:34:59 2006
@@ -76,7 +76,7 @@
             // the skin is stored as a parameter on the root layout
             // if not, the global module is used
             // fallback is: common
-            final Layout rootLayout = this.portalService.getComponentManager().getProfileManager().getPortalLayout(null, null);
+            final Layout rootLayout = this.portalService.getProfileManager().getPortalLayout(null, null);
             if ( rootLayout != null ) {
                 skinName = rootLayout.getParameter("skin");
             }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/adapter/impl/ApplicationCopletAdapter.java Tue Jan  3 00:34:59 2006
@@ -80,7 +80,7 @@
                 boolean hasParams = (uri.toString().indexOf("?") != -1);
                 
                 // append parameters - if any
-                LinkService linkService = this.portalService.getComponentManager().getLinkService();
+                LinkService linkService = this.portalService.getLinkService();
                 final Map objectModel = ContextHelper.getObjectModel(this.context);
                 final Request r = ObjectModelHelper.getRequest(objectModel);
                 final Enumeration params = r.getParameterNames();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/coplet/impl/DefaultCopletFactory.java Tue Jan  3 00:34:59 2006
@@ -61,12 +61,12 @@
 
         // now lookup the adapter
         final String adapterName = copletData.getCopletBaseData().getCopletAdapterName();
-        final CopletAdapter adapter = this.portalService.getComponentManager().getCopletAdapter(adapterName);
+        final CopletAdapter adapter = this.portalService.getCopletAdapter(adapterName);
         adapter.init( instance );
         adapter.login( instance );
 
         // send an event
-        this.portalService.getComponentManager().getEventManager().send(new CopletInstanceDataAddedEvent(instance));
+        this.portalService.getEventManager().send(new CopletInstanceDataAddedEvent(instance));
         return instance;
     }
 
@@ -77,12 +77,12 @@
         if ( copletInstanceData != null ) {
             // now lookup the adapter
             final String adapterName = copletInstanceData.getCopletData().getCopletBaseData().getCopletAdapterName();
-            final CopletAdapter adapter = this.portalService.getComponentManager().getCopletAdapter(adapterName);
+            final CopletAdapter adapter = this.portalService.getCopletAdapter(adapterName);
             adapter.logout( copletInstanceData );
             adapter.destroy( copletInstanceData );
 
             // send an event
-            this.portalService.getComponentManager().getEventManager().send(new CopletInstanceDataRemovedEvent(copletInstanceData));
+            this.portalService.getEventManager().send(new CopletInstanceDataRemovedEvent(copletInstanceData));
         }
     }
 
@@ -101,7 +101,7 @@
         instance.setCopletBaseData(copletBaseData);
 
         // send an event
-        this.portalService.getComponentManager().getEventManager().send(new CopletDataAddedEvent(instance));
+        this.portalService.getEventManager().send(new CopletDataAddedEvent(instance));
 
         return instance;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/deployment/impl/DefaultDeploymentManager.java Tue Jan  3 00:34:59 2006
@@ -223,7 +223,7 @@
         DeploymentEvent event = null;
         try {
             event = new DeploymentEventImpl(deploymentObject);
-            this.portalService.getComponentManager().getEventManager().send(event);
+            this.portalService.getEventManager().send(event);
         } finally {
             if ( deploymentObject != null ) {
                 try {
@@ -242,7 +242,7 @@
     throws DeploymentException {
         UndeploymentEvent event = null;
         event = new UndeploymentEventImpl(uri);
-        this.portalService.getComponentManager().getEventManager().send(event);
+        this.portalService.getEventManager().send(event);
 
         return event;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java Tue Jan  3 00:34:59 2006
@@ -68,7 +68,7 @@
      * @param values The values contained in the request
      */
     protected void publish( PortalService service, EventManager publisher, String[] values) {
-        Layout layout = service.getComponentManager().getProfileManager().getPortalLayout(values[0], values[1] );
+        Layout layout = service.getProfileManager().getPortalLayout(values[0], values[1] );
         if ( layout != null ) {
             this.publish( publisher, layout, values);
         }
@@ -81,7 +81,7 @@
         final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
         String[] values = request.getParameterValues(this.getRequestParameterName());
         if (values != null) {
-            final EventManager publisher = service.getComponentManager().getEventManager();
+            final EventManager publisher = service.getEventManager();
             for (int i = 0; i < values.length; i++) {
                 // first try to make an event out of the value of the parameter
                 final String value = values[i];

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java Tue Jan  3 00:34:59 2006
@@ -83,7 +83,7 @@
                 context.invokeNext( service );
             }
         }
-        service.getComponentManager().getLinkService().addUniqueParameterToLink( requestParameterName, String.valueOf(actionCount));
+        service.getLinkService().addUniqueParameterToLink( requestParameterName, String.valueOf(actionCount));
 
         final Response response = ObjectModelHelper.getResponse( context.getObjectModel() );
         response.setHeader("Cache-Control", "no-cache");

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java Tue Jan  3 00:34:59 2006
@@ -73,7 +73,7 @@
 	 */
 	public void process(EventAspectContext context, PortalService service) {
         if (this.labelManager != null) {
-            final EventManager publisher = service.getComponentManager().getEventManager();
+            final EventManager publisher = service.getEventManager();
             final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
             final String parameterName = this.labelManager.getRequestParameterName();
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Tue Jan  3 00:34:59 2006
@@ -43,7 +43,7 @@
                            Request            request, 
                            String             parameterName) {
         String[] values = request.getParameterValues( parameterName );
-        final EventManager publisher = service.getComponentManager().getEventManager();
+        final EventManager publisher = service.getEventManager();
         if ( values != null ) {
             for(int i=0; i<values.length; i++) {
                 final String current = values[i];

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/coplet/CopletInstanceSizingEvent.java Tue Jan  3 00:34:59 2006
@@ -43,7 +43,7 @@
         }
         final String cid = eventData.substring(0, pos);
         this.size = new Integer(eventData.substring(pos+1)).intValue();
-        this.target = service.getComponentManager().getProfileManager().getCopletInstanceData(cid);
+        this.target = service.getProfileManager().getCopletInstanceData(cid);
     }
 
     public CopletInstanceSizingEvent(CopletInstanceData target, int size) {

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/impl/InternalEventReceiver.java Tue Jan  3 00:34:59 2006
@@ -84,7 +84,7 @@
      */
     public void inform(CopletInstanceSizingEvent event, PortalService service) {
         final CopletInstanceData cid = (CopletInstanceData)event.getTarget();
-        Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+        Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
         if ( cid != null ) {
             final int oldSize = cid.getSize();
             cid.setSize(event.getSize());
@@ -128,10 +128,10 @@
         CopletInstanceData cid = (CopletInstanceData)e.getTarget();
         // full screen?
         if ( cid.getSize() == CopletInstanceData.SIZE_FULLSCREEN ) {
-            Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+            Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
             LayoutFeatures.setFullScreenInfo(rootLayout, null);
         } else if ( cid.getSize() == CopletInstanceData.SIZE_MAXIMIZED ) {
-            Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+            Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
             CopletLayout layout = CopletInstanceDataFeatures.searchLayout(cid.getId(), rootLayout);
             Item container = LayoutFeatures.searchItemForMaximizedCoplet(layout);
             if ( container != null ) {
@@ -147,11 +147,11 @@
         CopletData data = (CopletData)e.getTarget();
         List instances = null;
 
-        ProfileManager profileManager = service.getComponentManager().getProfileManager();
+        ProfileManager profileManager = service.getProfileManager();
         instances = profileManager.getCopletInstanceData(data);
 
         if ( instances != null && e instanceof ChangeCopletsJXPathEvent ) {
-            EventManager eventManager = service.getComponentManager().getEventManager();
+            EventManager eventManager = service.getEventManager();
             final String path = ((ChangeCopletsJXPathEvent)e).getPath();
             final Object value = ((ChangeCopletsJXPathEvent)e).getValue();
   

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutChangeParameterEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutChangeParameterEvent.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutChangeParameterEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutChangeParameterEvent.java Tue Jan  3 00:34:59 2006
@@ -52,7 +52,7 @@
         this.temporary = (eventData.charAt(pos+1) == 'T');
         this.parameterName = eventData.substring(pos+2, pos2);
         this.value= eventData.substring(pos2+1);
-        this.target = service.getComponentManager().getProfileManager().getPortalLayout(null, layoutId);
+        this.target = service.getProfileManager().getPortalLayout(null, layoutId);
     }
 
     /**

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/layout/LayoutRemoveEvent.java Tue Jan  3 00:34:59 2006
@@ -43,9 +43,9 @@
     public LayoutRemoveEvent(PortalService service, String eventData) {
         super(null);
         if ( eventData.charAt(0) == 'L' ) {
-            this.target = service.getComponentManager().getProfileManager().getPortalLayout(null, eventData.substring(1));
+            this.target = service.getProfileManager().getPortalLayout(null, eventData.substring(1));
         } else if ( eventData.charAt(0) == 'C' ) {
-            final Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+            final Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
             this.target = CopletInstanceDataFeatures.searchLayout(eventData.substring(1), rootLayout);            
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/user/UserEventUtil.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/user/UserEventUtil.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/user/UserEventUtil.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/event/user/UserEventUtil.java Tue Jan  3 00:34:59 2006
@@ -34,18 +34,18 @@
     public static void sendUserDidLoginEvent(PortalService service,
                                              PortalUser    user) {
         final Event event = new UserDidLoginEvent(user);
-        service.getComponentManager().getEventManager().send(event);
+        service.getEventManager().send(event);
     }
 
     public static void sendUserWillLogoutEvent(PortalService service,
                                                PortalUser    user) {
         final Event event = new UserWillLogoutEvent(user);
-        service.getComponentManager().getEventManager().send(event);
+        service.getEventManager().send(event);
     }
 
     public static void sendUserIsAccessingEvent(PortalService service,
                                                 PortalUser    user) {
         final Event event = new UserIsAccessingEvent(user);
-        service.getComponentManager().getEventManager().send(event);
+        service.getEventManager().send(event);
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/AbstractCopletGenerator.java Tue Jan  3 00:34:59 2006
@@ -110,7 +110,7 @@
             throw new SAXException("copletId must be passed as parameter or in the object model within the parent context.");
         }
 
-        CopletInstanceData object = this.getPortalService().getComponentManager().getProfileManager().getCopletInstanceData( copletId );
+        CopletInstanceData object = this.getPortalService().getProfileManager().getCopletInstanceData( copletId );
 
         return object;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/PortalGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/PortalGenerator.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/PortalGenerator.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/generation/PortalGenerator.java Tue Jan  3 00:34:59 2006
@@ -71,7 +71,7 @@
         // start the portal rendering
         // 1. event processing
         // 2. rendering
-        PortalManager pm = this.portalService.getComponentManager().getPortalManager();
+        PortalManager pm = this.portalService.getPortalManager();
         pm.process();
         pm.showPortal(this.xmlConsumer, this.parameters);
 	}
@@ -88,6 +88,6 @@
 
         // This is a fix: if we don't use the link service here, we get
         // in some rare cases a wrong uri!
-        this.portalService.getComponentManager().getLinkService().getRefreshLinkURI();
+        this.portalService.getLinkService().getRefreshLinkURI();
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/AbstractComponent.java Tue Jan  3 00:34:59 2006
@@ -74,7 +74,7 @@
     public void dispose() {
         if ( this.manager != null ) {
             if ( this instanceof Receiver && this.portalService != null ) {
-                this.portalService.getComponentManager().getEventManager().unsubscribe((Receiver)this);
+                this.portalService.getEventManager().unsubscribe((Receiver)this);
             }
             this.manager.release(this.portalService);
             this.portalService = null;
@@ -87,7 +87,7 @@
      */
     public void initialize() throws Exception {
         if ( this instanceof Receiver ) {
-            this.portalService.getComponentManager().getEventManager().subscribe((Receiver)this);
+            this.portalService.getEventManager().subscribe((Receiver)this);
         }
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PageLabelManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PageLabelManager.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PageLabelManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PageLabelManager.java Tue Jan  3 00:34:59 2006
@@ -227,7 +227,7 @@
     private Map initializeLabels(PortalService service) {
         Map map = new HashMap();
 
-        Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+        Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
         Layout portalLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
         if (portalLayout == null) {
             portalLayout = rootLayout;

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Tue Jan  3 00:34:59 2006
@@ -139,7 +139,7 @@
      * @see org.apache.cocoon.portal.PortalManagerAspect#prepare(org.apache.cocoon.portal.PortalManagerAspectPrepareContext, org.apache.cocoon.portal.PortalService)
      */
     public void prepare(PortalManagerAspectPrepareContext context, PortalService service) throws ProcessingException {
-        EventManager eventManager = this.portalService.getComponentManager().getEventManager();
+        EventManager eventManager = this.portalService.getEventManager();
         eventManager.processEvents();
     }
 
@@ -151,7 +151,7 @@
                        ContentHandler                   ch,
                        Parameters                       parameters)
     throws SAXException {
-        final ProfileManager profileManager = this.portalService.getComponentManager().getProfileManager();
+        final ProfileManager profileManager = this.portalService.getProfileManager();
 
         // test for ajax request
         final Request req = ObjectModelHelper.getRequest(context.getObjectModel());
@@ -167,7 +167,7 @@
                 a.addCDATAAttribute("id", current.getId());
                 XMLUtils.startElement(ch, "coplet", a);
                 final Layout l = CopletInstanceDataFeatures.searchLayout(current.getId(), rootLayout);
-                Renderer portalLayoutRenderer = this.portalService.getComponentManager().getRenderer( l.getRendererName());
+                Renderer portalLayoutRenderer = this.portalService.getRenderer( l.getRendererName());
                 portalLayoutRenderer.toSAX(l, this.portalService, ch);
                 XMLUtils.endElement(ch, "coplet");
             }
@@ -202,7 +202,7 @@
                 return;
             }
 
-            Renderer portalLayoutRenderer = this.portalService.getComponentManager().getRenderer( portalLayout.getRendererName());
+            Renderer portalLayoutRenderer = this.portalService.getRenderer( portalLayout.getRendererName());
 
             ch.startDocument();
             portalLayoutRenderer.toSAX(portalLayout, this.portalService, ch);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Tue Jan  3 00:34:59 2006
@@ -38,11 +38,20 @@
 import org.apache.avalon.framework.service.Serviceable;
 import org.apache.avalon.framework.thread.ThreadSafe;
 import org.apache.cocoon.components.ContextHelper;
+import org.apache.cocoon.core.Core;
 import org.apache.cocoon.environment.Request;
 import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.portal.LinkService;
 import org.apache.cocoon.portal.PortalComponentManager;
+import org.apache.cocoon.portal.PortalManager;
 import org.apache.cocoon.portal.PortalService;
+import org.apache.cocoon.portal.coplet.CopletFactory;
+import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
+import org.apache.cocoon.portal.event.EventManager;
+import org.apache.cocoon.portal.layout.LayoutFactory;
 import org.apache.cocoon.portal.layout.SkinDescription;
+import org.apache.cocoon.portal.layout.renderer.Renderer;
+import org.apache.cocoon.portal.profile.ProfileManager;
 import org.apache.cocoon.servlet.CocoonServlet;
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceResolver;
@@ -350,5 +359,75 @@
      */
     public boolean getConfigurationAsBoolean(String key, boolean defaultValue) {
         return this.config.getChild(key).getValueAsBoolean(defaultValue);
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getComponentContext()
+     */
+    public Context getComponentContext() {
+        return this.context;
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getCopletAdapter(java.lang.String)
+     */
+    public CopletAdapter getCopletAdapter(String name) {
+        return this.getComponentManager().getCopletAdapter(name);
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getCopletFactory()
+     */
+    public CopletFactory getCopletFactory() {
+        return this.getComponentManager().getCopletFactory();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getCore()
+     */
+    public Core getCore() {
+        return this.getComponentManager().getCore();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getEventManager()
+     */
+    public EventManager getEventManager() {
+        return this.getComponentManager().getEventManager();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getLayoutFactory()
+     */
+    public LayoutFactory getLayoutFactory() {
+        return this.getComponentManager().getLayoutFactory();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getLinkService()
+     */
+    public LinkService getLinkService() {
+        return this.getComponentManager().getLinkService();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getPortalManager()
+     */
+    public PortalManager getPortalManager() {
+        return this.getComponentManager().getPortalManager();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getProfileManager()
+     */
+    public ProfileManager getProfileManager() {
+        return this.getComponentManager().getProfileManager();
+    }
+
+    /**
+     * @see org.apache.cocoon.portal.PortalComponentManager#getRenderer(java.lang.String)
+     */
+    public Renderer getRenderer(String name) {
+        return this.getComponentManager().getRenderer(name);
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/impl/DefaultLayoutFactory.java Tue Jan  3 00:34:59 2006
@@ -251,7 +251,7 @@
 
         layout.setDescription( layoutDescription );
 
-        this.portalService.getComponentManager().getProfileManager().register(layout);
+        this.portalService.getProfileManager().register(layout);
 
         return layout;
     }
@@ -278,7 +278,7 @@
             }
 
             if ( layout instanceof CopletLayout ) {
-                CopletFactory factory = this.portalService.getComponentManager().getCopletFactory();
+                CopletFactory factory = this.portalService.getCopletFactory();
                 factory.remove( ((CopletLayout)layout).getCopletInstanceData());
             }
 
@@ -287,7 +287,7 @@
                 parent.getParent().removeItem( parent );
             }
 
-            ProfileManager profileManager = this.portalService.getComponentManager().getProfileManager();
+            ProfileManager profileManager = this.portalService.getProfileManager();
             profileManager.unregister(layout);
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractCompositeAspect.java Tue Jan  3 00:34:59 2006
@@ -107,7 +107,7 @@
     protected void processLayout(Layout layout, PortalService service, ContentHandler handler) throws SAXException {
         if ( layout != null ) {
             final String rendererName = layout.getRendererName();
-            final Renderer renderer = service.getComponentManager().getRenderer(rendererName);
+            final Renderer renderer = service.getRenderer(rendererName);
             renderer.toSAX(layout, service, handler);
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RemovableAspect.java Tue Jan  3 00:34:59 2006
@@ -61,13 +61,13 @@
             boolean mandatory = CopletDataFeatures.isMandatory(cid.getCopletData());
             if ( !mandatory ) {
                 LayoutRemoveEvent lre = new LayoutRemoveEvent(layout);
-                XMLUtils.createElement(handler, "remove-uri", service.getComponentManager().getLinkService().getLinkURI(lre));
+                XMLUtils.createElement(handler, "remove-uri", service.getLinkService().getLinkURI(lre));
             }
         } else {
             // for any other layout just create the event
             LayoutRemoveEvent lre = new LayoutRemoveEvent(layout);
             XMLUtils.createElement(handler, "remove-uri", 
-                                   service.getComponentManager().getLinkService().getLinkURI(lre));
+                                   service.getLinkService().getLinkURI(lre));
         }
         context.invokeNext(layout, service, handler);
 	}

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/SizingAspect.java Tue Jan  3 00:34:59 2006
@@ -83,30 +83,30 @@
 
             if ( size != CopletInstanceData.SIZE_MINIMIZED ) {
                 event = new CopletInstanceSizingEvent(cid, CopletInstanceData.SIZE_MINIMIZED);
-                XMLUtils.createElement(handler, "minimize-uri", service.getComponentManager().getLinkService().getLinkURI(event));
+                XMLUtils.createElement(handler, "minimize-uri", service.getLinkService().getLinkURI(event));
             }
             if ( size != CopletInstanceData.SIZE_NORMAL) {
                 event = new CopletInstanceSizingEvent(cid, CopletInstanceData.SIZE_NORMAL);
-                XMLUtils.createElement(handler, "normal-uri", service.getComponentManager().getLinkService().getLinkURI(event));
+                XMLUtils.createElement(handler, "normal-uri", service.getLinkService().getLinkURI(event));
             }
             if ( this.enableMaximized ) {
                 if ( size != CopletInstanceData.SIZE_MAXIMIZED ) {
                     event = new CopletInstanceSizingEvent(cid, CopletInstanceData.SIZE_MAXIMIZED);
-                    XMLUtils.createElement(handler, "maximize-uri", service.getComponentManager().getLinkService().getLinkURI(event));
+                    XMLUtils.createElement(handler, "maximize-uri", service.getLinkService().getLinkURI(event));
                 }
             }
 
             if ( this.enableFullScreen ) {
                 boolean supportsFullScreen = CopletDataFeatures.supportsFullScreenMode(cid.getCopletData());
                 if ( supportsFullScreen ) {
-                    final Layout rootLayout = service.getComponentManager().getProfileManager().getPortalLayout(null, null);
+                    final Layout rootLayout = service.getProfileManager().getPortalLayout(null, null);
                     final Layout fullScreenLayout = LayoutFeatures.getFullScreenInfo(rootLayout);
                     if ( fullScreenLayout != null && fullScreenLayout.equals( layout )) {
                         event = new CopletInstanceSizingEvent( cid, CopletInstanceData.SIZE_NORMAL );
-                        XMLUtils.createElement(handler, "normal-uri", service.getComponentManager().getLinkService().getLinkURI(event));
+                        XMLUtils.createElement(handler, "normal-uri", service.getLinkService().getLinkURI(event));
                     } else {
                         event = new CopletInstanceSizingEvent( cid, CopletInstanceData.SIZE_FULLSCREEN );
-                        XMLUtils.createElement(handler, "fullscreen-uri", service.getComponentManager().getLinkService().getLinkURI(event));
+                        XMLUtils.createElement(handler, "fullscreen-uri", service.getLinkService().getLinkURI(event));
                     }
                 }
             }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java Tue Jan  3 00:34:59 2006
@@ -149,7 +149,7 @@
                     attributes.addCDATAAttribute("selected", "true");
                 }
                 event = new LayoutChangeParameterEvent(tabLayout, "tab", String.valueOf(j), true);
-                attributes.addCDATAAttribute("parameter", service.getComponentManager().getLinkService().getLinkURI(event)); 
+                attributes.addCDATAAttribute("parameter", service.getLinkService().getLinkURI(event)); 
 
                 // add parameters
                 final Iterator iter = tab.getParameters().entrySet().iterator();
@@ -232,7 +232,7 @@
                     events.add(event);
 
                     attributes.addCDATAAttribute("parameter",
-                        service.getComponentManager().getLinkService().getLinkURI(events));
+                        service.getLinkService().getLinkURI(events));
 
                     // add parameters
                     final Iterator iter = tab.getParameters().entrySet().iterator();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java Tue Jan  3 00:34:59 2006
@@ -115,7 +115,7 @@
     protected void processLayout(Layout layout, PortalService service, ContentHandler handler) throws SAXException {
         final String rendererName = layout.getRendererName();
         Renderer renderer = null;
-        renderer = service.getComponentManager().getRenderer(rendererName);
+        renderer = service.getRenderer(rendererName);
         renderer.toSAX(layout, service, handler);
     }
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java Tue Jan  3 00:34:59 2006
@@ -43,7 +43,7 @@
 				layoutKey = ((LinkLayout)layout).getLayoutKey();
 				layoutId = ((LinkLayout)layout).getLayoutId();
 			}
-            this.processLayout(service.getComponentManager().getProfileManager().getPortalLayout(layoutKey, layoutId), service, handler);
+            this.processLayout(service.getProfileManager().getPortalLayout(layoutKey, layoutId), service, handler);
         } else {
             throw new SAXException("Wrong layout type, LinkLayout expected: " + layout.getClass().getName());
         }        

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletActionProviderImpl.java Tue Jan  3 00:34:59 2006
@@ -81,7 +81,7 @@
                     size = CopletInstanceData.SIZE_MINIMIZED;
                 }
                 final Event e = new CopletInstanceSizingEvent(cid, size);
-                this.portalService.getComponentManager().getEventManager().send(e);
+                this.portalService.getEventManager().send(e);
             }
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/PortletURLProviderImpl.java Tue Jan  3 00:34:59 2006
@@ -82,7 +82,7 @@
         PortalService service = null;
         try {
             service = (PortalService) manager.lookup(PortalService.ROLE);
-            this.linkService = service.getComponentManager().getLinkService();
+            this.linkService = service.getLinkService();
         } catch (ServiceException se) {
             throw new PortalRuntimeException("Unable to lookup portal service.", se);
         } finally {
@@ -96,10 +96,10 @@
      * @param eventData
      */
     public PortletURLProviderImpl(PortalService service, String eventData) {
-        this.linkService = service.getComponentManager().getLinkService();
+        this.linkService = service.getLinkService();
         PortletURLConverter urlConverter = new PortletURLConverter(eventData);
         String copletId = urlConverter.getPortletId();
-        CopletInstanceData cid = service.getComponentManager().getProfileManager()
+        CopletInstanceData cid = service.getProfileManager()
             .getCopletInstanceData(copletId);
         this.portletWindow = (PortletWindow)cid.getTemporaryAttribute("window");
         this.mode = urlConverter.getMode();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java Tue Jan  3 00:34:59 2006
@@ -308,9 +308,9 @@
         final Map objectModel = ContextHelper.getObjectModel(this.context);
         final ServletRequestImpl req = new ServletRequestImpl((HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT), event);
         final HttpServletResponse res = new ServletResponseImpl((HttpServletResponse) objectModel.get(HttpEnvironment.HTTP_RESPONSE_OBJECT));
-        if ( !service.getComponentManager().getProfileManager().getUser().isAnonymous() ) {
+        if ( !service.getProfileManager().getUser().isAnonymous() ) {
             req.setAttribute(PortletRequest.USER_INFO,
-                             service.getComponentManager().getProfileManager().getUser().getUserInfos());
+                             service.getProfileManager().getUser().getUserInfos());
         }
         objectModel.put("portlet-response",  res);
         objectModel.put("portlet-request", req);        
@@ -371,9 +371,9 @@
             objectModel.put("portlet-response",  new ServletResponseImpl(res));
             final ServletRequestImpl req = new ServletRequestImpl((HttpServletRequest) objectModel.get(HttpEnvironment.HTTP_REQUEST_OBJECT), null);
             objectModel.put("portlet-request",  req);
-            if ( !service.getComponentManager().getProfileManager().getUser().isAnonymous() ) {
+            if ( !service.getProfileManager().getUser().isAnonymous() ) {
                 req.setAttribute(PortletRequest.USER_INFO,
-                                 service.getComponentManager().getProfileManager().getUser().getUserInfos());
+                                 service.getProfileManager().getUser().getUserInfos());
             }
         }
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/adapter/PortletWindowAspect.java Tue Jan  3 00:34:59 2006
@@ -93,7 +93,7 @@
      */
     public void initialize() throws Exception {
         super.initialize();
-        PortletAdapter adapter = (PortletAdapter)this.portalService.getComponentManager().getCopletAdapter(this.adapterName);
+        PortletAdapter adapter = (PortletAdapter)this.portalService.getCopletAdapter(this.adapterName);
         if ( adapter != null ) {
             this.environment = adapter.getPortletContainerEnvironment();
         }
@@ -138,7 +138,9 @@
                     title = copletInstanceData.getTitle();
                 }
             }
-            XMLUtils.createElement(contenthandler, "title", title);            
+            if ( title != null ) {
+                XMLUtils.createElement(contenthandler, "title", title);            
+            }
 
             if ( this.environment != null ) {
                 InformationProviderService ips = (InformationProviderService) this.environment.getContainerService(InformationProviderService.class);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/ActionRequestFactoryImpl.java Tue Jan  3 00:34:59 2006
@@ -67,7 +67,7 @@
     public ActionRequest getActionRequest(PortletWindow       portletWindow,
                                           HttpServletRequest  servletRequest,
                                           HttpServletResponse servletResponse) {
-        ActionRequest actionRequest = new ActionRequestImpl(portletWindow, servletRequest, this.portalService.getComponentManager().getProfileManager().getUser());
+        ActionRequest actionRequest = new ActionRequestImpl(portletWindow, servletRequest, this.portalService.getProfileManager().getUser());
         return actionRequest;
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/factory/RenderRequestFactoryImpl.java Tue Jan  3 00:34:59 2006
@@ -69,7 +69,7 @@
                                           HttpServletResponse servletResponse) {
         RenderRequest renderRequest = new RenderRequestImpl( portletWindow,
                                                              servletRequest,
-                                                             this.portalService.getComponentManager().getProfileManager().getUser());
+                                                             this.portalService.getProfileManager().getUser());
         return renderRequest;
     }
 }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletDefinitionRegistryImpl.java Tue Jan  3 00:34:59 2006
@@ -475,7 +475,7 @@
 
         // fill portletsKeyObjectId and
         // register new coplet data for each portlet
-        final PortalComponentManager pcm = this.portalService.getComponentManager();
+        final PortalComponentManager pcm = this.portalService;
         final Iterator portlets = portletApp.getPortletDefinitionList().iterator();
         while (portlets.hasNext()) {
             final PortletDefinition portlet = (PortletDefinition) portlets.next();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/pluto/om/PortletEntityImpl.java Tue Jan  3 00:34:59 2006
@@ -133,7 +133,7 @@
      * @see org.apache.pluto.om.entity.PortletEntityCtrl#store()
      */
     public void store() throws IOException {
-        final ProfileManager manager = this.service.getComponentManager().getProfileManager();
+        final ProfileManager manager = this.service.getProfileManager();
         manager.saveUserCopletInstanceDatas(null);
     }
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/AbstractProfileManager.java Tue Jan  3 00:34:59 2006
@@ -130,7 +130,7 @@
             if (object instanceof Layout) {
                 object = this.checkAvailability((Layout)object);
                 if ( object != null ) {
-                    this.portalService.getComponentManager().getLayoutFactory().prepareLayout((Layout)object);
+                    this.portalService.getLayoutFactory().prepareLayout((Layout)object);
                 }
             } else if (object instanceof Collection) {
                 final Iterator iterator = ((Collection)object).iterator();
@@ -143,7 +143,7 @@
                         if ( cid.getCopletData() != null ) {
                             // now invoke login on each instance
                             CopletAdapter adapter;
-                            adapter = this.portalService.getComponentManager().getCopletAdapter(cid.getCopletData().getCopletBaseData().getCopletAdapterName());                            
+                            adapter = this.portalService.getCopletAdapter(cid.getCopletData().getCopletBaseData().getCopletAdapterName());                            
                             adapter.login( cid );
                         }
                     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/profile/impl/StaticProfileManager.java Tue Jan  3 00:34:59 2006
@@ -113,7 +113,7 @@
             layouts.put(null, layout); //save root with null as key
             cacheLayouts(layouts, layout);
 
-            LayoutFactory factory = this.portalService.getComponentManager().getLayoutFactory();
+            LayoutFactory factory = this.portalService.getLayoutFactory();
             factory.prepareLayout(layout);
 
             // store the new values in the service

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/reading/ProxyReader.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/reading/ProxyReader.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/reading/ProxyReader.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/reading/ProxyReader.java Tue Jan  3 00:34:59 2006
@@ -99,7 +99,7 @@
 
         String copletID = request.getParameter(ProxyTransformer.COPLETID);
 
-        this.copletInstanceData = this.portalService.getComponentManager()
+        this.copletInstanceData = this.portalService
                                       .getProfileManager().getCopletInstanceData(copletID);
         this.prefix = par.getParameter("prefix", ProxyTransformer.PROXY_PREFIX);
     }
@@ -169,7 +169,7 @@
         boolean firstattribute = true;
         StringBuffer query = new StringBuffer();
 
-        final LinkService linkService = this.portalService.getComponentManager().getLinkService();
+        final LinkService linkService = this.portalService.getLinkService();
         while (enumeration.hasMoreElements()) {
             String paramName = (String) enumeration.nextElement();
 

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/CopletSourceFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/CopletSourceFactory.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/CopletSourceFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/CopletSourceFactory.java Tue Jan  3 00:34:59 2006
@@ -52,7 +52,7 @@
             location = location.substring(position+2);
         }
         try {
-            CopletInstanceData coplet = this.portalService.getComponentManager().getProfileManager().getCopletInstanceData(location);
+            CopletInstanceData coplet = this.portalService.getProfileManager().getCopletInstanceData(location);
             if ( coplet == null ) {
                 throw new IOException("Unable to get coplet for " + location);
             }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSource.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSource.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSource.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSource.java Tue Jan  3 00:34:59 2006
@@ -142,7 +142,7 @@
 	 */
 	public void toSAX(ContentHandler handler) 
     throws SAXException {
-        Renderer portalLayoutRenderer = this.portalService.getComponentManager().getRenderer( this.layout.getRendererName());
+        Renderer portalLayoutRenderer = this.portalService.getRenderer( this.layout.getRendererName());
 
         handler.startDocument();
         portalLayoutRenderer.toSAX(this.layout, this.portalService, handler);

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSourceFactory.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSourceFactory.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSourceFactory.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/source/LayoutSourceFactory.java Tue Jan  3 00:34:59 2006
@@ -58,7 +58,7 @@
             profileKey = location.substring(0, pos);
             layoutKey = location.substring(pos+1);
         }
-        final Layout layout = this.portalService.getComponentManager().getProfileManager().getPortalLayout(profileKey, layoutKey);
+        final Layout layout = this.portalService.getProfileManager().getPortalLayout(profileKey, layoutKey);
         if ( layout == null ) {
             throw new IOException("Unable to get layout for: " + location);
         }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/acting/CheckAccessAction.java Tue Jan  3 00:34:59 2006
@@ -49,7 +49,7 @@
         try {
             UserRightsService userRightsService = ptm.getUserRightsService();
             // FIXME: replace the throw with something else
-            if (!userRightsService.userIsAllowed(url, ptm.getPortalObjects().getPortalService().getComponentManager().getProfileManager().getUser())) {
+            if (!userRightsService.userIsAllowed(url, ptm.getPortalObjects().getPortalService().getProfileManager().getUser())) {
                 throw new ProcessingException(
                     "You are not allowed to request this page.");
             }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/helper/PortalObjects.java Tue Jan  3 00:34:59 2006
@@ -33,7 +33,7 @@
 
 	public PortalObjects(PortalService portalService) {
 		this.portalService = portalService;
-		this.componentManager = portalService.getComponentManager();
+		this.componentManager = portalService;
 		this.profileManager = componentManager.getProfileManager();
 		this.portalLayout = profileManager.getPortalLayout(null, null);
 	}

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/tools/userManagement/ContextGrabber.java Tue Jan  3 00:34:59 2006
@@ -35,7 +35,7 @@
 	 */
 	public UserBean grab(PortalService service) {
 		UserBean ub = new UserBean ();
-        final Map infos = service.getComponentManager().getProfileManager().getUser().getUserInfos();
+        final Map infos = service.getProfileManager().getUser().getUserInfos();
         final Iterator i = infos.entrySet().iterator();
         while ( i.hasNext() ) {
             final Map.Entry current = (Map.Entry)i.next();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/AbstractCopletTransformer.java Tue Jan  3 00:34:59 2006
@@ -105,7 +105,7 @@
             throw new SAXException("copletId must be passed as parameter or in the object model within the parent context.");
         }
 
-        CopletInstanceData object = this.portalService.getComponentManager().getProfileManager().getCopletInstanceData( copletId );
+        CopletInstanceData object = this.portalService.getProfileManager().getCopletInstanceData( copletId );
 
         return object;
     }

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/CopletTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/CopletTransformer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/CopletTransformer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/CopletTransformer.java Tue Jan  3 00:34:59 2006
@@ -162,7 +162,7 @@
                 throw new SAXException("Attribute 'id' must be specified on element " + LAYOUT_ELEM + ".");
             }
             final String profile = attr.getValue("profile");
-            final Layout l = this.portalService.getComponentManager().getProfileManager().getPortalLayout(profile, layoutId);
+            final Layout l = this.portalService.getProfileManager().getPortalLayout(profile, layoutId);
             if ( l == null ) {
                 throw new SAXException("Unable to find layout with id '" + layoutId + "' in profile '" + profile + "'.");
             }
@@ -173,7 +173,7 @@
             }            
         } else if (name.equals(LINK_ELEM)) {
 
-            final LinkService linkService = this.portalService.getComponentManager().getLinkService();
+            final LinkService linkService = this.portalService.getLinkService();
             final String format = attr.getValue("format");
             AttributesImpl newAttrs = new AttributesImpl();
             newAttrs.setAttributes(attr);
@@ -202,7 +202,7 @@
                 if ( attr.getValue("layout") != null ) {
                     newAttrs.removeAttribute("layout");
                     final String layoutId = attr.getValue("layout");
-                    Layout layout = this.portalService.getComponentManager().getProfileManager().getPortalLayout(null, layoutId);
+                    Layout layout = this.portalService.getProfileManager().getPortalLayout(null, layoutId);
                     if ( layout != null ) {
                         event = new LayoutJXPathEvent(layout, path, value);
                     }
@@ -268,7 +268,7 @@
         } else if ( name.equals(LINKS_ELEM) ) {
             this.insideLinks = false;
             final String format = (String)this.stack.pop();
-            final LinkService linkService = this.portalService.getComponentManager().getLinkService();
+            final LinkService linkService = this.portalService.getLinkService();
             String href = linkService.getLinkURI(this.collectedEvents);
 
             AttributesImpl newAttrs = (AttributesImpl)this.stack.pop();

Modified: cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java?rev=365578&r1=365577&r2=365578&view=diff
==============================================================================
--- cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java (original)
+++ cocoon/blocks/portal/trunk/java/org/apache/cocoon/portal/transformation/EventLinkTransformer.java Tue Jan  3 00:34:59 2006
@@ -166,7 +166,7 @@
                     // if attribute found that contains a link
                     if (link != null) {
                         CopletInstanceData cid = this.getCopletInstanceData(attr.getValue("coplet"));
-                        LinkService linkService = this.portalService.getComponentManager().getLinkService();
+                        LinkService linkService = this.portalService.getLinkService();
 
                         // create event link
                         CopletLinkEvent event = new CopletLinkEvent(cid, link);
@@ -185,7 +185,7 @@
                     String link = this.endTextRecording();
 
                     CopletInstanceData cid = this.getCopletInstanceData();
-                    LinkService linkService = this.portalService.getComponentManager().getLinkService();
+                    LinkService linkService = this.portalService.getLinkService();
 
                     // create event link
                     CopletLinkEvent event = new CopletLinkEvent(cid, link);



Mime
View raw message