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/08/10 08:33:59 UTC
svn commit: r430282 [1/2] - in /cocoon/trunk:
blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/
blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/
blocks/cocoon-portal/cocoon-portal-impl...
Author: cziegeler
Date: Wed Aug 9 23:33:57 2006
New Revision: 430282
URL: http://svn.apache.org/viewvc?rev=430282&view=rev
Log:
Use less memory
Move away from avalon interfaces
Added:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/spring/RegistrationBeanPostProcessor.java (with props)
Modified:
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/AbstractParameters.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/DefaultLinkRenderer.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/resources/org/apache/cocoon/portal/portal.roles
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/TestProfileManager.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-portlet-impl/src/main/java/org/apache/cocoon/portal/pluto/adapter/PortletAdapter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-sample/src/main/java/org/apache/cocoon/portal/coplets/basket/AddToBasketAspect.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPAdapter.java
cocoon/trunk/blocks/cocoon-portal/cocoon-portal-wsrp-impl/src/main/java/org/apache/cocoon/portal/wsrp/adapter/WSRPEventAspect.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/processing/ProcessInfoProvider.java
cocoon/trunk/core/cocoon-core/src/main/java/org/apache/cocoon/processing/impl/ProcessInfoProviderImpl.java
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalComponentManager.java Wed Aug 9 23:33:57 2006
@@ -21,6 +21,7 @@
import org.apache.cocoon.portal.layout.LayoutFactory;
import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.processing.ProcessInfoProvider;
/**
* This component provides access to the most important portal components
@@ -73,4 +74,17 @@
* @since 2.1.8
*/
PortalManager getPortalManager();
+
+ /**
+ * Register a renderer.
+ * @since 2.2
+ */
+ void register(String name, Renderer renderer);
+
+ /**
+ * Get the process info provider for accessing request
+ * information.
+ * @since 2.2
+ */
+ ProcessInfoProvider getProcessInfoProvider();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectPrepareContext.java Wed Aug 9 23:33:57 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.portal;
-import java.util.Map;
import java.util.Properties;
import org.apache.cocoon.ProcessingException;
@@ -36,9 +35,4 @@
* Get the {@link Properties} of the aspect.
*/
Properties getAspectProperties();
-
- /**
- * Get the object model.
- */
- Map getObjectModel();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalManagerAspectRenderContext.java Wed Aug 9 23:33:57 2006
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.portal;
-import java.util.Map;
import java.util.Properties;
import org.xml.sax.ContentHandler;
@@ -38,9 +37,4 @@
* Get the {@link Properties} of the aspect.
*/
Properties getAspectProperties();
-
- /**
- * Get the object model.
- */
- Map getObjectModel();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/PortalService.java Wed Aug 9 23:33:57 2006
@@ -17,7 +17,6 @@
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
/**
* This is the central component in the portal. It holds the configuration
@@ -95,12 +94,6 @@
Iterator getTemporaryAttributeNames();
/**
- * Return the component manager for the current portal.
- * @deprecated Starting with 2.2, this service extends the PortalComponentManager.
- */
- PortalComponentManager getComponentManager();
-
- /**
* Change the default layout key for most functions
*/
void setDefaultLayoutKey(String layoutKey);
@@ -114,12 +107,6 @@
* Return all skins
*/
List getSkinDescriptions();
-
- /**
- * Return the current object model.
- * @since 2.1.8
- */
- Map getObjectModel();
/**
* Get a configuration value.
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletDefinition.java Wed Aug 9 23:33:57 2006
@@ -38,10 +38,13 @@
/** The unique identifier. */
protected final String id;
+ /** The default title of the coplet. */
protected String title;
+ /** The type of this coplet (cocoon, jsr168, wsrp etc.). */
protected CopletType copletType;
+ /** Attributes (configuration) of this coplet. */
protected final Map attributes = new HashMap();
protected String allowedRoles;
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/coplet/CopletInstance.java Wed Aug 9 23:33:57 2006
@@ -16,6 +16,7 @@
package org.apache.cocoon.portal.coplet;
import java.io.Serializable;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
@@ -50,18 +51,21 @@
public final static int SIZE_MAXIMIZED = 2;
public final static int SIZE_FULLSCREEN = 3;
+ /** The unique identifier.
+ * @see PortalUtils#testId(String)
+ */
protected final String id;
/** The corresponding {@link CopletDefinition}. */
protected CopletDefinition copletDefinition;
/** Persisted attributes. */
- protected Map attributes = new HashMap();
+ protected Map attributes = Collections.EMPTY_MAP;
/** Temporary attributes are not persisted. */
- transient protected Map temporaryAttributes = new HashMap();
+ transient protected Map temporaryAttributes = Collections.EMPTY_MAP;
- /** The title of the coplet. */
+ /** The title of the coplet instance (if user specific). */
protected String title;
/** The size of the coplet. */
@@ -110,6 +114,9 @@
}
public void setAttribute(String key, Object value) {
+ if ( this.attributes.size() == 0 ) {
+ this.attributes = new HashMap();
+ }
this.attributes.put(key, value);
}
@@ -126,6 +133,9 @@
}
public void setTemporaryAttribute(String key, Object value) {
+ if ( this.temporaryAttributes.size() == 0 ) {
+ this.temporaryAttributes = new HashMap();
+ }
this.temporaryAttributes.put(key, value);
}
@@ -159,8 +169,12 @@
CopletInstance clone = new CopletInstance(this.id);
clone.copletDefinition = this.copletDefinition;
- clone.attributes = new HashMap(this.attributes);
- clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
+ if ( this.attributes.size() > 0 ) {
+ clone.attributes = new HashMap(this.attributes);
+ }
+ if ( this.temporaryAttributes.size() > 0 ) {
+ clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
+ }
return clone;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/EventAspectContext.java Wed Aug 9 23:33:57 2006
@@ -15,9 +15,8 @@
*/
package org.apache.cocoon.portal.event.aspect;
-import java.util.Map;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.EventConverter;
@@ -33,17 +32,12 @@
void invokeNext(PortalService service);
/**
- * Get the {@link Parameters} of the aspect.
+ * Get the {@link Properties} of the aspect.
*/
- Parameters getAspectParameters();
+ Properties getAspectProperties();
/**
* Get the encoder
*/
EventConverter getEventConverter();
-
- /**
- * Get the object model
- */
- Map getObjectModel();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/AbstractContentEventAspect.java Wed Aug 9 23:33:57 2006
@@ -78,7 +78,7 @@
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
*/
public void process(EventAspectContext context, PortalService service) {
- final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
+ final Request request = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel());
String[] values = request.getParameterValues(this.getRequestParameterName());
if (values != null) {
final EventManager publisher = service.getEventManager();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/ActionCounterEventAspect.java Wed Aug 9 23:33:57 2006
@@ -53,7 +53,7 @@
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
*/
public void process(EventAspectContext context, PortalService service) {
- final String requestParameterName = context.getAspectParameters().getParameter("parameter-name", this.parameterName);
+ final String requestParameterName = context.getAspectProperties().getProperty("parameter-name", this.parameterName);
int actionCount;
@@ -67,7 +67,7 @@
service.setAttribute(ATTRIBUTE_NAME, new Integer(actionCount));
}
- final Request request = ObjectModelHelper.getRequest( context.getObjectModel() );
+ final Request request = ObjectModelHelper.getRequest( service.getProcessInfoProvider().getObjectModel() );
String value = request.getParameter( requestParameterName );
if ( value != null && actionCount > 0) {
// get number
@@ -85,7 +85,7 @@
}
service.getLinkService().addUniqueParameterToLink( requestParameterName, String.valueOf(actionCount));
- final Response response = ObjectModelHelper.getResponse( context.getObjectModel() );
+ final Response response = ObjectModelHelper.getResponse( service.getProcessInfoProvider().getObjectModel() );
response.setHeader("Cache-Control", "no-cache");
response.addHeader("Cache-Control", "no-store");
response.setHeader("Pragma", "no-cache");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/NoClientCachingEventAspect.java Wed Aug 9 23:33:57 2006
@@ -40,7 +40,7 @@
*/
public void process(EventAspectContext context, PortalService service) {
- final Response response = ObjectModelHelper.getResponse( context.getObjectModel() );
+ final Response response = ObjectModelHelper.getResponse( service.getProcessInfoProvider().getObjectModel() );
response.setHeader("Cache-Control", "no-cache");
response.addHeader("Cache-Control", "no-store");
response.setHeader("Pragma", "no-cache");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/PageLabelEventAspect.java Wed Aug 9 23:33:57 2006
@@ -74,7 +74,7 @@
public void process(EventAspectContext context, PortalService service) {
if (this.labelManager != null) {
final EventManager publisher = service.getEventManager();
- final Request request = ObjectModelHelper.getRequest(context.getObjectModel());
+ final Request request = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel());
final String parameterName = this.labelManager.getRequestParameterName();
String label = request.getParameter(parameterName);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/aspect/impl/RequestParameterEventAspect.java Wed Aug 9 23:33:57 2006
@@ -19,7 +19,6 @@
import java.util.List;
import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
@@ -67,9 +66,8 @@
* @see org.apache.cocoon.portal.event.aspect.EventAspect#process(org.apache.cocoon.portal.event.aspect.EventAspectContext, org.apache.cocoon.portal.PortalService)
*/
public void process(EventAspectContext context, PortalService service) {
- final Request request = ObjectModelHelper.getRequest( context.getObjectModel() );
- final Parameters config = context.getAspectParameters();
- final String requestParameterNames = config.getParameter("parameter-name", LinkService.DEFAULT_REQUEST_EVENT_PARAMETER_NAME);
+ final Request request = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel());
+ final String requestParameterNames = context.getAspectProperties().getProperty("parameter-name", LinkService.DEFAULT_REQUEST_EVENT_PARAMETER_NAME);
boolean processedDefault = false;
StringTokenizer tokenizer = new StringTokenizer(requestParameterNames, ", ");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventAspectContext.java Wed Aug 9 23:33:57 2006
@@ -16,9 +16,8 @@
package org.apache.cocoon.portal.event.impl;
import java.util.Iterator;
-import java.util.Map;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.Parameters;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.EventConverter;
import org.apache.cocoon.portal.event.aspect.EventAspect;
@@ -33,9 +32,8 @@
private Iterator iterator;
private Iterator configIterator;
- private Parameters config;
+ private Properties config;
- private Map objectModel;
private EventConverter converter;
public DefaultEventAspectContext(EventAspectChain chain) {
@@ -48,7 +46,7 @@
*/
public void invokeNext(PortalService service) {
if (iterator.hasNext()) {
- this.config = (Parameters) this.configIterator.next();
+ this.config = (Properties) this.configIterator.next();
final EventAspect aspect = (EventAspect) iterator.next();
aspect.process( this, service );
}
@@ -56,9 +54,9 @@
}
/**
- * @see org.apache.cocoon.portal.event.aspect.EventAspectContext#getAspectParameters()
+ * @see org.apache.cocoon.portal.event.aspect.EventAspectContext#getAspectProperties()
*/
- public Parameters getAspectParameters() {
+ public Properties getAspectProperties() {
return this.config;
}
@@ -69,24 +67,10 @@
return this.converter;
}
- /**
- * Get the object model
- */
- public Map getObjectModel() {
- return this.objectModel;
- }
-
/**
* @param converter
*/
public void setEventConverter(EventConverter converter) {
this.converter = converter;
- }
-
- /**
- * @param map
- */
- public void setObjectModel(Map map) {
- objectModel = map;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/DefaultEventManager.java Wed Aug 9 23:33:57 2006
@@ -27,7 +27,6 @@
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.portal.PortalService;
@@ -35,7 +34,6 @@
import org.apache.cocoon.portal.event.EventConverter;
import org.apache.cocoon.portal.event.EventManager;
import org.apache.cocoon.portal.event.Receiver;
-import org.apache.cocoon.portal.event.aspect.EventAspect;
import org.apache.cocoon.portal.impl.AbstractComponent;
/**
@@ -63,8 +61,6 @@
protected EventAspectChain chain;
- protected ServiceSelector aspectSelector;
-
/** Introspected receiver classes. */
protected Map receiverClasses = new HashMap();
@@ -92,10 +88,9 @@
public void dispose() {
if (this.manager != null) {
if ( this.chain != null) {
- this.chain.dispose( this.aspectSelector );
+ this.chain.dispose( this.manager );
+ this.chain = null;
}
- this.manager.release( this.aspectSelector );
- this.aspectSelector = null;
}
super.dispose();
}
@@ -120,13 +115,10 @@
throws ProcessingException {
if ( this.configuration != null ) {
try {
- this.aspectSelector = (ServiceSelector) this.manager.lookup( EventAspect.ROLE+"Selector");
this.chain = new EventAspectChain();
- this.chain.configure(this.aspectSelector, this.configuration.getChild("event-aspects"));
+ this.chain.configure(this.manager, this.configuration.getChild("event-aspects"));
} catch (ConfigurationException ce) {
throw new ProcessingException("Unable configure component.", ce);
- } catch (ServiceException ce) {
- throw new ProcessingException("Unable to lookup component.", ce);
}
this.configuration = null;
}
@@ -136,7 +128,6 @@
converter = (EventConverter) this.manager.lookup(EventConverter.ROLE);
// Invoke aspects
- eventContext.setObjectModel(this.getObjectModel());
eventContext.setEventConverter(converter);
eventContext.invokeNext( this.portalService );
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/event/impl/EventAspectChain.java Wed Aug 9 23:33:57 2006
@@ -23,7 +23,8 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.portal.event.aspect.EventAspect;
/**
*
@@ -35,7 +36,7 @@
private List configs = new ArrayList();
- public void configure(ServiceSelector selector, Configuration conf)
+ public void configure(ServiceManager manager, Configuration conf)
throws ConfigurationException {
if ( conf != null ) {
final Configuration[] aspectConfigs = conf.getChildren("aspect");
@@ -44,8 +45,8 @@
final Configuration current = aspectConfigs[i];
final String role = current.getAttribute("type");
try {
- this.aspects.add(selector.select(role));
- this.configs.add(Parameters.fromConfiguration(current));
+ this.aspects.add(manager.lookup(EventAspect.ROLE + '/' + role));
+ this.configs.add(Parameters.toProperties(Parameters.fromConfiguration(current)));
} catch (ServiceException se) {
throw new ConfigurationException("Unable to lookup aspect " + role, se);
}
@@ -64,10 +65,10 @@
return this.configs.iterator();
}
- public void dispose(ServiceSelector selector) {
+ public void dispose(ServiceManager manager) {
Iterator i = this.aspects.iterator();
while (i.hasNext()) {
- selector.release(i.next());
+ manager.release(i.next());
}
this.aspects.clear();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalComponentManager.java Wed Aug 9 23:33:57 2006
@@ -31,6 +31,7 @@
import org.apache.cocoon.portal.layout.LayoutFactory;
import org.apache.cocoon.portal.layout.renderer.Renderer;
import org.apache.cocoon.portal.profile.ProfileManager;
+import org.apache.cocoon.processing.ProcessInfoProvider;
/**
* Default {@link PortalComponentManager} implementation.
@@ -67,13 +68,18 @@
/** The portal manager. */
protected PortalManager portalManager;
+ /** The process info provider. */
+ protected ProcessInfoProvider processInfoProvider;
+
/**
* Create a new portal component manager. Each portal has a own
* component manager that manages all central components for this
* portal.
*/
- public DefaultPortalComponentManager(ServiceManager manager) {
+ public DefaultPortalComponentManager(ServiceManager manager)
+ throws ServiceException {
this.manager = manager;
+ this.processInfoProvider = (ProcessInfoProvider)this.manager.lookup(ProcessInfoProvider.ROLE);
}
/**
@@ -123,12 +129,8 @@
*/
public void dispose() {
if (this.manager != null) {
- Iterator i = this.renderers.values().iterator();
- while (i.hasNext()) {
- this.manager.release(i.next());
- }
this.renderers.clear();
- i = this.copletAdapters.values().iterator();
+ Iterator i = this.copletAdapters.values().iterator();
while (i.hasNext()) {
this.manager.release(i.next());
}
@@ -145,6 +147,8 @@
this.eventManager = null;
this.manager.release(this.portalManager);
this.portalManager = null;
+ this.manager.release(this.processInfoProvider);
+ this.processInfoProvider = null;
this.manager = null;
}
}
@@ -153,14 +157,9 @@
* @see org.apache.cocoon.portal.PortalComponentManager#getRenderer(java.lang.String)
*/
public Renderer getRenderer(String name) {
- Renderer o = (Renderer) this.renderers.get( name );
+ final Renderer o = (Renderer) this.renderers.get( name );
if ( o == null ) {
- try {
- o = (Renderer) this.manager.lookup( Renderer.ROLE + '/' + name );
- this.renderers.put( name, o );
- } catch (ServiceException e) {
- throw new PortalRuntimeException("Unable to lookup renderer with name " + name, e);
- }
+ throw new PortalRuntimeException("Unable to lookup renderer with name " + name);
}
return o;
}
@@ -221,5 +220,19 @@
}
}
return this.portalManager;
+ }
+
+ /**
+ * @see org.apache.cocoon.portal.PortalComponentManager#register(String, org.apache.cocoon.portal.layout.renderer.Renderer)
+ */
+ public void register(String name, Renderer renderer) {
+ this.renderers.put(name, renderer);
+ }
+
+ /**
+ * @see org.apache.cocoon.portal.PortalComponentManager#getProcessInfoProvider()
+ */
+ public ProcessInfoProvider getProcessInfoProvider() {
+ return this.processInfoProvider;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/DefaultPortalManagerAspectContext.java Wed Aug 9 23:33:57 2006
@@ -16,7 +16,6 @@
package org.apache.cocoon.portal.impl;
import java.util.Iterator;
-import java.util.Map;
import java.util.Properties;
import org.apache.cocoon.ProcessingException;
@@ -36,16 +35,13 @@
implements PortalManagerAspectRenderContext, PortalManagerAspectPrepareContext {
private final PortalService service;
- private final Map objectModel;
private Iterator iterator;
private Iterator configIterator;
private Properties config;
public DefaultPortalManagerAspectContext(PortalManagerAspectChain chain,
- PortalService service,
- Map objectModel) {
+ PortalService service) {
this.service = service;
- this.objectModel = objectModel;
this.iterator = chain.getIterator();
this.configIterator = chain.getConfigIterator();
}
@@ -79,12 +75,5 @@
final PortalManagerAspect aspect = (PortalManagerAspect) iterator.next();
aspect.render(this, this.service, ch, properties);
}
- }
-
- /**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#getObjectModel()
- */
- public Map getObjectModel() {
- return this.objectModel;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalManagerImpl.java Wed Aug 9 23:33:57 2006
@@ -24,7 +24,6 @@
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.ajax.AjaxHelper;
-import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
import org.apache.cocoon.portal.PortalManager;
@@ -74,8 +73,7 @@
throws ProcessingException {
DefaultPortalManagerAspectContext aspectContext =
new DefaultPortalManagerAspectContext(this.chain,
- this.portalService,
- ContextHelper.getObjectModel(this.context));
+ this.portalService);
aspectContext.invokeNext();
}
@@ -86,8 +84,7 @@
throws SAXException {
DefaultPortalManagerAspectContext aspectContext =
new DefaultPortalManagerAspectContext(this.chain,
- this.portalService,
- ContextHelper.getObjectModel(this.context));
+ this.portalService);
aspectContext.invokeNext(contentHandler, properties);
}
@@ -121,7 +118,7 @@
final ProfileManager profileManager = this.portalService.getProfileManager();
// test for ajax request
- final Request req = ObjectModelHelper.getRequest(renderContext.getObjectModel());
+ final Request req = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel());
if ( AjaxHelper.isAjaxRequest(req) ) {
Layout rootLayout = profileManager.getPortalLayout(null, null);
ch.startDocument();
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/impl/PortalServiceImpl.java Wed Aug 9 23:33:57 2006
@@ -20,7 +20,6 @@
import java.util.Enumeration;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import javax.servlet.ServletContext;
@@ -41,7 +40,6 @@
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;
@@ -51,6 +49,7 @@
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.processing.ProcessInfoProvider;
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceResolver;
@@ -213,13 +212,6 @@
}
/**
- * @see org.apache.cocoon.portal.PortalService#getComponentManager()
- */
- public PortalComponentManager getComponentManager() {
- return this.portalComponentManager;
- }
-
- /**
* @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
*/
public void contextualize(Context aContext) throws ContextException {
@@ -330,13 +322,6 @@
}
/**
- * @see org.apache.cocoon.portal.PortalService#getObjectModel()
- */
- public Map getObjectModel() {
- return ContextHelper.getObjectModel(this.context);
- }
-
- /**
* @see org.apache.cocoon.portal.PortalService#getConfiguration(java.lang.String, java.lang.String)
*/
public String getConfiguration(String key, String defaultValue) {
@@ -361,55 +346,69 @@
* @see org.apache.cocoon.portal.PortalComponentManager#getCopletAdapter(java.lang.String)
*/
public CopletAdapter getCopletAdapter(String name) {
- return this.getComponentManager().getCopletAdapter(name);
+ return this.portalComponentManager.getCopletAdapter(name);
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getCopletFactory()
*/
public CopletFactory getCopletFactory() {
- return this.getComponentManager().getCopletFactory();
+ return this.portalComponentManager.getCopletFactory();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getEventManager()
*/
public EventManager getEventManager() {
- return this.getComponentManager().getEventManager();
+ return this.portalComponentManager.getEventManager();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getLayoutFactory()
*/
public LayoutFactory getLayoutFactory() {
- return this.getComponentManager().getLayoutFactory();
+ return this.portalComponentManager.getLayoutFactory();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getLinkService()
*/
public LinkService getLinkService() {
- return this.getComponentManager().getLinkService();
+ return this.portalComponentManager.getLinkService();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getPortalManager()
*/
public PortalManager getPortalManager() {
- return this.getComponentManager().getPortalManager();
+ return this.portalComponentManager.getPortalManager();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getProfileManager()
*/
public ProfileManager getProfileManager() {
- return this.getComponentManager().getProfileManager();
+ return this.portalComponentManager.getProfileManager();
}
/**
* @see org.apache.cocoon.portal.PortalComponentManager#getRenderer(java.lang.String)
*/
public Renderer getRenderer(String name) {
- return this.getComponentManager().getRenderer(name);
+ return this.portalComponentManager.getRenderer(name);
+ }
+
+ /**
+ * @see org.apache.cocoon.portal.PortalComponentManager#register(java.lang.String, org.apache.cocoon.portal.layout.renderer.Renderer)
+ */
+ public void register(String name, Renderer renderer) {
+ this.portalComponentManager.register(name, renderer);
+ }
+
+ /**
+ * @see org.apache.cocoon.portal.PortalComponentManager#getProcessInfoProvider()
+ */
+ public ProcessInfoProvider getProcessInfoProvider() {
+ return this.portalComponentManager.getProcessInfoProvider();
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/AbstractParameters.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/AbstractParameters.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/AbstractParameters.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/AbstractParameters.java Wed Aug 9 23:33:57 2006
@@ -16,6 +16,7 @@
package org.apache.cocoon.portal.layout;
import java.io.Serializable;
+import java.util.Collections;
import java.util.Map;
import org.apache.commons.collections.map.LinkedMap;
@@ -27,10 +28,10 @@
public abstract class AbstractParameters
implements Cloneable, Serializable {
- protected final Map parameters = new LinkedMap();
+ protected Map parameters = Collections.EMPTY_MAP;
public final Map getParameters() {
- return parameters;
+ return this.parameters;
}
/**
@@ -48,6 +49,9 @@
* @param value The value.
*/
public void setParameter(String key, String value) {
+ if ( this.parameters.size() == 0 ) {
+ this.parameters = new LinkedMap();
+ }
this.parameters.put(key, value);
}
@@ -66,8 +70,9 @@
protected Object clone() throws CloneNotSupportedException {
final AbstractParameters clone = (AbstractParameters)super.clone();
- clone.parameters.putAll(this.parameters);
-
+ if ( this.parameters.size() > 0 ) {
+ clone.parameters = new LinkedMap(this.parameters);
+ }
return clone;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/Layout.java Wed Aug 9 23:33:57 2006
@@ -17,6 +17,8 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import java.util.Collections;
+import java.util.HashMap;
import java.util.Map;
import org.apache.cocoon.portal.util.PortalUtils;
@@ -58,7 +60,7 @@
protected final String id;
/** The temporary attributes. */
- transient protected Map temporaryAttributes = new LinkedMap();
+ transient protected Map temporaryAttributes = Collections.EMPTY_MAP;
/** Is this layout object static? */
protected boolean isStatic;
@@ -122,6 +124,9 @@
* @param value The value.
*/
public void setTemporaryAttribute(String key, Object value) {
+ if ( this.temporaryAttributes.size() == 0 ) {
+ this.temporaryAttributes = new HashMap();
+ }
this.temporaryAttributes.put(key, value);
}
@@ -175,7 +180,7 @@
/**
* Make a copy of this layout object and of all it's children.
- * This includes copies of items and copletinstancedatas.
+ * This includes copies of items and coplet instances.
*/
public Layout copy() {
try {
@@ -205,13 +210,17 @@
final Layout clone = (Layout)c.newInstance(new Object[] {this.id, this.type});
// clone fields from AbstractParameters
- clone.parameters.putAll(this.parameters);
+ if ( this.parameters.size() > 0 ) {
+ clone.parameters = new LinkedMap(this.parameters);
+ }
// we don't clone the parent; we just set it to null
clone.parent = null;
clone.rendererName = this.rendererName;
clone.isStatic = this.isStatic;
- clone.temporaryAttributes = new LinkedMap(this.temporaryAttributes);
+ if ( this.temporaryAttributes.size() > 0 ) {
+ clone.temporaryAttributes = new HashMap(this.temporaryAttributes);
+ }
return clone;
} catch (NoSuchMethodException e) {
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspect.java Wed Aug 9 23:33:57 2006
@@ -15,8 +15,9 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Properties;
+
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.xml.sax.ContentHandler;
@@ -51,6 +52,6 @@
* The "compiled" configuration is available during streaming via the context object.
* This method can also be used for validating the configuration.
*/
- Object prepareConfiguration(Parameters configuration)
- throws ParameterException;
+ Object prepareConfiguration(Properties configuration)
+ throws PortalException;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/RendererAspectContext.java Wed Aug 9 23:33:57 2006
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect;
-import java.util.Map;
-
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.xml.sax.ContentHandler;
@@ -41,9 +39,4 @@
* Get the "compiled" configuration of the aspect.
*/
Object getAspectConfiguration();
-
- /**
- * Get the object model
- */
- Map getObjectModel();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/AbstractAspect.java Wed Aug 9 23:33:57 2006
@@ -15,8 +15,9 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Properties;
+
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.impl.AbstractComponent;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
@@ -31,10 +32,10 @@
implements RendererAspect {
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
return configuration;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CIncludeCopletAspect.java Wed Aug 9 23:33:57 2006
@@ -15,14 +15,16 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import java.util.Properties;
+
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.impl.CopletLayout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -95,13 +97,13 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.tagName = configuration.getParameter("tag-name", "content");
- pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
+ pc.tagName = configuration.getProperty("tag-name", "content");
+ pc.rootTag = BooleanUtils.toBoolean(configuration.getProperty("root-tag", "true"));
return pc;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/CompositeContentAspect.java Wed Aug 9 23:33:57 2006
@@ -17,15 +17,16 @@
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Item;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -175,17 +176,17 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.tagName = configuration.getParameter("tag-name", "composite");
- pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
- pc.itemTag = configuration.getParameterAsBoolean("item-tag", true);
- pc.itemTagName = configuration.getParameter("item-tag-name", ITEM_STRING);
- pc.rootTagId = configuration.getParameter("root-tag-id", null);
- pc.rootTagClass = configuration.getParameter("root-tag-class", null);
+ pc.tagName = configuration.getProperty("tag-name", "composite");
+ pc.rootTag = BooleanUtils.toBoolean(configuration.getProperty("root-tag", "true"));
+ pc.itemTag = BooleanUtils.toBoolean(configuration.getProperty("item-tag", "true"));
+ pc.itemTagName = configuration.getProperty("item-tag-name", ITEM_STRING);
+ pc.rootTagId = configuration.getProperty("root-tag-id", null);
+ pc.rootTagClass = configuration.getProperty("root-tag-class", null);
return pc;
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultCopletAspect.java Wed Aug 9 23:33:57 2006
@@ -15,8 +15,6 @@
*/
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
-import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletInstance;
import org.apache.cocoon.portal.coplet.adapter.CopletAdapter;
@@ -63,20 +61,8 @@
CopletInstance cid = this.getCopletInstance(((CopletLayout)layout).getCopletInstanceId());
final String adapterName = cid.getCopletDefinition().getCopletType().getCopletAdapterName();
- CopletAdapter copletAdapter = null;
- ServiceSelector adapterSelector = null;
- try {
- adapterSelector = (ServiceSelector) this.manager.lookup(CopletAdapter.ROLE + "Selector");
- copletAdapter = (CopletAdapter) adapterSelector.select(adapterName);
- copletAdapter.toSAX(cid, new IncludeXMLConsumer(handler));
- } catch (ServiceException ce) {
- throw new SAXException("Unable to lookup component.", ce);
- } finally {
- if (null != adapterSelector) {
- adapterSelector.release(copletAdapter);
- }
- this.manager.release(adapterSelector);
- }
+ CopletAdapter copletAdapter = service.getCopletAdapter(adapterName);
+ copletAdapter.toSAX(cid, new IncludeXMLConsumer(handler));
XMLUtils.endElement(handler, "content");
rendererContext.invokeNext(layout, service, handler);
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/DefaultRendererContext.java Wed Aug 9 23:33:57 2006
@@ -16,7 +16,6 @@
package org.apache.cocoon.portal.layout.renderer.aspect.impl;
import java.util.Iterator;
-import java.util.Map;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
@@ -37,7 +36,6 @@
private Iterator iterator;
private Iterator configIterator;
private Object config;
- private Map objectModel;
public DefaultRendererContext(RendererAspectChain chain) {
this.iterator = chain.getIterator();
@@ -64,19 +62,4 @@
public Object getAspectConfiguration() {
return this.config;
}
-
- /**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext#getObjectModel()
- */
- public Map getObjectModel() {
- return this.objectModel;
- }
-
- /**
- * Set the object model
- * @param map The object model
- */
- public void setObjectModel(Map map) {
- this.objectModel = map;
- }
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/HistoryAspect.java Wed Aug 9 23:33:57 2006
@@ -92,7 +92,7 @@
ContentHandler handler)
throws SAXException {
if ( layout.getId() != null ) {
- final Request request = ObjectModelHelper.getRequest(rendererContext.getObjectModel());
+ final Request request = ObjectModelHelper.getRequest(service.getProcessInfoProvider().getObjectModel());
final Session session = request.getSession(false);
if ( session != null ) {
List history = (List)session.getAttribute("portal-history");
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/ParameterAspect.java Wed Aug 9 23:33:57 2006
@@ -17,9 +17,9 @@
import java.util.Iterator;
import java.util.Map;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
@@ -93,12 +93,12 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.tagName = configuration.getParameter("tag-name", "parameter");
+ pc.tagName = configuration.getProperty("tag-name", "parameter");
return pc;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/RendererAspectChain.java Wed Aug 9 23:33:57 2006
@@ -18,13 +18,14 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
-import org.apache.avalon.framework.service.ServiceSelector;
+import org.apache.avalon.framework.service.ServiceManager;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
/**
@@ -51,7 +52,7 @@
/** The list of the configuration obejcts for each renderer aspects. */
protected List configs = new ArrayList(3);
- public void configure(ServiceSelector selector, Configuration conf)
+ public void configure(ServiceManager manager, Configuration conf)
throws ConfigurationException {
if ( conf != null ) {
final Configuration[] aspectConfigs = conf.getChildren("aspect");
@@ -59,14 +60,13 @@
final Configuration current = aspectConfigs[i];
final String role = current.getAttribute("type");
try {
- RendererAspect rAspect = (RendererAspect) selector.select(role);
+ RendererAspect rAspect = (RendererAspect) manager.lookup(RendererAspect.ROLE + '/' + role);
this.aspects.add(rAspect);
- Parameters aspectConfiguration = Parameters.fromConfiguration(current);
+ Properties aspectConfiguration = Parameters.toProperties(Parameters.fromConfiguration(current));
Object compiledConf = rAspect.prepareConfiguration(aspectConfiguration);
this.configs.add(compiledConf);
-
- } catch (ParameterException pe) {
- throw new ConfigurationException("Unable to configure renderer aspect: " + role, pe);
+ } catch (PortalException pe) {
+ throw new ConfigurationException("Unable to configure renderer: " + role, pe);
} catch (ServiceException se) {
throw new ConfigurationException("Unable to lookup renderer aspect: " + role, se);
}
@@ -84,10 +84,10 @@
return this.configs.iterator();
}
- public void dispose(ServiceSelector selector) {
+ public void dispose(ServiceManager manager) {
Iterator i = this.aspects.iterator();
while (i.hasNext()) {
- selector.release(i.next());
+ manager.release(i.next());
}
this.aspects.clear();
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/TabContentAspect.java Wed Aug 9 23:33:57 2006
@@ -19,9 +19,9 @@
import java.util.Map;
import java.util.List;
import java.util.ArrayList;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.event.layout.ChangeTabEvent;
import org.apache.cocoon.portal.event.layout.LayoutChangeParameterEvent;
@@ -34,6 +34,7 @@
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.xml.AttributesImpl;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -283,20 +284,20 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.CompositeContentAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
TabPreparedConfiguration pc = new TabPreparedConfiguration();
pc.takeValues((PreparedConfiguration)super.prepareConfiguration(configuration));
- pc.childTagName = configuration.getParameter("child-tag-name", "");
+ pc.childTagName = configuration.getProperty("child-tag-name", "");
if (!pc.childTagName.equals("")) {
pc.showAllNav = true;
} else {
- pc.showAllNav = configuration.getParameterAsBoolean("show-all-nav", false);
+ pc.showAllNav = BooleanUtils.toBoolean(configuration.getProperty("show-all-nav", "false"));
}
- pc.includeSelected = configuration.getParameterAsBoolean("include-selected", false);
- pc.useNames = configuration.getParameterAsBoolean("use-names", false);
+ pc.includeSelected = BooleanUtils.toBoolean(configuration.getProperty("include-selected", "false"));
+ pc.useNames = BooleanUtils.toBoolean(configuration.getProperty("use-names", "false"));
return pc;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/WindowAspect.java Wed Aug 9 23:33:57 2006
@@ -17,9 +17,9 @@
import java.util.Iterator;
import java.util.List;
+import java.util.Properties;
-import org.apache.avalon.framework.parameters.ParameterException;
-import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.coplet.CopletDefinitionFeatures;
import org.apache.cocoon.portal.coplet.CopletInstance;
@@ -35,6 +35,7 @@
import org.apache.cocoon.portal.layout.impl.CopletLayout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
import org.apache.cocoon.xml.XMLUtils;
+import org.apache.commons.lang.BooleanUtils;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
@@ -264,13 +265,13 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.tagName = configuration.getParameter("tag-name", "window");
- pc.rootTag = configuration.getParameterAsBoolean("root-tag", true);
+ pc.tagName = configuration.getProperty("tag-name", "window");
+ pc.rootTag = BooleanUtils.toBoolean(configuration.getProperty("root-tag", "true"));
return pc;
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/aspect/impl/XSLTAspect.java Wed Aug 9 23:33:57 2006
@@ -21,12 +21,12 @@
import java.util.List;
import java.util.Map;
import java.util.HashMap;
+import java.util.Properties;
import javax.xml.transform.Transformer;
import javax.xml.transform.sax.SAXResult;
import javax.xml.transform.sax.TransformerHandler;
-import org.apache.avalon.framework.parameters.ParameterException;
import org.apache.avalon.framework.parameters.Parameters;
import org.apache.avalon.framework.service.ServiceException;
import org.apache.avalon.framework.service.ServiceManager;
@@ -37,6 +37,7 @@
import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
+import org.apache.cocoon.portal.PortalException;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspectContext;
@@ -92,7 +93,7 @@
protected List variables = new ArrayList();
/** Additional parameters passed to the stylesheet. */
- protected Parameters parameters;
+ protected Map parameters;
/** Source resolver for resolving the stylesheets. */
protected SourceResolver resolver;
@@ -103,7 +104,13 @@
public void configure(Configuration config) throws ConfigurationException {
Configuration parameterItems = config.getChild("parameters", false);
if (parameterItems != null) {
- this.parameters = Parameters.fromConfiguration(parameterItems);
+ this.parameters = new HashMap();
+ final Parameters params = Parameters.fromConfiguration(parameterItems);
+ final String[] names = params.getNames();
+ for(int i=0; i<names.length; i++) {
+ final String value = params.getParameter(names[i], null);
+ this.parameters.put(names[i], value);
+ }
}
}
@@ -207,29 +214,30 @@
}
/**
- * @see org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect#prepareConfiguration(org.apache.avalon.framework.parameters.Parameters)
+ * @see org.apache.cocoon.portal.layout.renderer.aspect.impl.AbstractAspect#prepareConfiguration(java.util.Properties)
*/
- public Object prepareConfiguration(Parameters configuration)
- throws ParameterException {
+ public Object prepareConfiguration(Properties configuration)
+ throws PortalException {
PreparedConfiguration pc = new PreparedConfiguration();
- pc.xsltRole = configuration.getParameter("xslt-processor-role", XSLTProcessor.ROLE);
- String stylesheet = configuration.getParameter("style");
+ pc.xsltRole = configuration.getProperty("xslt-processor-role", XSLTProcessor.ROLE);
+ String stylesheet = configuration.getProperty("style", null);
try {
pc.stylesheet = VariableResolverFactory.getResolver(stylesheet, this.manager);
} catch (PatternException pe) {
- throw new ParameterException("Unknown pattern for stylesheet " + stylesheet, pe);
+ throw new PortalException("Unknown pattern for stylesheet " + stylesheet, pe);
}
this.variables.add(pc.stylesheet);
if (this.parameters != null) {
- String[] name = this.parameters.getNames();
- for (int i=0; i < name.length; ++i) {
+ final Iterator i = this.parameters.entrySet().iterator();
+ while ( i.hasNext() ) {
+ final Map.Entry current = (Map.Entry)i.next();
try {
VariableResolver variableResolver =
- VariableResolverFactory.getResolver(this.parameters.getParameter(name[i]), this.manager);
+ VariableResolverFactory.getResolver(current.getValue().toString(), this.manager);
this.variables.add(variableResolver);
- pc.parameters.put(name[i], variableResolver);
+ pc.parameters.put(current.getKey(), variableResolver);
} catch (PatternException e) {
- throw new ParameterException("Invalid value for parameter " + name[i], e);
+ throw new PortalException("Invalid value for parameter " + current.getKey() + " : " + current.getValue(), e);
}
}
}
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AbstractRenderer.java Wed Aug 9 23:33:57 2006
@@ -22,7 +22,6 @@
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.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
import org.apache.cocoon.portal.PortalService;
@@ -45,7 +44,6 @@
extends AbstractLogEnabled
implements Renderer, Serviceable, Disposable, ThreadSafe {
- protected ServiceSelector rendererSelector;
protected ServiceManager manager;
/**
@@ -67,11 +65,7 @@
* @see org.apache.avalon.framework.activity.Disposable#dispose()
*/
public void dispose() {
- if (null != this.manager) {
- this.manager.release(this.rendererSelector);
- this.manager = null;
- this.rendererSelector = null;
- }
+ this.manager = null;
}
/**
Modified: cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java?rev=430282&r1=430281&r2=430282&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java (original)
+++ cocoon/trunk/blocks/cocoon-portal/cocoon-portal-impl/src/main/java/org/apache/cocoon/portal/layout/renderer/impl/AspectRenderer.java Wed Aug 9 23:33:57 2006
@@ -19,20 +19,14 @@
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.context.Context;
-import org.apache.avalon.framework.context.ContextException;
-import org.apache.avalon.framework.context.Contextualizable;
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.ServiceSelector;
import org.apache.avalon.framework.service.Serviceable;
import org.apache.avalon.framework.thread.ThreadSafe;
-import org.apache.cocoon.components.ContextHelper;
import org.apache.cocoon.portal.PortalService;
import org.apache.cocoon.portal.layout.Layout;
import org.apache.cocoon.portal.layout.renderer.Renderer;
-import org.apache.cocoon.portal.layout.renderer.aspect.RendererAspect;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.DefaultRendererContext;
import org.apache.cocoon.portal.layout.renderer.aspect.impl.RendererAspectChain;
import org.xml.sax.ContentHandler;
@@ -53,22 +47,17 @@
*/
public class AspectRenderer
extends AbstractLogEnabled
- implements Renderer, Serviceable, Configurable, Disposable, ThreadSafe, Contextualizable {
+ implements Renderer, Serviceable, Configurable, Disposable, ThreadSafe {
protected ServiceManager manager;
protected RendererAspectChain chain;
- protected ServiceSelector aspectSelector;
-
- protected Context context;
-
/**
* @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
*/
public void service(ServiceManager aManager) throws ServiceException {
this.manager = aManager;
- this.aspectSelector = (ServiceSelector) this.manager.lookup( RendererAspect.ROLE+"Selector");
}
/**
@@ -76,7 +65,6 @@
*/
public void toSAX(Layout layout, PortalService service, ContentHandler handler) throws SAXException {
DefaultRendererContext renderContext = new DefaultRendererContext(this.chain);
- renderContext.setObjectModel(ContextHelper.getObjectModel(this.context));
renderContext.invokeNext(layout, service, handler);
}
@@ -85,7 +73,7 @@
*/
public void configure(Configuration conf) throws ConfigurationException {
this.chain = new RendererAspectChain();
- this.chain.configure(this.aspectSelector, conf.getChild("aspects"));
+ this.chain.configure(this.manager, conf.getChild("aspects"));
}
/**
@@ -94,18 +82,10 @@
public void dispose() {
if (this.manager != null) {
if ( this.chain != null) {
- this.chain.dispose( this.aspectSelector );
+ this.chain.dispose( this.manager );
+ this.chain = null;
}
- this.manager.release( this.aspectSelector );
- this.aspectSelector = null;
this.manager = null;
}
}
-
- /**
- * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
- */
- public void contextualize(Context aContext) throws ContextException {
- this.context = aContext;
- }
}