You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2006/03/14 21:58:54 UTC
svn commit: r385887 - in
/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal:
PortalComponentManager.java impl/DefaultPortalComponentManager.java
impl/PortalServiceImpl.java
Author: cziegeler
Date: Tue Mar 14 12:58:53 2006
New Revision: 385887
URL: http://svn.apache.org/viewcvs?rev=385887&view=rev
Log:
Cleanup
Modified:
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java
cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java?rev=385887&r1=385886&r2=385887&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java Tue Mar 14 12:58:53 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.portal;
-import org.apache.avalon.framework.context.Context;
import org.apache.cocoon.portal.coplet.CopletFactory;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
import org.apache.cocoon.portal.event.EventManager;
@@ -74,11 +73,4 @@
* @since 2.1.8
*/
PortalManager getPortalManager();
-
- /**
- * Return the component context.
- * @since 2.1.8
- * @deprecated Use the core object instead.
- */
- Context getComponentContext();
}
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java?rev=385887&r1=385886&r2=385887&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java Tue Mar 14 12:58:53 2006
@@ -19,18 +19,12 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.avalon.framework.activity.Disposable;
-import org.apache.avalon.framework.context.Context;
-import org.apache.avalon.framework.logger.AbstractLogEnabled;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
-import org.apache.avalon.framework.service.Serviceable;
-import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.portal.LinkService;
import org.apache.cocoon.portal.PortalComponentManager;
import org.apache.cocoon.portal.PortalManager;
import org.apache.cocoon.portal.PortalRuntimeException;
-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;
@@ -44,50 +38,41 @@
* @version $Id$
*/
public class DefaultPortalComponentManager
- extends AbstractLogEnabled
- implements PortalComponentManager, Serviceable, Disposable, ThreadSafe {
+ implements PortalComponentManager {
- /** The avalon component manager */
+ /** The avalon component manager. */
protected ServiceManager manager;
- /** The portal service */
- protected final PortalService portalService;
-
+ /** The profile manager. */
protected ProfileManager profileManager;
+ /** The link service. */
protected LinkService linkService;
+ /** The used renderers. */
protected Map renderers = new HashMap();
+ /** The used coplet adapters. */
protected Map copletAdapters = new HashMap();
+ /** The coplet factory. */
protected CopletFactory copletFactory;
+ /** The layout factory. */
protected LayoutFactory layoutFactory;
+ /** The event manager. */
protected EventManager eventManager;
+ /** The portal manager. */
protected PortalManager portalManager;
- protected final Context context;
-
/**
* Create a new portal component manager. Each portal has a own
* component manager that manages all central components for this
* portal.
- * This implementation stores the portal service (a global singleton)
- * to pass it to the other components (TODO).
- * @param service The portal service.
- */
- public DefaultPortalComponentManager(final PortalService service, Context context) {
- this.portalService = service;
- this.context = context;
- }
-
- /**
- * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
- public void service(ServiceManager manager) throws ServiceException {
+ public DefaultPortalComponentManager(ServiceManager manager) {
this.manager = manager;
}
@@ -236,12 +221,5 @@
}
}
return this.portalManager;
- }
-
- /**
- * @see org.apache.cocoon.portal.PortalComponentManager#getComponentContext()
- */
- public Context getComponentContext() {
- return this.context;
}
}
Modified: cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=385887&r1=385886&r2=385887&view=diff
==============================================================================
--- cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/trunk/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Tue Mar 14 12:58:53 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.avalon.framework.container.ContainerUtil;
import org.apache.avalon.framework.context.Context;
import org.apache.avalon.framework.context.ContextException;
import org.apache.avalon.framework.context.Contextualizable;
@@ -77,7 +76,7 @@
protected ServiceManager manager;
/** The manager for some core portal components. */
- protected PortalComponentManager portalComponentManager;
+ protected DefaultPortalComponentManager portalComponentManager;
/** The list of skins. */
protected List skinList = new ArrayList();
@@ -241,7 +240,9 @@
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
- ContainerUtil.dispose( this.portalComponentManager );
+ if ( this.portalComponentManager != null ) {
+ this.portalComponentManager.dispose();
+ }
// remove the portal service from the servlet context - if available
try {
final ServletConfig servletConfig = (ServletConfig) context.get(CocoonServlet.CONTEXT_SERVLET_CONFIG);
@@ -265,13 +266,7 @@
SourceResolver resolver = null;
try {
resolver = (SourceResolver)this.manager.lookup(SourceResolver.ROLE);
- PortalComponentManager c = new DefaultPortalComponentManager(this, this.context);
- this.portalComponentManager = c;
- ContainerUtil.enableLogging( c, this.getLogger() );
- ContainerUtil.contextualize( c, this.context );
- ContainerUtil.service( c, this.manager );
- ContainerUtil.configure( c, portal );
- ContainerUtil.initialize( c );
+ this.portalComponentManager = new DefaultPortalComponentManager(this.manager);
// scan for skins
final Configuration[] skinConfs = portal.getChild("skins").getChildren("skin");
@@ -358,13 +353,6 @@
*/
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;
}
/**